Commit 324a6eef authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(Ftype_of, do_symval_forwarding, store_symval_forwarding)

(find_symbol_value, Fmake_variable_buffer_local, Fmake_local_variable):
Use XMISCTYPE.
parent 3f000d8c
...@@ -209,7 +209,7 @@ for example, (type-of 1) returns `integer'.") ...@@ -209,7 +209,7 @@ for example, (type-of 1) returns `integer'.")
return Qcons; return Qcons;
case Lisp_Misc: case Lisp_Misc:
switch (XMISC (object)->type) switch (XMISCTYPE (object))
{ {
case Lisp_Misc_Marker: case Lisp_Misc_Marker:
return Qmarker; return Qmarker;
...@@ -695,7 +695,7 @@ do_symval_forwarding (valcontents) ...@@ -695,7 +695,7 @@ do_symval_forwarding (valcontents)
register Lisp_Object val; register Lisp_Object val;
int offset; int offset;
if (MISCP (valcontents)) if (MISCP (valcontents))
switch (XMISC (valcontents)->type) switch (XMISCTYPE (valcontents))
{ {
case Lisp_Misc_Intfwd: case Lisp_Misc_Intfwd:
XSETINT (val, *XINTFWD (valcontents)->intvar); XSETINT (val, *XINTFWD (valcontents)->intvar);
...@@ -731,7 +731,7 @@ store_symval_forwarding (sym, valcontents, newval) ...@@ -731,7 +731,7 @@ store_symval_forwarding (sym, valcontents, newval)
switch (SWITCH_ENUM_CAST (XTYPE (valcontents))) switch (SWITCH_ENUM_CAST (XTYPE (valcontents)))
{ {
case Lisp_Misc: case Lisp_Misc:
switch (XMISC (valcontents)->type) switch (XMISCTYPE (valcontents))
{ {
case Lisp_Misc_Intfwd: case Lisp_Misc_Intfwd:
CHECK_NUMBER (newval, 1); CHECK_NUMBER (newval, 1);
...@@ -848,7 +848,7 @@ find_symbol_value (sym) ...@@ -848,7 +848,7 @@ find_symbol_value (sym)
if (MISCP (valcontents)) if (MISCP (valcontents))
{ {
switch (XMISC (valcontents)->type) switch (XMISCTYPE (valcontents))
{ {
case Lisp_Misc_Intfwd: case Lisp_Misc_Intfwd:
XSETINT (val, *XINTFWD (valcontents)->intvar); XSETINT (val, *XINTFWD (valcontents)->intvar);
...@@ -1192,7 +1192,7 @@ The function `default-value' gets the default value and `set-default' sets it.") ...@@ -1192,7 +1192,7 @@ The function `default-value' gets the default value and `set-default' sets it.")
return sym; return sym;
if (SOME_BUFFER_LOCAL_VALUEP (valcontents)) if (SOME_BUFFER_LOCAL_VALUEP (valcontents))
{ {
XMISC (XSYMBOL (sym)->value)->type = Lisp_Misc_Buffer_Local_Value; XMISCTYPE (XSYMBOL (sym)->value) = Lisp_Misc_Buffer_Local_Value;
return sym; return sym;
} }
if (EQ (valcontents, Qunbound)) if (EQ (valcontents, Qunbound))
...@@ -1200,7 +1200,7 @@ The function `default-value' gets the default value and `set-default' sets it.") ...@@ -1200,7 +1200,7 @@ The function `default-value' gets the default value and `set-default' sets it.")
tem = Fcons (Qnil, Fsymbol_value (sym)); tem = Fcons (Qnil, Fsymbol_value (sym));
XCONS (tem)->car = tem; XCONS (tem)->car = tem;
newval = allocate_misc (); newval = allocate_misc ();
XMISC (newval)->type = Lisp_Misc_Buffer_Local_Value; XMISCTYPE (newval) = Lisp_Misc_Buffer_Local_Value;
XBUFFER_LOCAL_VALUE (newval)->car = XSYMBOL (sym)->value; XBUFFER_LOCAL_VALUE (newval)->car = XSYMBOL (sym)->value;
XBUFFER_LOCAL_VALUE (newval)->cdr = Fcons (Fcurrent_buffer (), tem); XBUFFER_LOCAL_VALUE (newval)->cdr = Fcons (Fcurrent_buffer (), tem);
XSYMBOL (sym)->value = newval; XSYMBOL (sym)->value = newval;
...@@ -1247,7 +1247,7 @@ Use `make-local-hook' instead.") ...@@ -1247,7 +1247,7 @@ Use `make-local-hook' instead.")
tem = Fcons (Qnil, do_symval_forwarding (valcontents)); tem = Fcons (Qnil, do_symval_forwarding (valcontents));
XCONS (tem)->car = tem; XCONS (tem)->car = tem;
newval = allocate_misc (); newval = allocate_misc ();
XMISC (newval)->type = Lisp_Misc_Some_Buffer_Local_Value; XMISCTYPE (newval) = Lisp_Misc_Some_Buffer_Local_Value;
XBUFFER_LOCAL_VALUE (newval)->car = XSYMBOL (sym)->value; XBUFFER_LOCAL_VALUE (newval)->car = XSYMBOL (sym)->value;
XBUFFER_LOCAL_VALUE (newval)->cdr = Fcons (Qnil, tem); XBUFFER_LOCAL_VALUE (newval)->cdr = Fcons (Qnil, tem);
XSYMBOL (sym)->value = newval; XSYMBOL (sym)->value = newval;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment