diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-10-02 19:38:12 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-10-02 19:38:12 +0400 |
| commit | 1a23cd48f50ce6accd6f9c22649a4b4d50611dd1 (patch) | |
| tree | e0d005b3cc7ff504e8c5fdcb91895ea18e1fa92e /src/frame.h | |
| parent | 8c1f51ffff1b4761a4c3b4dbe17237bb5902b4eb (diff) | |
* frame.h (struct frame): Drop has_minibuffer member because...
(FRAME_HAS_MINIBUF_P): ...this macro can be implemented without it.
* frame.c (make_frame, make_minibuffer_frame): Adjust users.
Diffstat (limited to 'src/frame.h')
| -rw-r--r-- | src/frame.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/frame.h b/src/frame.h index 09e4112d3a..fca985b1f5 100644 --- a/src/frame.h +++ b/src/frame.h @@ -355,10 +355,6 @@ struct frame /* Nonzero if this frame should be redrawn. */ unsigned garbaged : 1; - /* True if frame actually has a minibuffer window on it. - 0 if using a minibuffer window that isn't on this frame. */ - unsigned has_minibuffer : 1; - /* 0 means, if this frame has just one window, show no modeline for that window. */ unsigned wants_modeline : 1; @@ -657,9 +653,11 @@ default_pixels_per_inch_y (void) #define FRAME_MINIBUF_ONLY_P(f) \ EQ (FRAME_ROOT_WINDOW (f), FRAME_MINIBUF_WINDOW (f)) -/* Nonzero if frame F contains a minibuffer window. - (If this is 0, F must use some other minibuffer window.) */ -#define FRAME_HAS_MINIBUF_P(f) ((f)->has_minibuffer) +/* Nonzero if frame F contains it's own minibuffer window. Frame always has + minibuffer window, but it could use minibuffer window of another frame. */ +#define FRAME_HAS_MINIBUF_P(f) \ + (WINDOWP (f->minibuffer_window) \ + && XFRAME (XWINDOW (f->minibuffer_window)->frame) == f) /* Pixel height of frame F, including non-toolkit menu bar and non-toolkit tool bar lines. */ |