Преглед на файлове

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

* lisp/org-capture.el (org-capture-expand-file): Remove plain S-exps
  from allowed values.
Nicolas Goaziou преди 8 години
родител
ревизия
5485170263
променени са 1 файла, в които са добавени 3 реда и са изтрити 6 реда
  1. 3 6
      lisp/org-capture.el

+ 3 - 6
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)