From cdb0a962bc346826bd9609af07c66bbe98cef3bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Huelga=20D=C3=ADaz?= Date: Wed, 29 Oct 2014 18:29:11 +0100 Subject: [PATCH] org-capture.el: Fix expand template order * lisp/org-capture.el (org-capture-fill-template): Expand %(sexp) after %:keywords, per documentation about capture templates expansion. When a template is expanded first the simple %-escapes, %:keywords and after that the %(sexp). TINYCHANGE --- lisp/org-capture.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/org-capture.el b/lisp/org-capture.el index c70868374..88d7ee5aa 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1602,8 +1602,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)) @@ -1633,6 +1631,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))