(eval-last-sexp): Allow let-bindings to terminate

before doing the eval.
Handle (interactive ...) form specially.

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 26eab753c387af3b712fc32b22165bae448d3f24..89bac6d80f932d1b7622102ef3cfef28d6e91fc2 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -293,16 +293,30 @@ if that value is non-nil."
   "Evaluate sexp before point; print value in minibuffer.
 With argument, print output into current buffer."
   (interactive "P")
-  (let ((standard-output (if eval-last-sexp-arg-internal (current-buffer) t))
-       (opoint (point)))
-    (prin1 (let ((stab (syntax-table)))
-            (eval (unwind-protect
+  (let ((standard-output (if eval-last-sexp-arg-internal (current-buffer) t)))
+    (prin1 (eval (let ((stab (syntax-table))
+                      (opoint (point))
+                      expr)
+                  (unwind-protect
                       (save-excursion
                         (set-syntax-table emacs-lisp-mode-syntax-table)
                         (forward-sexp -1)
                         (save-restriction
                           (narrow-to-region (point-min) opoint)
-                          (read (current-buffer))))
+                          (setq expr (read (current-buffer)))
+                          ;; If it's an (interactive ...) form, it's more
+                          ;; useful to show how an interactive call would
+                          ;; use it.
+                          (and (consp expr)
+                               (eq (car expr) 'interactive)
+                               (setq expr
+                                     (list 'call-interactively
+                                           (list 'quote
+                                                 (list 'lambda
+                                                       '(&rest args)
+                                                       expr
+                                                       'args)))))
+                          expr))
                     (set-syntax-table stab)))))))
 
 (defun eval-defun (eval-defun-arg-internal)