comparison src/buffer.c @ 62793:71f6142fcfb9

(Fbuffer_local_value): Make argument name match its use in docstring.

62792:e82e717e3b6d

DEFUN ("buffer-local-value", Fbuffer_local_value,
       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;
      int found = 0;

	   offset += (sizeof (EMACS_INT)))
	{
	  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;
	      break;
	    }
	}

      if (!found)
	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.

      /* Now get the (perhaps updated) value out of the binding.  */
      result = XCDR (result);
    }

  if (EQ (result, Qunbound))
    return Fsignal (Qvoid_variable, Fcons (symbol, Qnil));

  return result;
}

/* Return an alist of the Lisp-level buffer-local bindings of

  DEFVAR_LISP_NOPRO ("default-ctl-arrow",
		     &buffer_defaults.ctl_arrow,
		     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",
		     &buffer_defaults.truncate_lines,
		     doc: /* Default value of `truncate-lines' for buffers that do not override it.

62793:71f6142fcfb9

DEFUN ("buffer-local-value", Fbuffer_local_value,
       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;
      int found = 0;

	   offset += (sizeof (EMACS_INT)))
	{
	  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;
	      break;
	    }
	}

      if (!found)
	result = Fdefault_value (variable);
    }
  else
    {
      Lisp_Object valcontents;
      Lisp_Object current_alist_element;

      /* What binding is loaded right now?  */
      valcontents = SYMBOL_VALUE (variable);
      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.

      /* Now get the (perhaps updated) value out of the binding.  */
      result = XCDR (result);
    }

  if (EQ (result, Qunbound))
    return Fsignal (Qvoid_variable, Fcons (variable, Qnil));

  return result;
}

/* Return an alist of the Lisp-level buffer-local bindings of

  DEFVAR_LISP_NOPRO ("default-ctl-arrow",
		     &buffer_defaults.ctl_arrow,
		     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",
		     &buffer_defaults.truncate_lines,
		     doc: /* Default value of `truncate-lines' for buffers that do not override it.