diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-07-31 16:36:19 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2012-07-31 16:36:19 +0400 |
| commit | e34f7f79833a23586d32fe522b547a0d9a696c13 (patch) | |
| tree | 4a2d3927202cb91b474bc9648ca9dee2bffaa54a /src/window.h | |
| parent | c09bfb2f140b2885af17185634451e2abfd6e91c (diff) | |
| download | emacs-e34f7f79833a23586d32fe522b547a0d9a696c13.tar.gz | |
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/window.h')
| -rw-r--r-- | src/window.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/window.h b/src/window.h index 10cabed979b..16aecd0f01d 100644 --- a/src/window.h +++ b/src/window.h @@ -460,14 +460,14 @@ struct window /* 1 if W is a menu bar window. */ #define WINDOW_MENU_BAR_P(W) \ - (WINDOWP (WINDOW_XFRAME (W)->menu_bar_window) \ - && (W) == XWINDOW (WINDOW_XFRAME (W)->menu_bar_window)) + (WINDOWP (FVAR (WINDOW_XFRAME (W), menu_bar_window)) \ + && (W) == XWINDOW (FVAR (WINDOW_XFRAME (W), menu_bar_window))) /* 1 if W is a tool bar window. */ #define WINDOW_TOOL_BAR_P(W) \ - (WINDOWP (WINDOW_XFRAME (W)->tool_bar_window) \ - && (W) == XWINDOW (WINDOW_XFRAME (W)->tool_bar_window)) + (WINDOWP (FVAR (WINDOW_XFRAME (W), tool_bar_window)) \ + && (W) == XWINDOW (FVAR (WINDOW_XFRAME (W), tool_bar_window))) /* Return the frame y-position at which window W starts. This includes a header line, if any. */ |