(mac_dialog_show): Apply 2007-04-27 change for xmenu.c.

(Fx_popup_dialog) [MAC_OSX]: Likewise.

2 files changed, 15 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 55e91a56e77..4491b7cd518 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macmenu.c (mac_dialog_show): Apply 2007-04-27 change for xmenu.c.
+        (Fx_popup_dialog) [MAC_OSX]: Likewise.
+
 2007-04-29  Richard Stallman  <rms@gnu.org>
 
         * insdel.c (replace_range): For undo, record insertion first.
diff --git a/src/macmenu.c b/src/macmenu.c
index c7a84df7106..a5196a156eb 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -1011,6 +1011,11 @@ for instance using the window manager, then this produces a quit and
       DialogItemIndex item_hit;
       Lisp_Object tem;
 
+      /* Force a redisplay before showing the dialog.  If a frame is
+         created just before showing the dialog, its contents may not
+         have been fully drawn.  */
+      Fredisplay (Qt);
+
       tem = Fstring_match (concat3 (build_string ("\\("),
                                     call0 (intern ("sentence-end")),
                                     build_string ("\\)\n")),
@@ -2943,6 +2948,11 @@ mac_dialog_show (f, keymaps, title, header, error_name)
     first_wv = wv;
   }
 
+  /* Force a redisplay before showing the dialog.  If a frame is created
+     just before showing the dialog, its contents may not have been fully
+     drawn.  */
+  Fredisplay (Qt);
+
   /* Actually create the dialog.  */
 #if TARGET_API_MAC_CARBON
   menu_item_selection = create_and_show_dialog (f, first_wv);