diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-09 08:00:55 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-09 08:00:55 +0000 |
| commit | 1011c48763982d02797a7058556d29f639f6efca (patch) | |
| tree | 5f1b7529b4cc483b73475b89245633c5848b8a5e /lisp/emacs-lisp/lisp-mode.el | |
| parent | 6f06dac7b57b8d73f4b26a855cd9862630192029 (diff) | |
| parent | 69e4c7c4bacf19e9e004605fcb1c067e478beffe (diff) | |
| download | emacs-1011c48763982d02797a7058556d29f639f6efca.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 803-805)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-227
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 164756dfdc3..73379a816d7 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -628,13 +628,13 @@ this command arranges for all errors to enter the debugger." (interactive "P") (if (null eval-expression-debug-on-error) (eval-last-sexp-1 eval-last-sexp-arg-internal) - (let ((old-value eval-last-sexp-fake-value) new-value value) - (let ((debug-on-error old-value)) - (setq value (eval-last-sexp-1 eval-last-sexp-arg-internal)) - (setq new-value debug-on-error)) - (unless (eq old-value new-value) - (setq debug-on-error new-value)) - value))) + (let ((value + (let ((debug-on-error eval-last-sexp-fake-value)) + (cons (eval-last-sexp-1 eval-last-sexp-arg-internal) + debug-on-error)))) + (unless (eq (cdr value) eval-last-sexp-fake-value) + (setq debug-on-error (cdr value))) + (car value)))) (defun eval-defun-1 (form) "Treat some expressions specially. |