forked from mirrors/org-mode
Merge branch 'master' of code.orgmode.org:bzg/org-mode
This commit is contained in:
commit
d48bff37ad
|
@ -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_example
|
||||
,* Totally secret :crypt:
|
||||
:PROPERTIES:
|
||||
:CRYPTKEY: 0x0123456789012345678901234567890123456789
|
||||
:END:
|
||||
#+end_example
|
||||
|
||||
Excluding the =crypt= tag from inheritance prevents already encrypted
|
||||
text from being encrypted again.
|
||||
|
||||
|
|
|
@ -9982,7 +9982,7 @@ Raise a user 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
|
||||
|
|
Loading…
Reference in New Issue