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/eval.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/eval.c')
| -rw-r--r-- | src/eval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index e6cd4e8dc27..391058d12c6 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -3254,7 +3254,7 @@ unbind_to (ptrdiff_t count, Lisp_Object value) | |||
| 3254 | local binding, but only if that binding still exists. */ | 3254 | local binding, but only if that binding still exists. */ |
| 3255 | else if (BUFFERP (where) | 3255 | else if (BUFFERP (where) |
| 3256 | ? !NILP (Flocal_variable_p (symbol, where)) | 3256 | ? !NILP (Flocal_variable_p (symbol, where)) |
| 3257 | : !NILP (Fassq (symbol, XFRAME (where)->param_alist))) | 3257 | : !NILP (Fassq (symbol, FVAR (XFRAME (where), param_alist)))) |
| 3258 | set_internal (symbol, this_binding.old_value, where, 1); | 3258 | set_internal (symbol, this_binding.old_value, where, 1); |
| 3259 | } | 3259 | } |
| 3260 | /* If variable has a trivial value (no forwarding), we can | 3260 | /* If variable has a trivial value (no forwarding), we can |