diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-10-16 15:42:58 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-10-16 15:42:58 +0000 |
| commit | 67ee9f6e9121a43a5bad61145b55d785d88bfabf (patch) | |
| tree | a776c1c5a82747dd188a8e34d9499f2f0d6a0928 /src/frame.c | |
| parent | 4144e15e96e7d67ff0ebbed15ecc14154ba68da2 (diff) | |
| download | emacs-67ee9f6e9121a43a5bad61145b55d785d88bfabf.tar.gz | |
* lisp.h (enum Lisp_Misc_Type): Del Lisp_Misc_Some_Buffer_Local_Value.
(XMISCANY): New macro.
(XMISCTYPE): Use it.
(struct Lisp_Misc_Any): New type.
(union Lisp_Misc): Use it.
(struct Lisp_Buffer_Local_Value): Add `local_if_set' bit.
* data.c (Fboundp, store_symval_forwarding, swap_in_global_binding)
(find_symbol_value, set_internal, default_value, Fset_default)
(Fmake_variable_buffer_local, Fmake_local_variable)
(Fkill_local_variable, Fmake_variable_frame_local, Flocal_variable_p)
(Flocal_variable_if_set_p, Fvariable_binding_locus):
The SOME_BUFFER_LOCAL_VALUEP distinction is replaced by local_if_set.
* alloc.c (allocate_buffer): Set the size and tag.
(allocate_misc, mark_maybe_object, mark_object, survives_gc_p):
Use XMISCANY.
(die): Follow the GNU convention for error messages.
* print.c (print_object): SOME_BUFFER_LOCAL_VALUEP -> local_if_set.
* buffer.c (Fget_buffer_create, Fmake_indirect_buffer): Don't set the
tag any more.
(set_buffer_internal_1):
* frame.c (store_frame_param):
* eval.c (specbind):
* xdisp.c (select_frame_for_redisplay): Drop SOME_BUFFER_LOCAL_VALUEP.
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/frame.c b/src/frame.c index ff860d83509..090de96cebd 100644 --- a/src/frame.c +++ b/src/frame.c @@ -2289,8 +2289,7 @@ store_frame_param (f, prop, val) { Lisp_Object valcontents; valcontents = SYMBOL_VALUE (prop); - if ((BUFFER_LOCAL_VALUEP (valcontents) - || SOME_BUFFER_LOCAL_VALUEP (valcontents)) + if ((BUFFER_LOCAL_VALUEP (valcontents)) && XBUFFER_LOCAL_VALUE (valcontents)->check_frame && XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame && XFRAME (XBUFFER_LOCAL_VALUE (valcontents)->frame) == f) |