Obey lexical-binding in interactive evaluation commands.

* lisp/emacs-lisp/edebug.el (edebug-eval-defun, edebug-eval):
* lisp/emacs-lisp/lisp-mode.el (eval-last-sexp-1, eval-defun-1):
* lisp/ielm.el (ielm-eval-input):
* lisp/simple.el (eval-expression): Use new eval arg to obey lexical-binding.

* src/eval.c (Feval): Add `lexical' argument.  Adjust callers.
(Ffuncall, eval_sub): Avoid goto.

1 files changed, 11 insertions, 15 deletions

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index c90d1394978..2cdbd115928 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -699,16 +699,9 @@ If CHAR is not a character, return nil."
 (defun eval-last-sexp-1 (eval-last-sexp-arg-internal)
   "Evaluate sexp before point; print value in minibuffer.
 With argument, print output into current buffer."
-  (let ((standard-output (if eval-last-sexp-arg-internal (current-buffer) t))
-	;; preserve the current lexical environment
-	(internal-interpreter-environment internal-interpreter-environment))
+  (let ((standard-output (if eval-last-sexp-arg-internal (current-buffer) t)))
     ;; Setup the lexical environment if lexical-binding is enabled.
-    ;; Note that `internal-interpreter-environment' _can't_ be both
-    ;; assigned and let-bound above -- it's treated specially (and
-    ;; oddly) by the interpreter!
-    (when lexical-binding
-      (setq internal-interpreter-environment '(t)))
-    (eval-last-sexp-print-value (eval (preceding-sexp)))))
+    (eval-last-sexp-print-value (eval (preceding-sexp) lexical-binding))))
 
 
 (defun eval-last-sexp-print-value (value)
@@ -772,16 +765,18 @@ Reinitialize the face according to the `defface' specification."
 	;; `defcustom' is now macroexpanded to
 	;; `custom-declare-variable' with a quoted value arg.
 	((and (eq (car form) 'custom-declare-variable)
-	      (default-boundp (eval (nth 1 form))))
+	      (default-boundp (eval (nth 1 form) lexical-binding)))
 	 ;; Force variable to be bound.
-	 (set-default (eval (nth 1 form)) (eval (nth 1 (nth 2 form))))
+	 (set-default (eval (nth 1 form) lexical-binding)
+                      (eval (nth 1 (nth 2 form)) lexical-binding))
 	 form)
 	;; `defface' is macroexpanded to `custom-declare-face'.
 	((eq (car form) 'custom-declare-face)
 	 ;; Reset the face.
 	 (setq face-new-frame-defaults
-	       (assq-delete-all (eval (nth 1 form)) face-new-frame-defaults))
-	 (put (eval (nth 1 form)) 'face-defface-spec nil)
+	       (assq-delete-all (eval (nth 1 form) lexical-binding)
+                                face-new-frame-defaults))
+	 (put (eval (nth 1 form) lexical-binding) 'face-defface-spec nil)
 	 ;; Setting `customized-face' to the new spec after calling
 	 ;; the form, but preserving the old saved spec in `saved-face',
 	 ;; imitates the situation when the new face spec is set
@@ -792,10 +787,11 @@ Reinitialize the face according to the `defface' specification."
 	 ;; `defface' change the spec, regardless of a saved spec.
 	 (prog1 `(prog1 ,form
 		   (put ,(nth 1 form) 'saved-face
-			',(get (eval (nth 1 form)) 'saved-face))
+			',(get (eval (nth 1 form) lexical-binding)
+                               'saved-face))
 		   (put ,(nth 1 form) 'customized-face
 			,(nth 2 form)))
-	   (put (eval (nth 1 form)) 'saved-face nil)))
+	   (put (eval (nth 1 form) lexical-binding) 'saved-face nil)))
 	((eq (car form) 'progn)
 	 (cons 'progn (mapcar 'eval-defun-1 (cdr form))))
 	(t form)))