diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2014-11-02 10:42:09 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2014-11-02 10:42:09 +0100 |
commit | fbcdc5d6d5c5f5a3590e2e53cced7aa976e0de6f (patch) | |
tree | 7637b7b90cb709122d2ae514ecb3836512f47541 | |
parent | e6653070403358063b74f9e5743ee80f0d278c75 (diff) | |
parent | cdb0a962bc346826bd9609af07c66bbe98cef3bd (diff) | |
download | org-mode-fbcdc5d6d5c5f5a3590e2e53cced7aa976e0de6f.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-capture.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el index 9f8107e..65de098 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1608,8 +1608,6 @@ The template may still contain \"%?\" for cursor positioning." (insert-file-contents filename) (error (insert (format "%%![Couldn't insert %s: %s]" filename error))))))) - ;; %() embedded elisp - (org-capture-expand-embedded-elisp) ;; The current time (goto-char (point-min)) @@ -1639,6 +1637,10 @@ The template may still contain \"%?\" for cursor positioning." (intern (match-string 1))) "")) (replace-match x t t))))) + ;; %() embedded elisp + (goto-char (point-min)) + (org-capture-expand-embedded-elisp) + ;; Turn on org-mode in temp buffer, set local variables ;; This is to support completion in interactive prompts (let ((org-inhibit-startup t)) (org-mode)) |