mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 03:40:56 -08:00
Code Issues Projects Releases Wiki Activity

* lisp.h (indirect_variable):

Browse source 
* data.c (indirect_variable, let_shadows_buffer_binding_p):
Use Lisp_Symbol pointers rather than Lisp_Object.  Adjust callers.
* buffer.c (buffer_slot_type_mismatch): Use wrong-type-argument.
To this end, change calling-convention.
This commit is contained in:
Stefan Monnier 2008-05-19 18:38:55 +00:00
parent 61bd39a3bd
commit ad97b375e8
4 changed files with 101 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/buffer.c
View file

@ -927,12 +927,14 @@ is the default binding of the variable. */)
{
register struct buffer *buf;
register Lisp_Object result;
struct Lisp_Symbol *sym;
CHECK_SYMBOL (variable);
CHECK_BUFFER (buffer);
buf = XBUFFER (buffer);
variable = indirect_variable (variable);
sym = indirect_variable (XSYMBOL (variable));
XSETSYMBOL (variable, sym);
/* Look in local_var_list */
result = Fassoc (variable, buf->local_var_alist);
@ -969,7 +971,7 @@ is the default binding of the variable. */)
Lisp_Object current_alist_element;
/* What binding is loaded right now? */
valcontents = SYMBOL_VALUE (variable);
valcontents = sym->value;
current_alist_element
= XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
@ -4550,32 +4552,21 @@ evaporate_overlays (pos)
in the slot with offset OFFSET. */
void
buffer_slot_type_mismatch (sym, type)
Lisp_Object sym;
buffer_slot_type_mismatch (newval, type)
Lisp_Object newval;
int type;
{
char *type_name;
Lisp_Object predicate;
switch (type)
{
case Lisp_Int:
type_name = "integers";
break;
case Lisp_String:
type_name = "strings";
break;
case Lisp_Symbol:
type_name = "symbols";
break;
default:
abort ();
case Lisp_Int: predicate = Qintegerp; break;
case Lisp_String: predicate = Qstringp; break;
case Lisp_Symbol: predicate = Qsymbolp; break;
default: abort ();
}
error ("Only %s should be stored in the buffer-local variable %s",
type_name, SDATA (SYMBOL_NAME (sym)));
wrong_type_argument (predicate, newval);
}