diff options
| author | Dmitry Antipov | 2012-07-31 16:36:19 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-07-31 16:36:19 +0400 |
| commit | e34f7f79833a23586d32fe522b547a0d9a696c13 (patch) | |
| tree | 4a2d3927202cb91b474bc9648ca9dee2bffaa54a /src/data.c | |
| parent | c09bfb2f140b2885af17185634451e2abfd6e91c (diff) | |
| download | emacs-e34f7f79833a23586d32fe522b547a0d9a696c13.tar.gz emacs-e34f7f79833a23586d32fe522b547a0d9a696c13.zip | |
Generalize INTERNAL_FIELD between buffers, keyboards and frames.
* src/lisp.h (INTERNAL_FIELD): New macro.
* src/buffer.h (BUFFER_INTERNAL_FIELD): Removed.
(BVAR): Change to use INTERNAL_FIELD.
* src/keyboard.h (KBOARD_INTERNAL_FIELD): Likewise.
(KVAR): Change to use INTERNAL_FIELD.
* src/frame.h (FVAR): New macro.
(struct frame): Use INTERNAL_FIELD for all Lisp_Object fields.
* src/alloc.c, src/buffer.c, src/data.c, src/dispnew.c, src/dosfns.c
* src/eval.c, src/frame.c, src/fringe.c, src/gtkutil.c, src/minibuf.c
* src/nsfns.m, src/nsterm.m, src/print.c, src/term.c, src/w32fns.c
* src/w32menu.c, src/w32term.c, src/window.c, src/window.h, src/xdisp.c
* src/xfaces.c, src/xfns.c, src/xmenu.c, src/xterm.c: Users changed.
* admin/coccinelle/frame.cocci: Semantic patch to replace direct
access to Lisp_Object members of struct frame to FVAR.
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/data.c b/src/data.c index fd873b22d4d..59228adb28f 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -1006,7 +1006,7 @@ swap_in_symval_forwarding (struct Lisp_Symbol *symbol, struct Lisp_Buffer_Local_ | |||
| 1006 | XSETSYMBOL (var, symbol); | 1006 | XSETSYMBOL (var, symbol); |
| 1007 | if (blv->frame_local) | 1007 | if (blv->frame_local) |
| 1008 | { | 1008 | { |
| 1009 | tem1 = assq_no_quit (var, XFRAME (selected_frame)->param_alist); | 1009 | tem1 = assq_no_quit (var, FVAR (XFRAME (selected_frame), param_alist)); |
| 1010 | blv->where = selected_frame; | 1010 | blv->where = selected_frame; |
| 1011 | } | 1011 | } |
| 1012 | else | 1012 | else |
| @@ -1179,7 +1179,7 @@ set_internal (register Lisp_Object symbol, register Lisp_Object newval, register | |||
| 1179 | XSETSYMBOL (symbol, sym); /* May have changed via aliasing. */ | 1179 | XSETSYMBOL (symbol, sym); /* May have changed via aliasing. */ |
| 1180 | tem1 = Fassq (symbol, | 1180 | tem1 = Fassq (symbol, |
| 1181 | (blv->frame_local | 1181 | (blv->frame_local |
| 1182 | ? XFRAME (where)->param_alist | 1182 | ? FVAR (XFRAME (where), param_alist) |
| 1183 | : BVAR (XBUFFER (where), local_var_alist))); | 1183 | : BVAR (XBUFFER (where), local_var_alist))); |
| 1184 | blv->where = where; | 1184 | blv->where = where; |
| 1185 | blv->found = 1; | 1185 | blv->found = 1; |