procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing

Browse source 
symbols' value directly.
This commit is contained in:
Gerd Moellmann 2001-10-05 09:49:39 +00:00
parent 44c6c0191f
commit f5c1dd0dc5
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/buffer.c
View file

@ -1683,7 +1683,7 @@ set_buffer_internal_1 (b)
for (tail = b->local_var_alist; !NILP (tail); tail = XCDR (tail)) for (tail = b->local_var_alist; !NILP (tail); tail = XCDR (tail))
{ {
valcontents = XSYMBOL (XCAR (XCAR (tail)))->value; valcontents = SYMBOL_VALUE (XCAR (XCAR (tail)));
if ((BUFFER_LOCAL_VALUEP (valcontents) if ((BUFFER_LOCAL_VALUEP (valcontents)
|| SOME_BUFFER_LOCAL_VALUEP (valcontents)) || SOME_BUFFER_LOCAL_VALUEP (valcontents))
&& (tem = XBUFFER_LOCAL_VALUE (valcontents)->realvalue, && (tem = XBUFFER_LOCAL_VALUE (valcontents)->realvalue,
@ -1698,7 +1698,7 @@ set_buffer_internal_1 (b)
if (old_buf) if (old_buf)
for (tail = old_buf->local_var_alist; !NILP (tail); tail = XCDR (tail)) for (tail = old_buf->local_var_alist; !NILP (tail); tail = XCDR (tail))
{ {
valcontents = XSYMBOL (XCAR (XCAR (tail)))->value; valcontents = SYMBOL_VALUE (XCAR (XCAR (tail)));
if ((BUFFER_LOCAL_VALUEP (valcontents) if ((BUFFER_LOCAL_VALUEP (valcontents)
|| SOME_BUFFER_LOCAL_VALUEP (valcontents)) || SOME_BUFFER_LOCAL_VALUEP (valcontents))
&& (tem = XBUFFER_LOCAL_VALUE (valcontents)->realvalue, && (tem = XBUFFER_LOCAL_VALUE (valcontents)->realvalue,
@ -2260,26 +2260,26 @@ swap_out_buffer_local_variables (b)
sym = XCAR (XCAR (alist)); sym = XCAR (XCAR (alist));
/* Need not do anything if some other buffer's binding is now encached. */ /* Need not do anything if some other buffer's binding is now encached. */
tem = XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->buffer; tem = XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->buffer;
if (BUFFERP (tem) && XBUFFER (tem) == current_buffer) if (BUFFERP (tem) && XBUFFER (tem) == current_buffer)
{ {
/* Symbol is set up for this buffer's old local value. /* Symbol is set up for this buffer's old local value.
Set it up for the current buffer with the default value. */ Set it up for the current buffer with the default value. */
tem = XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->cdr; tem = XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->cdr;
/* Store the symbol's current value into the alist entry /* Store the symbol's current value into the alist entry
it is currently set up for. This is so that, if the it is currently set up for. This is so that, if the
local is marked permanent, and we make it local again local is marked permanent, and we make it local again
later in Fkill_all_local_variables, we don't lose the value. */ later in Fkill_all_local_variables, we don't lose the value. */
XCDR (XCAR (tem)) XCDR (XCAR (tem))
= do_symval_forwarding (XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->realvalue); = do_symval_forwarding (XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->realvalue);
/* Switch to the symbol's default-value alist entry. */ /* Switch to the symbol's default-value alist entry. */
XCAR (tem) = tem; XCAR (tem) = tem;
/* Mark it as current for buffer B. */ /* Mark it as current for buffer B. */
XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->buffer = buffer; XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->buffer = buffer;
/* Store the current value into any forwarding in the symbol. */ /* Store the current value into any forwarding in the symbol. */
store_symval_forwarding (sym, store_symval_forwarding (sym,
XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->realvalue, XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->realvalue,
XCDR (tem), NULL); XCDR (tem), NULL);
} }
} }

4
src/coding.c
View file

@ -4110,7 +4110,7 @@ detect_coding (coding, src, src_bytes)
if (! mask) if (! mask)
idx = CODING_CATEGORY_IDX_RAW_TEXT; idx = CODING_CATEGORY_IDX_RAW_TEXT;
val = XSYMBOL (XVECTOR (Vcoding_category_table)->contents[idx])->value; val = SYMBOL_VALUE (XVECTOR (Vcoding_category_table)->contents[idx]);
if (coding->eol_type != CODING_EOL_UNDECIDED) if (coding->eol_type != CODING_EOL_UNDECIDED)
{ {
@ -6881,7 +6881,7 @@ call this function")
{ {
Lisp_Object val; Lisp_Object val;
val = XSYMBOL (XVECTOR (Vcoding_category_table)->contents[i])->value; val = SYMBOL_VALUE (XVECTOR (Vcoding_category_table)->contents[i]);
if (!NILP (val)) if (!NILP (val))
{ {
if (! coding_system_table[i]) if (! coding_system_table[i])

2
src/fns.c
View file

@ -5020,7 +5020,7 @@ guesswork fails. Normally, an error is signaled in such case.")
if (STRING_MULTIBYTE (object)) if (STRING_MULTIBYTE (object))
/* use default, we can't guess correct value */ /* use default, we can't guess correct value */
coding_system = XSYMBOL (XCAR (Vcoding_category_list))->value; coding_system = SYMBOL_VALUE (XCAR (Vcoding_category_list));
else else
coding_system = Qraw_text; coding_system = Qraw_text;
} }

2
src/frame.c
View file

@ -1915,7 +1915,7 @@ store_frame_param (f, prop, val)
if (SYMBOLP (prop)) if (SYMBOLP (prop))
{ {
Lisp_Object valcontents; Lisp_Object valcontents;
valcontents = XSYMBOL (prop)->value; valcontents = SYMBOL_VALUE (prop);
if ((BUFFER_LOCAL_VALUEP (valcontents) if ((BUFFER_LOCAL_VALUEP (valcontents)
|| SOME_BUFFER_LOCAL_VALUEP (valcontents)) || SOME_BUFFER_LOCAL_VALUEP (valcontents))
&& XBUFFER_LOCAL_VALUE (valcontents)->check_frame && XBUFFER_LOCAL_VALUE (valcontents)->check_frame

2
src/minibuf.c
View file

@ -602,7 +602,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
Lisp_Object histval; Lisp_Object histval;
/* If variable is unbound, make it nil. */ /* If variable is unbound, make it nil. */
if (EQ (XSYMBOL (Vminibuffer_history_variable)->value, Qunbound)) if (EQ (SYMBOL_VALUE (Vminibuffer_history_variable), Qunbound))
Fset (Vminibuffer_history_variable, Qnil); Fset (Vminibuffer_history_variable, Qnil);
histval = Fsymbol_value (Vminibuffer_history_variable); histval = Fsymbol_value (Vminibuffer_history_variable);