]> git.eshelyaron.com Git - emacs.git/commitdiff
Revert Vinternal_interpreter_environment tweak
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 23 Apr 2019 03:02:20 +0000 (20:02 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 23 Apr 2019 03:02:32 +0000 (20:02 -0700)
Stefan Monnier pointed out examples like (funcall `(closure
,(let ((cycle (list nil))) (setcdr cycle cycle)) () a)),
where the user can set Vinternal_interpreter_environment
indirectly.
* src/eval.c (Fsetq): Revert recent change, going back to Fassq.

src/eval.c

index fde63f1a21cc52213c3f8bb1d22020bb54256a47..3fd9a40a3a23ed73542e1868b01dae1a710d2f9b 100644 (file)
@@ -513,7 +513,7 @@ usage: (setq [SYM VAL]...)  */)
       Lisp_Object lex_binding
        = ((!NILP (Vinternal_interpreter_environment) /* Mere optimization!  */
            && SYMBOLP (sym))
-          ? assq_no_quit (sym, Vinternal_interpreter_environment)
+          ? Fassq (sym, Vinternal_interpreter_environment)
           : Qnil);
       if (!NILP (lex_binding))
        XSETCDR (lex_binding, val); /* SYM is lexically bound.  */
@@ -2162,7 +2162,7 @@ eval_sub (Lisp_Object form)
         already did that when let-binding the variable.  */
       Lisp_Object lex_binding
        = (!NILP (Vinternal_interpreter_environment) /* Mere optimization!  */
-          ? assq_no_quit (form, Vinternal_interpreter_environment)
+          ? Fassq (form, Vinternal_interpreter_environment)
           : Qnil);
       return !NILP (lex_binding) ? XCDR (lex_binding) : Fsymbol_value (form);
     }