summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-05-23 21:51:23 +0200
committerBastien Guerry <bzg@altern.org>2014-05-23 21:51:23 +0200
commit99580828e6116aa3d9159ced90d4788fa9012bea (patch)
tree76bc857f75e2677a879650d8ea3ab612bb42223f
parentd978a9e585f94e1e9523243aeb96bb943e77c483 (diff)
parent942a95cd59c18eb3036d393e7759f86670cae507 (diff)
downloadorg-mode-99580828e6116aa3d9159ced90d4788fa9012bea.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-capture.el11
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index f942854..cbdf6f7 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -985,11 +985,10 @@ 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 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))))
+ "Install Org-mode local variables of BUFFER."
+ (mapc (lambda (v)
+ (ignore-errors (org-set-local (car v) (cdr v))))
+ (buffer-local-variables buffer)))
(defun org-capture-place-template (&optional inhibit-wconf-store)
"Insert the template at the target location, and display the buffer.
@@ -1592,7 +1591,7 @@ The template may still contain \"%?\" for cursor positioning."
(insert template)
(goto-char (point-min))
(org-capture-steal-local-variables buffer)
- (setq buffer-file-name nil)
+ (setq buffer-file-name nil mark-active nil)
;; %[] Insert contents of a file.
(goto-char (point-min))