Mercurial > emacs
comparison src/data.c @ 86229:0ec5ce87b9e0
* data.c (store_symval_forwarding, set_internal):
* eval.c (specbind): Remove dead code.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 19 Nov 2007 07:42:25 +0000 |
parents | 8743273c407c |
children | 59344cb482f3 |
comparison
equal
deleted
inserted
replaced
86228:8e5b337fea59 | 86229:0ec5ce87b9e0 |
---|---|
920 switch (XMISCTYPE (valcontents)) | 920 switch (XMISCTYPE (valcontents)) |
921 { | 921 { |
922 case Lisp_Misc_Intfwd: | 922 case Lisp_Misc_Intfwd: |
923 CHECK_NUMBER (newval); | 923 CHECK_NUMBER (newval); |
924 *XINTFWD (valcontents)->intvar = XINT (newval); | 924 *XINTFWD (valcontents)->intvar = XINT (newval); |
925 if (*XINTFWD (valcontents)->intvar != XINT (newval)) | 925 /* This can never happen since intvar points to an EMACS_INT |
926 error ("Value out of range for variable `%s'", | 926 which is at least large enough to hold a Lisp_Object. |
927 SDATA (SYMBOL_NAME (symbol))); | 927 if (*XINTFWD (valcontents)->intvar != XINT (newval)) |
928 error ("Value out of range for variable `%s'", | |
929 SDATA (SYMBOL_NAME (symbol))); */ | |
928 break; | 930 break; |
929 | 931 |
930 case Lisp_Misc_Boolfwd: | 932 case Lisp_Misc_Boolfwd: |
931 *XBOOLFWD (valcontents)->boolvar = NILP (newval) ? 0 : 1; | 933 *XBOOLFWD (valcontents)->boolvar = NILP (newval) ? 0 : 1; |
932 break; | 934 break; |
1235 wrong one. */ | 1237 wrong one. */ |
1236 if (!BUFFERP (XBUFFER_LOCAL_VALUE (valcontents)->buffer) | 1238 if (!BUFFERP (XBUFFER_LOCAL_VALUE (valcontents)->buffer) |
1237 || buf != XBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer) | 1239 || buf != XBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer) |
1238 || (XBUFFER_LOCAL_VALUE (valcontents)->check_frame | 1240 || (XBUFFER_LOCAL_VALUE (valcontents)->check_frame |
1239 && !EQ (selected_frame, XBUFFER_LOCAL_VALUE (valcontents)->frame)) | 1241 && !EQ (selected_frame, XBUFFER_LOCAL_VALUE (valcontents)->frame)) |
1240 || (BUFFER_LOCAL_VALUEP (valcontents) | 1242 || (EQ (XCAR (current_alist_element), |
1241 && EQ (XCAR (current_alist_element), | 1243 current_alist_element))) |
1242 current_alist_element))) | |
1243 { | 1244 { |
1244 /* The currently loaded binding is not necessarily valid. | 1245 /* The currently loaded binding is not necessarily valid. |
1245 We need to unload it, and choose a new binding. */ | 1246 We need to unload it, and choose a new binding. */ |
1246 | 1247 |
1247 /* Write out `realvalue' to the old loaded binding. */ | 1248 /* Write out `realvalue' to the old loaded binding. */ |