[Emacs-diffs] Changes to emacs/src/eval.c,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/11/19 07:42:26

Index: eval.c
===================================================================
RCS file: /sources/emacs/emacs/src/eval.c,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -b -r1.295 -r1.296
--- eval.c      27 Oct 2007 09:07:17 -0000      1.295
+++ eval.c      19 Nov 2007 07:42:25 -0000      1.296
@@ -3263,7 +3263,6 @@
 specbind (symbol, value)
      Lisp_Object symbol, value;
 {
-  Lisp_Object ovalue;
   Lisp_Object valcontents;
 
   CHECK_SYMBOL (symbol);
@@ -3283,9 +3282,7 @@
     }
   else
     {
-      Lisp_Object valcontents;
-
-      ovalue = find_symbol_value (symbol);
+      Lisp_Object ovalue = find_symbol_value (symbol);
       specpdl_ptr->func = 0;
       specpdl_ptr->old_value = ovalue;
 
@@ -3330,9 +3327,13 @@
        specpdl_ptr->symbol = symbol;
 
       specpdl_ptr++;
+      /* We used to do
       if (BUFFER_OBJFWDP (ovalue) || KBOARD_OBJFWDP (ovalue))
        store_symval_forwarding (symbol, ovalue, value, NULL);
       else
+         but ovalue comes from find_symbol_value which should never return
+         such an internal value.  */
+      eassert (!(BUFFER_OBJFWDP (ovalue) || KBOARD_OBJFWDP (ovalue)));
        set_internal (symbol, value, 0, 1);
     }
 }