diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/calendar/diary-lib.el | 2 | ||||
| -rw-r--r-- | lisp/calendar/holidays.el | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 66865f4320e..8d38892c0f0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-04-17 Glenn Morris <rgm@gnu.org> + + * calendar/diary-lib.el (diary-sexp-entry): + * calendar/holidays.el (holiday-sexp): + Set debug-on-error rather than the removed stack-trace-on-error. + 2011-04-16 Glenn Morris <rgm@gnu.org> * progmodes/f90.el: Use lexical-binding. diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 2d162a5060d..9a455c4f2f0 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -1353,7 +1353,7 @@ diary entries." (defun diary-sexp-entry (sexp entry date) "Process a SEXP diary ENTRY for DATE." (let ((result (if calendar-debug-sexp - (let ((stack-trace-on-error t)) + (let ((debug-on-error t)) (eval (car (read-from-string sexp)))) (condition-case nil (eval (car (read-from-string sexp))) diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index 19b893a5cf9..695f9b92712 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -462,7 +462,7 @@ The holidays are those in the list `calendar-holidays'." (sort (dolist (p calendar-holidays res) (if (setq h (if calendar-debug-sexp - (let ((stack-trace-on-error t)) + (let ((debug-on-error t)) (eval p)) (condition-case nil (eval p) |