[Emacs-diffs] Changes to emacs/src/buffer.c

[Richard M. Stallman]

Index: emacs/src/buffer.c
diff -c emacs/src/buffer.c:1.389 emacs/src/buffer.c:1.390
*** emacs/src/buffer.c:1.389    Wed Jun 26 04:35:14 2002
--- emacs/src/buffer.c  Sun Jul  7 06:17:26 2002
***************
*** 854,860 ****
        result = Fdefault_value (symbol);
      }
    else
!     result = XCDR (result);
  
    if (EQ (result, Qunbound))
      return Fsignal (Qvoid_variable, Fcons (symbol, Qnil));
--- 854,879 ----
        result = Fdefault_value (symbol);
      }
    else
!     {
!       Lisp_Object valcontents;
!       Lisp_Object current_alist_element;
! 
!       /* What binding is loaded right now?  */
!       valcontents = SYMBOL_VALUE (symbol);
!       current_alist_element
!       = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
! 
!       /* The value of the currently loaded binding is not
!        stored in it, but rather in the realvalue slot.
!        Store that value into the binding it belongs to
!        in case that is the one we are about to use.  */
! 
!       Fsetcdr (current_alist_element,
!              do_symval_forwarding (XBUFFER_LOCAL_VALUE 
(valcontents)->realvalue));
! 
!       /* Now get the (perhaps updated) value out of the binding.  */
!       result = XCDR (result);
!     }
  
    if (EQ (result, Qunbound))
      return Fsignal (Qvoid_variable, Fcons (symbol, Qnil));