diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-06-24 01:11:49 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-06-24 01:11:49 +0200 |
commit | 5485170263a46fa17db67b0324c4c4e48bcdfe49 (patch) | |
tree | 3cc6dfa78e624f9d5e52c648cecfc0edb9fc1f84 | |
parent | 8860c92f62dac87267416708e81bc8aec026fcc7 (diff) | |
download | org-mode-5485170263a46fa17db67b0324c4c4e48bcdfe49.tar.gz |
org-capture: Remove forbidden value type from "file" templates
* lisp/org-capture.el (org-capture-expand-file): Remove plain S-exps
from allowed values.
-rw-r--r-- | lisp/org-capture.el | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el index 60ed79d..c7b83c6 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) |