summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-05-23 14:01:39 +0200
committerBastien Guerry <bzg@altern.org>2014-05-23 14:01:39 +0200
commitee5a88cd01cccc7b12422aebe6269bfeb444d387 (patch)
tree853798c02de0b66fa86c328e315c499371619f0a
parent1d57e1ac9ae5e7ddefe0b63a23728a241d3d99cb (diff)
downloadorg-mode-ee5a88cd01cccc7b12422aebe6269bfeb444d387.tar.gz
org-capture.el (org-capture-steal-local-variables): Don't steal `mark-active'
* org-capture.el (org-capture-steal-local-variables): Don't steal `mark-active', which should be nil in the target buffer. Thanks to Alex Kosorukoff for raising this issue.
-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 11dae4e..d7c0a8b 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -984,10 +984,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.