# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1183742991 0
# Node ID 36ddacf0d44b9524bdce6eb8e713532d379889ee
# Parent  51ee6159fec2d8c508af1bc775cae876859d4a17
(eval-last-sexp): Avoid introducing any
dynamic bindings around the evaluation of the expression.

diff -r 51ee6159fec2 -r 36ddacf0d44b lisp/emacs-lisp/lisp-mode.el
--- a/lisp/emacs-lisp/lisp-mode.el	Fri Jul 06 16:13:37 2007 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el	Fri Jul 06 17:29:51 2007 +0000
@@ -628,13 +628,13 @@
   (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.