summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-05-23 14:01:45 +0200
committerBastien Guerry <bzg@altern.org>2014-05-23 14:01:45 +0200
commitd6775b8751e26da195c4d91abc8d8b558d98c59d (patch)
tree5bef6abc1b34a25d93a5974d4bc7ad96173e8598
parent0f0fa81dd0f2785b62a77a65fc569ebdfb9ba020 (diff)
parentee5a88cd01cccc7b12422aebe6269bfeb444d387 (diff)
downloadorg-mode-d6775b8751e26da195c4d91abc8d8b558d98c59d.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-capture.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index c053640..f942854 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -985,10 +985,11 @@ it. When it is a variable, retrieve the value. Return whatever we get."
(find-file-noselect (expand-file-name file org-directory)))))
(defun org-capture-steal-local-variables (buffer)
- "Install Org-mode local variables of BUFFER."
- (mapc (lambda (v)
- (ignore-errors (org-set-local (car v) (cdr v))))
- (buffer-local-variables buffer)))
+ "Install Org-mode local variables of BUFFER in the capture target buffer.
+Take care of not installing `mark-active', which should be nil."
+ (mapc (lambda (v) (ignore-errors (org-set-local (car v) (cdr v))))
+ (org-remove-if (lambda(e) (eq (car e) 'mark-active))
+ (buffer-local-variables buffer))))
(defun org-capture-place-template (&optional inhibit-wconf-store)
"Insert the template at the target location, and display the buffer.