ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

org-capture: Remove forbidden value type from "file" templates 

* lisp/org-capture.el (org-capture-expand-file): Remove plain S-exps
  from allowed values.
This commit is contained in:
Nicolas Goaziou 2016-06-24 01:11:49 +02:00
parent 8860c92f62
commit 5485170263
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org-capture.el
View File

@ -1002,16 +1002,13 @@ Store them in the capture property list."
(defun org-capture-expand-file (file) (defun org-capture-expand-file (file)
"Expand functions and symbols for FILE. "Expand functions and symbols for FILE.
When FILE is a function, call it. When it is a form, evaluate When FILE is a function, call it. When it is a variable,
it. When it is a variable, retrieve the value. When it is retrieve its value. When it is the empty string, return
a string, return it. However, if it is the empty string, return `org-default-notes-file'. In any other case, return FILE as-is."
`org-default-notes-file' instead."
(cond (cond
((equal file "") org-default-notes-file) ((equal file "") org-default-notes-file)
((org-string-nw-p file) file)
((functionp file) (funcall file)) ((functionp file) (funcall file))
((and (symbolp file) (boundp file)) (symbol-value file)) ((and (symbolp file) (boundp file)) (symbol-value file))
((consp file) (eval file))
(t file))) (t file)))
(defun org-capture-target-buffer (file) (defun org-capture-target-buffer (file)