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

[Juanma Barranquero]

Index: emacs/src/buffer.c
diff -c emacs/src/buffer.c:1.479 emacs/src/buffer.c:1.480
*** emacs/src/buffer.c:1.479    Wed May  4 22:10:14 2005
--- emacs/src/buffer.c  Fri May 27 11:01:38 2005
***************
*** 877,896 ****
         Sbuffer_local_value, 2, 2, 0,
         doc: /* Return the value of VARIABLE in BUFFER.
  If VARIABLE does not have a buffer-local binding in BUFFER, the value
! is the default binding of variable. */)
!      (symbol, buffer)
!      register Lisp_Object symbol;
       register Lisp_Object buffer;
  {
    register struct buffer *buf;
    register Lisp_Object result;
  
!   CHECK_SYMBOL (symbol);
    CHECK_BUFFER (buffer);
    buf = XBUFFER (buffer);
  
    /* Look in local_var_list */
!   result = Fassoc (symbol, buf->local_var_alist);
    if (NILP (result))
      {
        int offset, idx;
--- 877,896 ----
         Sbuffer_local_value, 2, 2, 0,
         doc: /* Return the value of VARIABLE in BUFFER.
  If VARIABLE does not have a buffer-local binding in BUFFER, the value
! is the default binding of the variable. */)
!      (variable, buffer)
!      register Lisp_Object variable;
       register Lisp_Object buffer;
  {
    register struct buffer *buf;
    register Lisp_Object result;
  
!   CHECK_SYMBOL (variable);
    CHECK_BUFFER (buffer);
    buf = XBUFFER (buffer);
  
    /* Look in local_var_list */
!   result = Fassoc (variable, buf->local_var_alist);
    if (NILP (result))
      {
        int offset, idx;
***************
*** 905,911 ****
          idx = PER_BUFFER_IDX (offset);
          if ((idx == -1 || PER_BUFFER_VALUE_P (buf, idx))
              && SYMBOLP (PER_BUFFER_SYMBOL (offset))
!             && EQ (PER_BUFFER_SYMBOL (offset), symbol))
            {
              result = PER_BUFFER_VALUE (buf, offset);
              found = 1;
--- 905,911 ----
          idx = PER_BUFFER_IDX (offset);
          if ((idx == -1 || PER_BUFFER_VALUE_P (buf, idx))
              && SYMBOLP (PER_BUFFER_SYMBOL (offset))
!             && EQ (PER_BUFFER_SYMBOL (offset), variable))
            {
              result = PER_BUFFER_VALUE (buf, offset);
              found = 1;
***************
*** 914,920 ****
        }
  
        if (!found)
!       result = Fdefault_value (symbol);
      }
    else
      {
--- 914,920 ----
        }
  
        if (!found)
!       result = Fdefault_value (variable);
      }
    else
      {
***************
*** 922,928 ****
        Lisp_Object current_alist_element;
  
        /* What binding is loaded right now?  */
!       valcontents = SYMBOL_VALUE (symbol);
        current_alist_element
        = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
  
--- 922,928 ----
        Lisp_Object current_alist_element;
  
        /* What binding is loaded right now?  */
!       valcontents = SYMBOL_VALUE (variable);
        current_alist_element
        = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
  
***************
*** 939,945 ****
      }
  
    if (EQ (result, Qunbound))
!     return Fsignal (Qvoid_variable, Fcons (symbol, Qnil));
  
    return result;
  }
--- 939,945 ----
      }
  
    if (EQ (result, Qunbound))
!     return Fsignal (Qvoid_variable, Fcons (variable, Qnil));
  
    return result;
  }
***************
*** 5276,5294 ****
                     doc: /* Default value of `ctl-arrow' for buffers that do 
not override it.
  This is the same as (default-value 'ctl-arrow).  */);
  
!    DEFVAR_LISP_NOPRO ("default-direction-reversed",
!                     &buffer_defaults.direction_reversed,
!                     doc: /* Default value of `direction-reversed' for buffers 
that do not override it.
  This is the same as (default-value 'direction-reversed).  */);
  
!    DEFVAR_LISP_NOPRO ("default-enable-multibyte-characters",
!                     &buffer_defaults.enable_multibyte_characters,
!                     doc: /* *Default value of `enable-multibyte-characters' 
for buffers not overriding it.
  This is the same as (default-value 'enable-multibyte-characters).  */);
  
!    DEFVAR_LISP_NOPRO ("default-buffer-file-coding-system",
!                     &buffer_defaults.buffer_file_coding_system,
!                     doc: /* Default value of `buffer-file-coding-system' for 
buffers not overriding it.
  This is the same as (default-value 'buffer-file-coding-system).  */);
  
    DEFVAR_LISP_NOPRO ("default-truncate-lines",
--- 5276,5294 ----
                     doc: /* Default value of `ctl-arrow' for buffers that do 
not override it.
  This is the same as (default-value 'ctl-arrow).  */);
  
!   DEFVAR_LISP_NOPRO ("default-direction-reversed",
!                      &buffer_defaults.direction_reversed,
!                      doc: /* Default value of `direction-reversed' for 
buffers that do not override it.
  This is the same as (default-value 'direction-reversed).  */);
  
!   DEFVAR_LISP_NOPRO ("default-enable-multibyte-characters",
!                      &buffer_defaults.enable_multibyte_characters,
!                      doc: /* *Default value of `enable-multibyte-characters' 
for buffers not overriding it.
  This is the same as (default-value 'enable-multibyte-characters).  */);
  
!   DEFVAR_LISP_NOPRO ("default-buffer-file-coding-system",
!                      &buffer_defaults.buffer_file_coding_system,
!                      doc: /* Default value of `buffer-file-coding-system' for 
buffers not overriding it.
  This is the same as (default-value 'buffer-file-coding-system).  */);
  
    DEFVAR_LISP_NOPRO ("default-truncate-lines",