diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-12-15 12:46:59 -0500 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-12-15 12:46:59 -0500 |
commit | a0ee6f2751acba71df443d4d795bb350eb6421dd (patch) | |
tree | e4f47d66877b1b00b9ce00a304b509dee840868a /lisp/simple.el | |
parent | defb141157dfa37c33cdcbfa4b29c702a8fc9edf (diff) | |
download | emacs-a0ee6f2751acba71df443d4d795bb350eb6421dd.tar.gz |
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.
Diffstat (limited to 'lisp/simple.el')
-rw-r--r-- | lisp/simple.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index da8ac55c01d..a977be7cf8e 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -1212,12 +1212,12 @@ this command arranges for all errors to enter the debugger." current-prefix-arg)) (if (null eval-expression-debug-on-error) - (setq values (cons (eval eval-expression-arg) values)) + (push (eval eval-expression-arg lexical-binding) values) (let ((old-value (make-symbol "t")) new-value) ;; Bind debug-on-error to something unique so that we can ;; detect when evaled code changes it. (let ((debug-on-error old-value)) - (setq values (cons (eval eval-expression-arg) values)) + (push (eval eval-expression-arg lexical-binding) values) (setq new-value debug-on-error)) ;; If evaled code has changed the value of debug-on-error, ;; propagate that change to the global binding. |