tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Bastien Guerry 2014-05-23 21:51:23 +02:00
parent d978a9e585 942a95cd59
commit 99580828e6
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/org-capture.el
View file

@ -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))))) (find-file-noselect (expand-file-name file org-directory)))))
(defun org-capture-steal-local-variables (buffer) (defun org-capture-steal-local-variables (buffer)
"Install Org-mode local variables of BUFFER in the capture target buffer. "Install Org-mode local variables of BUFFER."
Take care of not installing `mark-active', which should be nil." (mapc (lambda (v)
(mapc (lambda (v) (ignore-errors (org-set-local (car v) (cdr v)))) (ignore-errors (org-set-local (car v) (cdr v))))
(org-remove-if (lambda(e) (eq (car e) 'mark-active)) (buffer-local-variables buffer)))
(buffer-local-variables buffer))))
(defun org-capture-place-template (&optional inhibit-wconf-store) (defun org-capture-place-template (&optional inhibit-wconf-store)
"Insert the template at the target location, and display the buffer. "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) (insert template)
(goto-char (point-min)) (goto-char (point-min))
(org-capture-steal-local-variables buffer) (org-capture-steal-local-variables buffer)
(setq buffer-file-name nil) (setq buffer-file-name nil mark-active nil)
;; %[] Insert contents of a file. ;; %[] Insert contents of a file.
(goto-char (point-min)) (goto-char (point-min))