From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 26 Sep 2013 07:37:16 +0000 (+0300)
Subject: Merge from trunk.
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/b87c4ff2817e71ca71b028792200b1e069a95e04

Merge from trunk.
---

b87c4ff2817e71ca71b028792200b1e069a95e04
diff --cc src/dispextern.h
index f70b1f8092,5ddc177bcf..af9efe660d
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@@ -3454,13 -3441,9 +3444,10 @@@ extern Lisp_Object marginal_area_strin
                                           Lisp_Object *,
                                           int *, int *, int *, int *);
  extern void redraw_frame (struct frame *);
- extern void cancel_line (int, struct frame *);
- extern void init_desired_glyphs (struct frame *);
  extern bool update_frame (struct frame *, bool, bool);
 +extern void update_frame_with_menu (struct frame *);
  extern void bitch_at_user (void);
- void adjust_glyphs (struct frame *);
- struct glyph_matrix *save_current_matrix (struct frame *);
+ extern void adjust_frame_glyphs (struct frame *);
  void free_glyphs (struct frame *);
  void free_window_matrices (struct window *);
  void check_glyph_memory (void);
diff --cc src/menu.c
index bbd0e70fe0,44bb5a5731..5ca687f3d8
--- a/src/menu.c
+++ b/src/menu.c
@@@ -1314,10 -1296,10 +1314,10 @@@ no quit occurs and `x-popup-menu' retur
       can occur if you press ESC or click outside a menu without selecting
       a menu item.
    */
 -  if (current_popup_menu)
 +  if (current_popup_menu && FRAME_W32_P (f))
      {
        discard_menu_items ();
-       FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
+       FRAME_DISPLAY_INFO (f)->grabbed = 0;
        UNGCPRO;
        return Qnil;
      }
@@@ -1364,8 -1338,7 +1364,8 @@@
  #endif
  
  #ifdef HAVE_NTGUI     /* FIXME: Is it really w32-specific?  --Stef  */
 -  FRAME_DISPLAY_INFO (f)->grabbed = 0;
 +  if (FRAME_W32_P (f))
-     FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
++    FRAME_DISPLAY_INFO (f)->grabbed = 0;
  #endif
  
  #endif /* HAVE_MENUS */