ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-09-25 17:30:35 +02:00
parent 50091a849e ac6409feae
commit 225714a28b
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lisp/org-capture.el
View File

@ -698,6 +698,11 @@ captured item after finalizing."
;; Run the hook ;; Run the hook
(run-hooks 'org-capture-before-finalize-hook)) (run-hooks 'org-capture-before-finalize-hook))
(when (org-capture-get :decrypted)
(save-excursion
(goto-char (org-capture-get :decrypted))
(org-encrypt-entry)))
;; Kill the indirect buffer ;; Kill the indirect buffer
(save-buffer) (save-buffer)
(let ((return-wconf (org-capture-get :return-to-wconf 'local)) (let ((return-wconf (org-capture-get :return-to-wconf 'local))
@ -800,8 +805,9 @@ already gone. Any prefix argument will be passed to the refile command."
(org-capture-put :initial-target-position (point))) (org-capture-put :initial-target-position (point)))
(defun org-capture-set-target-location (&optional target) (defun org-capture-set-target-location (&optional target)
"Find target buffer and position and store then in the property list." "Find TARGET buffer and position.
(let ((target-entry-p t)) Store them in the capture property list."
(let ((target-entry-p t) decrypted-hl-pos)
(setq target (or target (org-capture-get :target))) (setq target (or target (org-capture-get :target)))
(save-excursion (save-excursion
(cond (cond
@ -922,8 +928,14 @@ already gone. Any prefix argument will be passed to the refile command."
(t (error "Invalid capture target specification"))) (t (error "Invalid capture target specification")))
(when (org-at-encrypted-entry-p)
(org-decrypt-entry)
(setq decrypted-hl-pos
(save-excursion (and (org-back-to-heading t) (point)))))
(org-capture-put :buffer (current-buffer) :pos (point) (org-capture-put :buffer (current-buffer) :pos (point)
:target-entry-p target-entry-p)))) :target-entry-p target-entry-p
:decrypted decrypted-hl-pos))))
(defun org-capture-expand-file (file) (defun org-capture-expand-file (file)
"Expand functions and symbols for FILE. "Expand functions and symbols for FILE.

7
lisp/org-crypt.el
View File

@ -252,6 +252,13 @@ See `org-crypt-disable-auto-save'."
(cdr (org-make-tags-matcher org-crypt-tag-matcher)) (cdr (org-make-tags-matcher org-crypt-tag-matcher))
todo-only))) todo-only)))
(defun org-at-encrypted-entry-p ()
"Is the current entry encrypted?"
(save-excursion
(org-back-to-heading t)
(search-forward "-----BEGIN PGP MESSAGE-----"
(save-excursion (org-end-of-subtree t)) t)))
(defun org-crypt-use-before-save-magic () (defun org-crypt-use-before-save-magic ()
"Add a hook to automatically encrypt entries before a file is saved to disk." "Add a hook to automatically encrypt entries before a file is saved to disk."
(add-hook (add-hook