Merge from trunk.

diff --cc configure.ac
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/mouse.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/dispextern.h
index f70b1f8,5ddc177..af9efe6
--- 1/src/dispextern.h
--- 2/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/dispnew.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/keyboard.h
Simple merge

diff --cc src/menu.c
index bbd0e70,44bb5a5..5ca687f
--- 1/src/menu.c
--- 2/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 */

diff --cc src/msdos.c
Simple merge

diff --cc src/nsmenu.m
Simple merge

diff --cc src/term.c
Simple merge

diff --cc src/termchar.h
Simple merge

diff --cc src/termhooks.h
Simple merge

diff --cc src/w32console.c
Simple merge

diff --cc src/w32fns.c
Simple merge

diff --cc src/w32menu.c
Simple merge

diff --cc src/w32term.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xmenu.c
Simple merge