aboutsummaryrefslogtreecommitdiffstats
path: root/src/data.c
diff options
context:
space:
mode:
authorRichard M. Stallman1995-04-07 05:17:56 +0000
committerRichard M. Stallman1995-04-07 05:17:56 +0000
commit324a6eef85bf5deb6163842e68c209408aeb8456 (patch)
treeb71355293dce94792b7f519637319d9f643039da /src/data.c
parent3f000d8c7f5cab6f1ff1450670761256925cb855 (diff)
downloademacs-324a6eef85bf5deb6163842e68c209408aeb8456.tar.gz
emacs-324a6eef85bf5deb6163842e68c209408aeb8456.zip
(Ftype_of, do_symval_forwarding, store_symval_forwarding)
(find_symbol_value, Fmake_variable_buffer_local, Fmake_local_variable): Use XMISCTYPE.
Diffstat (limited to 'src/data.c')
-rw-r--r--src/data.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/data.c b/src/data.c
index 32eac49acd9..75e9b55a431 100644
--- a/src/data.c
+++ b/src/data.c
@@ -209,7 +209,7 @@ for example, (type-of 1) returns `integer'.")
209 return Qcons; 209 return Qcons;
210 210
211 case Lisp_Misc: 211 case Lisp_Misc:
212 switch (XMISC (object)->type) 212 switch (XMISCTYPE (object))
213 { 213 {
214 case Lisp_Misc_Marker: 214 case Lisp_Misc_Marker:
215 return Qmarker; 215 return Qmarker;
@@ -695,7 +695,7 @@ do_symval_forwarding (valcontents)
695 register Lisp_Object val; 695 register Lisp_Object val;
696 int offset; 696 int offset;
697 if (MISCP (valcontents)) 697 if (MISCP (valcontents))
698 switch (XMISC (valcontents)->type) 698 switch (XMISCTYPE (valcontents))
699 { 699 {
700 case Lisp_Misc_Intfwd: 700 case Lisp_Misc_Intfwd:
701 XSETINT (val, *XINTFWD (valcontents)->intvar); 701 XSETINT (val, *XINTFWD (valcontents)->intvar);
@@ -731,7 +731,7 @@ store_symval_forwarding (sym, valcontents, newval)
731 switch (SWITCH_ENUM_CAST (XTYPE (valcontents))) 731 switch (SWITCH_ENUM_CAST (XTYPE (valcontents)))
732 { 732 {
733 case Lisp_Misc: 733 case Lisp_Misc:
734 switch (XMISC (valcontents)->type) 734 switch (XMISCTYPE (valcontents))
735 { 735 {
736 case Lisp_Misc_Intfwd: 736 case Lisp_Misc_Intfwd:
737 CHECK_NUMBER (newval, 1); 737 CHECK_NUMBER (newval, 1);
@@ -848,7 +848,7 @@ find_symbol_value (sym)
848 848
849 if (MISCP (valcontents)) 849 if (MISCP (valcontents))
850 { 850 {
851 switch (XMISC (valcontents)->type) 851 switch (XMISCTYPE (valcontents))
852 { 852 {
853 case Lisp_Misc_Intfwd: 853 case Lisp_Misc_Intfwd:
854 XSETINT (val, *XINTFWD (valcontents)->intvar); 854 XSETINT (val, *XINTFWD (valcontents)->intvar);
@@ -1192,7 +1192,7 @@ The function `default-value' gets the default value and `set-default' sets it.")
1192 return sym; 1192 return sym;
1193 if (SOME_BUFFER_LOCAL_VALUEP (valcontents)) 1193 if (SOME_BUFFER_LOCAL_VALUEP (valcontents))
1194 { 1194 {
1195 XMISC (XSYMBOL (sym)->value)->type = Lisp_Misc_Buffer_Local_Value; 1195 XMISCTYPE (XSYMBOL (sym)->value) = Lisp_Misc_Buffer_Local_Value;
1196 return sym; 1196 return sym;
1197 } 1197 }
1198 if (EQ (valcontents, Qunbound)) 1198 if (EQ (valcontents, Qunbound))
@@ -1200,7 +1200,7 @@ The function `default-value' gets the default value and `set-default' sets it.")
1200 tem = Fcons (Qnil, Fsymbol_value (sym)); 1200 tem = Fcons (Qnil, Fsymbol_value (sym));
1201 XCONS (tem)->car = tem; 1201 XCONS (tem)->car = tem;
1202 newval = allocate_misc (); 1202 newval = allocate_misc ();
1203 XMISC (newval)->type = Lisp_Misc_Buffer_Local_Value; 1203 XMISCTYPE (newval) = Lisp_Misc_Buffer_Local_Value;
1204 XBUFFER_LOCAL_VALUE (newval)->car = XSYMBOL (sym)->value; 1204 XBUFFER_LOCAL_VALUE (newval)->car = XSYMBOL (sym)->value;
1205 XBUFFER_LOCAL_VALUE (newval)->cdr = Fcons (Fcurrent_buffer (), tem); 1205 XBUFFER_LOCAL_VALUE (newval)->cdr = Fcons (Fcurrent_buffer (), tem);
1206 XSYMBOL (sym)->value = newval; 1206 XSYMBOL (sym)->value = newval;
@@ -1247,7 +1247,7 @@ Use `make-local-hook' instead.")
1247 tem = Fcons (Qnil, do_symval_forwarding (valcontents)); 1247 tem = Fcons (Qnil, do_symval_forwarding (valcontents));
1248 XCONS (tem)->car = tem; 1248 XCONS (tem)->car = tem;
1249 newval = allocate_misc (); 1249 newval = allocate_misc ();
1250 XMISC (newval)->type = Lisp_Misc_Some_Buffer_Local_Value; 1250 XMISCTYPE (newval) = Lisp_Misc_Some_Buffer_Local_Value;
1251 XBUFFER_LOCAL_VALUE (newval)->car = XSYMBOL (sym)->value; 1251 XBUFFER_LOCAL_VALUE (newval)->car = XSYMBOL (sym)->value;
1252 XBUFFER_LOCAL_VALUE (newval)->cdr = Fcons (Qnil, tem); 1252 XBUFFER_LOCAL_VALUE (newval)->cdr = Fcons (Qnil, tem);
1253 XSYMBOL (sym)->value = newval; 1253 XSYMBOL (sym)->value = newval;