branch: externals/org commit f6813dbea9ef0c6be19bf68b4d9227ceb64c9449 Author: Bastien <b...@gnu.org> Commit: Bastien <b...@gnu.org>
lisp/org.el: Don't use lexical scope for diary related evals * lisp/org.el (org-diary-sexp-entry): Don't use lexical scope for eval sexps. This commit partially reverts 6d73cd34a. Reported-by: Eric S Fraga <e.fr...@ucl.ac.uk> --- lisp/org.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 59714c1713..3cc8a50367 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -15040,9 +15040,11 @@ D may be an absolute day number, or a calendar-type list (month day year)." (let* ((sexp `(let ((entry ,entry) (date ',d)) ,(car (read-from-string sexp)))) - (result (if calendar-debug-sexp (eval sexp t) + ;; FIXME: Do not use (eval ... t) in the following sexp as + ;; diary vars are still using dynamic scope. + (result (if calendar-debug-sexp (eval sexp) (condition-case nil - (eval sexp t) + (eval sexp) (error (beep) (message "Bad sexp at line %d in %s: %s"