[Emacs-diffs] trunk r114500: * frame.h (struct frame): Drop has_minibuffer member because...

[Dmitry Antipov]

------------------------------------------------------------
revno: 114500
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-10-02 19:38:12 +0400
message:
  * 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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
  src/frame.h                    frame.h-20091113204419-o5vbwnq5f7feedwu-229

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-02 12:08:27 +0000
+++ b/src/ChangeLog     2013-10-02 15:38:12 +0000
@@ -1,5 +1,11 @@
 2013-10-02  Dmitry Antipov  <address@hidden>
 
+       * 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.
+
+2013-10-02  Dmitry Antipov  <address@hidden>
+
        * window.h (struct window): Prefer enum text_cursor_kinds to int
        for phys_cursor_type member.  Move the latter, phys_cursor_width,
        phys_cursor_ascent and phys_cursor_height under HAVE_WINDOW_SYSTEM.

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-09-29 10:21:58 +0000
+++ b/src/frame.c       2013-10-02 15:38:12 +0000
@@ -339,7 +339,6 @@
      initialize enum members explicitly even if their values are zero.  */
   f->wants_modeline = 1;
   f->garbaged = 1;
-  f->has_minibuffer = mini_p;
   f->vertical_scroll_bar_type = vertical_scroll_bar_none;
   f->column_width = 1;  /* !FRAME_WINDOW_P value */
   f->line_height = 1;  /* !FRAME_WINDOW_P value */
@@ -489,7 +488,6 @@
   f->auto_lower = 0;
   f->no_split = 1;
   f->wants_modeline = 0;
-  f->has_minibuffer = 1;
 
   /* Now label the root window as also being the minibuffer.
      Avoid infinite looping on the window chain by marking next pointer

=== modified file 'src/frame.h'
--- a/src/frame.h       2013-09-23 09:50:47 +0000
+++ b/src/frame.h       2013-10-02 15:38:12 +0000
@@ -355,10 +355,6 @@
   /* 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 @@
 #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.  */