From 5485170263a46fa17db67b0324c4c4e48bcdfe49 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 24 Jun 2016 01:11:49 +0200 Subject: [PATCH] org-capture: Remove forbidden value type from "file" templates * lisp/org-capture.el (org-capture-expand-file): Remove plain S-exps from allowed values. --- lisp/org-capture.el | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lisp/org-capture.el b/lisp/org-capture.el index 60ed79dd4..c7b83c655 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1002,16 +1002,13 @@ Store them in the capture property list." (defun org-capture-expand-file (file) "Expand functions and symbols for FILE. -When FILE is a function, call it. When it is a form, evaluate -it. When it is a variable, retrieve the value. When it is -a string, return it. However, if it is the empty string, return -`org-default-notes-file' instead." +When FILE is a function, call it. When it is a variable, +retrieve its value. When it is the empty string, return +`org-default-notes-file'. In any other case, return FILE as-is." (cond ((equal file "") org-default-notes-file) - ((org-string-nw-p file) file) ((functionp file) (funcall file)) ((and (symbolp file) (boundp file)) (symbol-value file)) - ((consp file) (eval file)) (t file))) (defun org-capture-target-buffer (file) -- 2.11.4.GIT