From 5d8b85e28055a80c624a9d573902f7396c5d136f Mon Sep 17 00:00:00 2001
From: Gregor Zattler <telegraph@gmx.net>
Date: Fri, 27 Apr 2018 14:17:05 +0200
Subject: [PATCH 1/3] org-manual: Document CRYPTKEY property

doc/org-manual.org: Document CRYPTKEY property.

TINYCHANGE
---
 doc/org-manual.org | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index e670c387f..238ce886a 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -19180,6 +19180,16 @@ Here is a suggestion for Org Crypt settings in Emacs init file:
 ;; # -*- buffer-auto-save-file-name: nil; -*-
 #+end_src
 
+It's possible to use different keys for different headings by
+specifying the respective key as property =CRYPTKEY=, e.g.:
+
+#+begin_src emacs-lisp
+,* Totally secret :crypt:
+  :PROPERTIES:
+  :CRYPTKEY: 0x0123456789012345678901234567890123456789
+  :END:
+#+end_src
+
 Excluding the =crypt= tag from inheritance prevents already encrypted
 text from being encrypted again.
 

From 2a8d944c85899a15a585c78b498ca6c6b5cc59f7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 27 Apr 2018 16:13:41 +0200
Subject: [PATCH 2/3] org-manual: Fix typo

* doc/org-manual.org (Org Crypt): Use correct environment for Org
  example.
---
 doc/org-manual.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 238ce886a..ce85f19fd 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -19183,12 +19183,12 @@ Here is a suggestion for Org Crypt settings in Emacs init file:
 It's possible to use different keys for different headings by
 specifying the respective key as property =CRYPTKEY=, e.g.:
 
-#+begin_src emacs-lisp
+#+begin_example
 ,* Totally secret :crypt:
   :PROPERTIES:
   :CRYPTKEY: 0x0123456789012345678901234567890123456789
   :END:
-#+end_src
+#+end_example
 
 Excluding the =crypt= tag from inheritance prevents already encrypted
 text from being encrypted again.

From 388254e0d0dcebafa2e2de970da96a2b08179444 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 27 Apr 2018 17:12:18 +0200
Subject: [PATCH 3/3] Revert "org.el: Fix bug when links contain special
 characters"

This reverts commit b1d084c1ab877a58b342ae4a8b8d844b9b54e625.

The fix introduces a bug where `org-edit-special' throws an error on
INCLUDE keywords.
---
 lisp/org.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org.el b/lisp/org.el
index 626198155..b231c2fcc 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10539,7 +10539,7 @@ Raise an error when there is nothing to follow.  "
     (with-temp-buffer
       (let ((org-inhibit-startup (not reference-buffer)))
 	(org-mode)
-	(insert (org-link-escape s))
+	(insert s)
 	(goto-char (point-min))
 	(when reference-buffer
 	  (setq org-link-abbrev-alist-local