mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-22 19:10:43 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Bastien Guerry 2012-09-26 08:25:16 +02:00
parent 9795679299 0b65064961
commit 74c294ac84
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/org-capture.el
View file

@ -58,6 +58,9 @@
(declare-function org-table-goto-line "org-table" (N)) (declare-function org-table-goto-line "org-table" (N))
(declare-function org-pop-to-buffer-same-window "org-compat" (declare-function org-pop-to-buffer-same-window "org-compat"
(&optional buffer-or-name norecord label)) (&optional buffer-or-name norecord label))
(declare-function org-at-encrypted-entry-p "org-crypt" ())
(declare-function org-encrypt-entry "org-crypt" ())
(declare-function org-decrypt-entry "org-crypt" ())
(defvar org-remember-default-headline) (defvar org-remember-default-headline)
(defvar org-remember-templates) (defvar org-remember-templates)
@ -928,7 +931,7 @@ Store them in the capture property list."
(t (error "Invalid capture target specification"))) (t (error "Invalid capture target specification")))
(when (org-at-encrypted-entry-p) (when (and (featurep 'org-crypt) (org-at-encrypted-entry-p))
(org-decrypt-entry) (org-decrypt-entry)
(setq decrypted-hl-pos (setq decrypted-hl-pos
(save-excursion (and (org-back-to-heading t) (point))))) (save-excursion (and (org-back-to-heading t) (point)))))