12 files changed, 272 insertions, 110 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index b908ef005d6..80415abe40d 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -1245,20 +1245,36 @@ document xbacktrace
   an error was signaled.
 end
 
-define which
-  set debug_print (which_symbols ($arg0))
+define xprintbytestr
+  set $data = (char *) $arg0->data
+  printf "Bytecode: "
+  output/u ($arg0->size > 1000) ? 0 : ($data[0])@($arg0->size_byte < 0 ? $arg0->size & ~gdb_array_mark_flag : $arg0->size_byte)
+end
+document xprintbytestr
+  Print a string of byte code.
+end
+
+define xwhichsymbols
+  set $output_debug = print_output_debug_flag
+  set print_output_debug_flag = 0
+  set safe_debug_print (which_symbols ($arg0, $arg1))
+  set print_output_debug_flag = $output_debug
 end
-document which
+document xwhichsymbols
   Print symbols which references a given lisp object
   either as its symbol value or symbol function.
+  Call with two arguments: the lisp object and the
+  maximum number of symbols referencing it to produce.
 end
 
 define xbytecode
   set $bt = byte_stack_list
   while $bt
-    xgettype ($bt->byte_string)
-    printf "0x%x => ", $bt->byte_string
-    which $bt->byte_string
+    xgetptr $bt->byte_string
+    set $ptr = (struct Lisp_String *) $ptr
+    xprintbytestr $ptr
+    printf "\n0x%x => ", $bt->byte_string
+    xwhichsymbols $bt->byte_string 5
     set $bt = $bt->next
   end
 end
diff --git a/src/ChangeLog b/src/ChangeLog
index da0ba4b11f2..67f8507a26b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,84 @@
+2011-11-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (unwind_create_frame): If needed, free the glyph
+        matrices of the partially constructed frame.  (Bug#9943)
+
+2011-11-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (mouse_face_from_buffer_pos): Fix a typo in a comment.
+        Don't stop backward scan on the continuation glyph, even though
+        its CHARPOS is positive.
+        (mouse_face_from_buffer_pos, note_mouse_highlight): Rename
+        cover_string to disp_string.
+
+2011-11-01  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (temp_output_buffer_show): Don't use
+        Vtemp_buffer_show_specifiers.
+        (Vtemp_buffer_show_specifiers): Remove unused variable.
+
+2011-10-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (try_cursor_movement): Make sure ROW isn't decremented
+        past the beginning of the current glyph matrix.
+
+2011-10-30  Adam Sjøgren <asjo@koldfront.dk> (tiny change)
+
+        * xterm.c: Include X11/Xproto.h if HAVE_GTK3.
+        (x_error_handler): Ignore BadMatch for X_SetInputFocus for
+        HAVE_GTK3 (Bug#9869).
+
+        * gtkutil.c (xg_win_to_widget, xg_event_is_for_menubar): Initialize
+        type to GDK_NOTHING so valgrind does not complain (Bug#9901).
+
+        * xterm.h (x_display_info): Add Xatom_net_wm_state_hidden (Bug#9893).
+
+        * xterm.c: Declare x_handle_net_wm_state to return int.
+        (handle_one_xevent): Check if we are iconified but don't have
+        _NET_WM_STATE_HIDDEN.  If do, treat as deiconify (Bug#9893).
+        (get_current_wm_state): Return non-zero if not hidden,
+        check for _NET_WM_STATE_HIDDEN (Bug#9893).
+        (do_ewmh_fullscreen): Ignore return value from get_current_wm_state.
+        (x_handle_net_wm_state): Return what get_current_wm_state returns.
+        (x_term_init): Initialize dpyinfo->Xatom_net_wm_state_hidden.
+
+2011-10-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * alloc.c (which_symbols): Declare EXTERNALLY_VISIBLE,
+        so that this new function doesn't get optimized away by a
+        whole-program optimizer.  Make the 2nd arg EMACS_INT, not int.
+
+2011-10-29  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * frame.h (MOUSE_HL_INFO): Remove excess parens.
+
+2011-10-29  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix the `xbytecode' command.
+        * .gdbinit (xprintbytestr): New command.
+        (xwhichsymbols): Renamed from `which'; all callers changed.
+        (xbytecode): Print the byte-code string as well.
+
+2011-10-29  Kim Storm  <storm@cua.dk>
+
+        * alloc.c (which_symbols): New function.
+
+2011-10-29  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * minibuf.c (read_minibuf_noninteractive): Allow reading empty
+        line.  (Bug#9903)
+
+2011-10-29  Glenn Morris  <rgm@gnu.org>
+
+        * process.c (wait_reading_process_output): Revert 2009-08-30 change.
+        Not clear what it was for, and it causes various bugs.  (Bug#9839)
+
+2011-10-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (note_mouse_highlight): Initialize `part', to avoid a
+        possible random value that matches one of those tested as
+        condition to clear the mouse face.
+
 2011-10-28  Chong Yidong  <cyd@gnu.org>
 
         * xdisp.c (note_mouse_highlight): Fix use of uninitialized var.
diff --git a/src/alloc.c b/src/alloc.c
index 6e999a0ba6d..210dd7d1687 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -279,6 +279,7 @@ static void compact_small_strings (void);
 static void free_large_strings (void);
 static void sweep_strings (void);
 static void free_misc (Lisp_Object);
+extern Lisp_Object which_symbols (Lisp_Object, EMACS_INT) EXTERNALLY_VISIBLE;
 
 /* When scanning the C stack for live Lisp objects, Emacs keeps track
    of what memory allocated via lisp_malloc is intended for what
@@ -6250,6 +6251,55 @@ Frames, windows, buffers, and subprocesses count as vectors
   return Flist (8, consed);
 }
 
+/* Find at most FIND_MAX symbols which have OBJ as their value or
+   function.  This is used in gdbinit's `xwhichsymbols' command.  */
+
+Lisp_Object
+which_symbols (Lisp_Object obj, EMACS_INT find_max)
+{
+   struct symbol_block *sblk;
+   int gc_count = inhibit_garbage_collection ();
+   Lisp_Object found = Qnil;
+
+   if (!EQ (obj, Vdead))
+     {
+       for (sblk = symbol_block; sblk; sblk = sblk->next)
+         {
+           struct Lisp_Symbol *sym = sblk->symbols;
+           int bn;
+
+           for (bn = 0; bn < SYMBOL_BLOCK_SIZE; bn++, sym++)
+             {
+               Lisp_Object val;
+               Lisp_Object tem;
+
+               if (sblk == symbol_block && bn >= symbol_block_index)
+                 break;
+
+               XSETSYMBOL (tem, sym);
+               val = find_symbol_value (tem);
+               if (EQ (val, obj)
+                   || EQ (sym->function, obj)
+                   || (!NILP (sym->function)
+                       && COMPILEDP (sym->function)
+                       && EQ (AREF (sym->function, COMPILED_BYTECODE), obj))
+                   || (!NILP (val)
+                       && COMPILEDP (val)
+                       && EQ (AREF (val, COMPILED_BYTECODE), obj)))
+                 {
+                   found = Fcons (tem, found);
+                   if (--find_max == 0)
+                     goto out;
+                 }
+             }
+         }
+     }
+
+  out:
+   unbind_to (gc_count, Qnil);
+   return found;
+}
+
 #ifdef ENABLE_CHECKING
 int suppress_checking;
 
diff --git a/src/frame.h b/src/frame.h
index 3775403810f..e096807b02e 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -538,12 +538,12 @@ typedef struct frame *FRAME_PTR;
    does not have FRAME_X_DISPLAY_INFO.  */
 #ifdef HAVE_WINDOW_SYSTEM
 # define MOUSE_HL_INFO(F)                                       \
-   (FRAME_WINDOW_P(F)                                           \
-    ? &(FRAME_X_DISPLAY_INFO(F)->mouse_highlight)               \
-    : &(((F)->output_data.tty->display_info)->mouse_highlight))
+  (FRAME_WINDOW_P(F)                                            \
+   ? &FRAME_X_DISPLAY_INFO(F)->mouse_highlight                  \
+   : &(F)->output_data.tty->display_info->mouse_highlight)
 #else
 # define MOUSE_HL_INFO(F)                                       \
-    (&(((F)->output_data.tty->display_info)->mouse_highlight))
+  (&(F)->output_data.tty->display_info->mouse_highlight)
 #endif
 
 /* Nonzero if frame F is still alive (not deleted).  */
@@ -594,7 +594,7 @@ typedef struct frame *FRAME_PTR;
 /* Lines above the top-most window in frame F.  */
 
 #define FRAME_TOP_MARGIN(F) \
-     (FRAME_MENU_BAR_LINES (F) + FRAME_TOOL_BAR_LINES (F))
+  (FRAME_MENU_BAR_LINES (F) + FRAME_TOOL_BAR_LINES (F))
 
 /* Pixel height of the top margin above.  */
 
@@ -659,11 +659,11 @@ typedef struct frame *FRAME_PTR;
    and which side they are on.  */
 #define FRAME_VERTICAL_SCROLL_BAR_TYPE(f) ((f)->vertical_scroll_bar_type)
 #define FRAME_HAS_VERTICAL_SCROLL_BARS(f) \
-     ((f)->vertical_scroll_bar_type != vertical_scroll_bar_none)
+  ((f)->vertical_scroll_bar_type != vertical_scroll_bar_none)
 #define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT(f) \
-     ((f)->vertical_scroll_bar_type == vertical_scroll_bar_left)
+  ((f)->vertical_scroll_bar_type == vertical_scroll_bar_left)
 #define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT(f) \
-     ((f)->vertical_scroll_bar_type == vertical_scroll_bar_right)
+  ((f)->vertical_scroll_bar_type == vertical_scroll_bar_right)
 
 /* Width that a scroll bar in frame F should have, if there is one.
    Measured in pixels.
@@ -680,13 +680,13 @@ typedef struct frame *FRAME_PTR;
    the right in this frame, or there are no scroll bars, value is 0.  */
 
 #define FRAME_LEFT_SCROLL_BAR_COLS(f)                   \
-     (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f)        \
-      ? FRAME_CONFIG_SCROLL_BAR_COLS (f)                \
-      : 0)
+  (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f)           \
+   ? FRAME_CONFIG_SCROLL_BAR_COLS (f)                   \
+   : 0)
 
 /* Width of a left scroll bar in frame F, measured in pixels */
 
-#define FRAME_LEFT_SCROLL_BAR_AREA_WIDTH(f)                                     \
+#define FRAME_LEFT_SCROLL_BAR_AREA_WIDTH(f)                             \
   (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f)                           \
    ? (FRAME_CONFIG_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f))        \
    : 0)
@@ -696,13 +696,13 @@ typedef struct frame *FRAME_PTR;
    the left in this frame, or there are no scroll bars, value is 0.  */
 
 #define FRAME_RIGHT_SCROLL_BAR_COLS(f)                  \
-     (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)       \
-      ? FRAME_CONFIG_SCROLL_BAR_COLS (f)                \
-      : 0)
+  (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)          \
+   ? FRAME_CONFIG_SCROLL_BAR_COLS (f)                   \
+   : 0)
 
 /* Width of a right scroll bar area in frame F, measured in pixels */
 
-#define FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH(f)                                    \
+#define FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH(f)                            \
   (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)                          \
    ? (FRAME_CONFIG_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f))        \
    : 0)
@@ -710,9 +710,9 @@ typedef struct frame *FRAME_PTR;
 /* Actual width of a scroll bar in frame F, measured in columns.  */
 
 #define FRAME_SCROLL_BAR_COLS(f)                        \
-     (FRAME_HAS_VERTICAL_SCROLL_BARS (f)                \
-      ? FRAME_CONFIG_SCROLL_BAR_COLS (f)                \
-      : 0)
+  (FRAME_HAS_VERTICAL_SCROLL_BARS (f)                   \
+   ? FRAME_CONFIG_SCROLL_BAR_COLS (f)                   \
+   : 0)
 
 /* Actual width of a scroll bar area in frame F, measured in pixels.  */
 
@@ -731,21 +731,21 @@ typedef struct frame *FRAME_PTR;
    not including scroll bars and fringes.  */
 
 #define SET_FRAME_COLS(f, val)                                          \
-     (FRAME_COLS (f) = (val),                                           \
-      (f)->total_cols = FRAME_TOTAL_COLS_ARG (f, FRAME_COLS (f)))
+  (FRAME_COLS (f) = (val),                                              \
+   (f)->total_cols = FRAME_TOTAL_COLS_ARG (f, FRAME_COLS (f)))
 
 /* Given a value WIDTH for frame F's nominal width,
    return the value that FRAME_TOTAL_COLS should have.  */
 
 #define FRAME_TOTAL_COLS_ARG(f, width)          \
-     ((width)                                   \
-      + FRAME_SCROLL_BAR_COLS (f)               \
-      + FRAME_FRINGE_COLS (f))
+  ((width)                                      \
+   + FRAME_SCROLL_BAR_COLS (f)                  \
+   + FRAME_FRINGE_COLS (f))
 
 /* Maximum + 1 legitimate value for FRAME_CURSOR_X.  */
 
 #define FRAME_CURSOR_X_LIMIT(f) \
-     (FRAME_COLS (f) + FRAME_LEFT_SCROLL_BAR_COLS (f))
+  (FRAME_COLS (f) + FRAME_LEFT_SCROLL_BAR_COLS (f))
 
 /* Nonzero if frame F has scroll bars.  */
 
@@ -938,18 +938,18 @@ extern Lisp_Object selected_frame;
    float.  Value is a C integer.  */
 
 #define FRAME_PIXEL_X_FROM_CANON_X(F, X)                \
-     (INTEGERP (X)                                      \
-      ? XINT (X) * FRAME_COLUMN_WIDTH (F)               \
-      : (int) (XFLOAT_DATA (X) * FRAME_COLUMN_WIDTH (F)))
+  (INTEGERP (X)                                         \
+   ? XINT (X) * FRAME_COLUMN_WIDTH (F)                  \
+   : (int) (XFLOAT_DATA (X) * FRAME_COLUMN_WIDTH (F)))
 
 /* Convert canonical value Y to pixels.  F is the frame whose
    canonical character height is to be used.  X must be a Lisp integer
    or float.  Value is a C integer.  */
 
 #define FRAME_PIXEL_Y_FROM_CANON_Y(F, Y)                \
-     (INTEGERP (Y)                                      \
-      ? XINT (Y) * FRAME_LINE_HEIGHT (F)                \
-      : (int) (XFLOAT_DATA (Y) * FRAME_LINE_HEIGHT (F)))
+  (INTEGERP (Y)                                         \
+   ? XINT (Y) * FRAME_LINE_HEIGHT (F)                   \
+   : (int) (XFLOAT_DATA (Y) * FRAME_LINE_HEIGHT (F)))
 
 /* Convert pixel-value X to canonical units.  F is the frame whose
    canonical character width is to be used.  X is a C integer.  Result
@@ -957,9 +957,9 @@ extern Lisp_Object selected_frame;
    otherwise it's a Lisp integer.  */
 
 #define FRAME_CANON_X_FROM_PIXEL_X(F, X)                        \
-     ((X) % FRAME_COLUMN_WIDTH (F) != 0                         \
-      ? make_float ((double) (X) / FRAME_COLUMN_WIDTH (F))      \
-      : make_number ((X) / FRAME_COLUMN_WIDTH (F)))
+  ((X) % FRAME_COLUMN_WIDTH (F) != 0                            \
+   ? make_float ((double) (X) / FRAME_COLUMN_WIDTH (F))         \
+   : make_number ((X) / FRAME_COLUMN_WIDTH (F)))
 
 /* Convert pixel-value Y to canonical units.  F is the frame whose
    canonical character height is to be used.  Y is a C integer.
@@ -967,9 +967,9 @@ extern Lisp_Object selected_frame;
    otherwise it's a Lisp integer.  */
 
 #define FRAME_CANON_Y_FROM_PIXEL_Y(F, Y)                        \
-     ((Y) % FRAME_LINE_HEIGHT (F)                               \
-      ? make_float ((double) (Y) / FRAME_LINE_HEIGHT (F))       \
-      : make_number ((Y) / FRAME_LINE_HEIGHT (F)))
+  ((Y) % FRAME_LINE_HEIGHT (F)                                  \
+   ? make_float ((double) (Y) / FRAME_LINE_HEIGHT (F))          \
+   : make_number ((Y) / FRAME_LINE_HEIGHT (F)))
 
 
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 3cac8084dea..26959d57d4b 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -987,6 +987,7 @@ xg_win_to_widget (Display *dpy, Window wdesc)
     {
       GdkEvent event;
       event.any.window = gdkwin;
+      event.any.type = GDK_NOTHING;
       gwdesc = gtk_get_event_widget (&event);
     }
 
@@ -3254,6 +3255,7 @@ xg_event_is_for_menubar (FRAME_PTR f, XEvent *event)
   gw = gdk_x11_window_lookup_for_display (gdpy, event->xbutton.window);
   if (! gw) return 0;
   gevent.any.window = gw;
+  gevent.any.type = GDK_NOTHING;
   gwdesc = gtk_get_event_widget (&gevent);
   if (! gwdesc) return 0;
   if (! GTK_IS_MENU_BAR (gwdesc)
diff --git a/src/minibuf.c b/src/minibuf.c
index a44a6376472..7ece5764203 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -251,7 +251,7 @@ read_minibuf_noninteractive (Lisp_Object map, Lisp_Object initial,
 
   while ((c = getchar ()) != '\n')
     {
-      if (c < 0)
+      if (c == EOF)
         {
           if (errno != EINTR)
             break;
@@ -269,7 +269,7 @@ read_minibuf_noninteractive (Lisp_Object map, Lisp_Object initial,
         }
     }
 
-  if (len)
+  if (len || c == '\n')
     {
       val = make_string (line, len);
       xfree (line);
diff --git a/src/process.c b/src/process.c
index dc37ec5f961..c316139a713 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4856,16 +4856,11 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
                  It can't hurt.  */
               else if (nread == -1 && errno == EIO)
                 {
-                  /* Clear the descriptor now, so we only raise the
-                     signal once.  Don't do this if `process' is only
-                     a pty.  */
-                  if (XPROCESS (proc)->pid != -2)
-                    {
-                      FD_CLR (channel, &input_wait_mask);
-                      FD_CLR (channel, &non_keyboard_wait_mask);
+                  /* Clear the descriptor now, so we only raise the signal once.  */
+                  FD_CLR (channel, &input_wait_mask);
+                  FD_CLR (channel, &non_keyboard_wait_mask);
 
-                      kill (getpid (), SIGCHLD);
-                    }
+                  kill (getpid (), SIGCHLD);
                 }
 #endif /* HAVE_PTYS */
               /* If we can detect process termination, don't consider the process
diff --git a/src/w32fns.c b/src/w32fns.c
index 2ecd6e91533..f7ba1c59e7b 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -3993,6 +3993,7 @@ unwind_create_frame (Lisp_Object frame)
 #endif
 
       x_free_frame_resources (f);
+      free_glyphs (f);
 
 #if GLYPH_DEBUG
       /* Check that reference counts are indeed correct.  */
diff --git a/src/window.c b/src/window.c
index 38f16c91f34..422073b1bd3 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3185,10 +3185,7 @@ temp_output_buffer_show (register Lisp_Object buf)
     call1 (Vtemp_buffer_show_function, buf);
   else
     {
-      window = display_buffer (buf, Vtemp_buffer_show_specifiers, Qnil);
-      /* Reset Vtemp_buffer_show_specifiers immediately so it won't
-         affect subsequent calls.  */
-      Vtemp_buffer_show_specifiers = Qnil;
+      window = display_buffer (buf, Qnil, Qnil);
 
       if (!EQ (XWINDOW (window)->frame, selected_frame))
         Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window)));
@@ -6460,16 +6457,6 @@ If this function is used, then it must do the entire job of showing
 the buffer; `temp-buffer-show-hook' is not run unless this function runs it.  */);
   Vtemp_buffer_show_function = Qnil;
 
-  DEFVAR_LISP ("temp-buffer-show-specifiers", Vtemp_buffer_show_specifiers,
-               doc: /* Buffer display specifiers used by `with-output-to-temp-buffer'.
-These specifiers are passed by `with-output-to-temp-buffer' as second
-argument to `display-buffer'.  Applications should only let-bind this
-around a call to `with-output-to-temp-buffer'.
-
-For a description of buffer display specifiers see the variable
-`display-buffer-alist'.  */);
-  Vtemp_buffer_show_specifiers = Qnil;
-
   DEFVAR_LISP ("minibuffer-scroll-window", Vminibuf_scroll_window,
                doc: /* Non-nil means it is the window that C-M-v in minibuffer should scroll.  */);
   Vminibuf_scroll_window = Qnil;
diff --git a/src/xdisp.c b/src/xdisp.c
index 296b2d13219..97687f8975b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -14829,8 +14829,6 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp, int *scroll_ste
                  bidi-reordered rows.  */
               while (MATRIX_ROW_CONTINUATION_LINE_P (row))
                 {
-                  xassert (row->enabled_p);
-                  --row;
                   /* If we hit the beginning of the displayed portion
                      without finding the first row of a continued
                      line, give up.  */
@@ -14839,7 +14837,8 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp, int *scroll_ste
                       rc = CURSOR_MOVEMENT_MUST_SCROLL;
                       break;
                     }
-
+                  xassert (row->enabled_p);
+                  --row;
                 }
             }
           if (must_scroll)
@@ -25809,7 +25808,7 @@ rows_from_pos_range (struct window *w,
    for the overlay or run of text properties specifying the mouse
    face.  BEFORE_STRING and AFTER_STRING, if non-nil, are a
    before-string and after-string that must also be highlighted.
-   COVER_STRING, if non-nil, is a display string that may cover some
+   DISP_STRING, if non-nil, is a display string that may cover some
    or all of the highlighted text.  */
 
 static void
@@ -25820,7 +25819,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
                             EMACS_INT end_charpos,
                             Lisp_Object before_string,
                             Lisp_Object after_string,
-                            Lisp_Object cover_string)
+                            Lisp_Object disp_string)
 {
   struct window *w = XWINDOW (window);
   struct glyph_row *first = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
@@ -25829,7 +25828,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
   EMACS_INT ignore, pos;
   int x;
 
-  xassert (NILP (cover_string) || STRINGP (cover_string));
+  xassert (NILP (disp_string) || STRINGP (disp_string));
   xassert (NILP (before_string) || STRINGP (before_string));
   xassert (NILP (after_string) || STRINGP (after_string));
 
@@ -25839,7 +25838,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
     r1 = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos));
   /* If the before-string or display-string contains newlines,
      rows_from_pos_range skips to its last row.  Move back.  */
-  if (!NILP (before_string) || !NILP (cover_string))
+  if (!NILP (before_string) || !NILP (disp_string))
     {
       struct glyph_row *prev;
       while ((prev = r1 - 1, prev >= first)
@@ -25851,7 +25850,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
           while (--glyph >= beg && INTEGERP (glyph->object));
           if (glyph < beg
               || !(EQ (glyph->object, before_string)
-                   || EQ (glyph->object, cover_string)))
+                   || EQ (glyph->object, disp_string)))
             break;
           r1 = prev;
         }
@@ -25876,10 +25875,10 @@ mouse_face_from_buffer_pos (Lisp_Object window,
         r2 = next;
     }
   /* The rest of the display engine assumes that mouse_face_beg_row is
-     either above below mouse_face_end_row or identical to it.  But
-     with bidi-reordered continued lines, the row for START_CHARPOS
-     could be below the row for END_CHARPOS.  If so, swap the rows and
-     store them in correct order.  */
+     either above mouse_face_end_row or identical to it.  But with
+     bidi-reordered continued lines, the row for START_CHARPOS could
+     be below the row for END_CHARPOS.  If so, swap the rows and store
+     them in correct order.  */
   if (r1->y > r2->y)
     {
       struct glyph_row *tem = r2;
@@ -25894,7 +25893,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
   hlinfo->mouse_face_end_row = MATRIX_ROW_VPOS (r2, w->current_matrix);
 
   /* For a bidi-reordered row, the positions of BEFORE_STRING,
-     AFTER_STRING, COVER_STRING, START_CHARPOS, and END_CHARPOS
+     AFTER_STRING, DISP_STRING, START_CHARPOS, and END_CHARPOS
      could be anywhere in the row and in any order.  The strategy
      below is to find the leftmost and the rightmost glyph that
      belongs to either of these 3 strings, or whose position is
@@ -25920,11 +25919,11 @@ mouse_face_from_buffer_pos (Lisp_Object window,
           x += glyph->pixel_width;
 
       /* Scan the glyph row, looking for BEFORE_STRING, AFTER_STRING,
-         or COVER_STRING, and the first glyph from buffer whose
+         or DISP_STRING, and the first glyph from buffer whose
          position is between START_CHARPOS and END_CHARPOS.  */
       for (; glyph < end
              && !INTEGERP (glyph->object)
-             && !EQ (glyph->object, cover_string)
+             && !EQ (glyph->object, disp_string)
              && !(BUFFERP (glyph->object)
                   && (glyph->charpos >= start_charpos
                       && glyph->charpos < end_charpos));
@@ -25971,11 +25970,11 @@ mouse_face_from_buffer_pos (Lisp_Object window,
           ;
 
       /* Scan the glyph row, looking for BEFORE_STRING, AFTER_STRING,
-         or COVER_STRING, and the first glyph from buffer whose
+         or DISP_STRING, and the first glyph from buffer whose
          position is between START_CHARPOS and END_CHARPOS.  */
       for (; glyph > end
              && !INTEGERP (glyph->object)
-             && !EQ (glyph->object, cover_string)
+             && !EQ (glyph->object, disp_string)
              && !(BUFFERP (glyph->object)
                   && (glyph->charpos >= start_charpos
                       && glyph->charpos < end_charpos));
@@ -26031,17 +26030,16 @@ mouse_face_from_buffer_pos (Lisp_Object window,
          row, and also blanks and stretch glyphs inserted by
          extend_face_to_end_of_line.  */
       while (end > glyph
-             && INTEGERP ((end - 1)->object)
-             && (end - 1)->charpos <= 0)
+             && INTEGERP ((end - 1)->object))
         --end;
       /* Scan the rest of the glyph row from the end, looking for the
          first glyph that comes from BEFORE_STRING, AFTER_STRING, or
-         COVER_STRING, or whose position is between START_CHARPOS
+         DISP_STRING, or whose position is between START_CHARPOS
          and END_CHARPOS */
       for (--end;
              end > glyph
              && !INTEGERP (end->object)
-             && !EQ (end->object, cover_string)
+             && !EQ (end->object, disp_string)
              && !(BUFFERP (end->object)
                   && (end->charpos >= start_charpos
                       && end->charpos < end_charpos));
@@ -26078,20 +26076,19 @@ mouse_face_from_buffer_pos (Lisp_Object window,
       x = r2->x;
       end++;
       while (end < glyph
-             && INTEGERP (end->object)
-             && end->charpos <= 0)
+             && INTEGERP (end->object))
         {
           x += end->pixel_width;
           ++end;
         }
       /* Scan the rest of the glyph row from the end, looking for the
          first glyph that comes from BEFORE_STRING, AFTER_STRING, or
-         COVER_STRING, or whose position is between START_CHARPOS
+         DISP_STRING, or whose position is between START_CHARPOS
          and END_CHARPOS */
       for ( ;
              end < glyph
              && !INTEGERP (end->object)
-             && !EQ (end->object, cover_string)
+             && !EQ (end->object, disp_string)
              && !(BUFFERP (end->object)
                   && (end->charpos >= start_charpos
                       && end->charpos < end_charpos));
@@ -26801,7 +26798,7 @@ void
 note_mouse_highlight (struct frame *f, int x, int y)
 {
   Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
-  enum window_part part;
+  enum window_part part = ON_NOTHING;
   Lisp_Object window;
   struct window *w;
   Cursor cursor = No_Cursor;
@@ -27086,7 +27083,7 @@ note_mouse_highlight (struct frame *f, int x, int y)
               /* The mouse-highlighting, if any, comes from an overlay
                  or text property in the buffer.  */
               Lisp_Object buffer IF_LINT (= Qnil);
-              Lisp_Object cover_string IF_LINT (= Qnil);
+              Lisp_Object disp_string IF_LINT (= Qnil);
 
               if (STRINGP (object))
                 {
@@ -27100,13 +27097,13 @@ note_mouse_highlight (struct frame *f, int x, int y)
                       mouse_face = get_char_property_and_overlay
                         (make_number (pos), Qmouse_face, w->buffer, &overlay);
                       buffer = w->buffer;
-                      cover_string = object;
+                      disp_string = object;
                     }
                 }
               else
                 {
                   buffer = object;
-                  cover_string = Qnil;
+                  disp_string = Qnil;
                 }
 
               if (!NILP (mouse_face))
@@ -27158,7 +27155,7 @@ note_mouse_highlight (struct frame *f, int x, int y)
                                               XFASTINT (before),
                                               XFASTINT (after),
                                               before_string, after_string,
-                                              cover_string);
+                                              disp_string);
                   cursor = No_Cursor;
                 }
             }
diff --git a/src/xterm.c b/src/xterm.c
index 333132b92cb..fb77faa75fe 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -93,6 +93,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef USE_GTK
 #include "gtkutil.h"
+#ifdef HAVE_GTK3
+#include <X11/Xproto.h>
+#endif
 #endif
 
 #ifdef USE_LUCID
@@ -343,7 +346,7 @@ static void x_scroll_bar_report_motion (struct frame **, Lisp_Object *,
                                         enum scroll_bar_part *,
                                         Lisp_Object *, Lisp_Object *,
                                         Time *);
-static void x_handle_net_wm_state (struct frame *, XPropertyEvent *);
+static int x_handle_net_wm_state (struct frame *, XPropertyEvent *);
 static void x_check_fullscreen (struct frame *);
 static void x_check_expected_move (struct frame *, int, int);
 static void x_sync_with_move (struct frame *, int, int, int);
@@ -6113,7 +6116,19 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
       last_user_time = event.xproperty.time;
       f = x_top_window_to_frame (dpyinfo, event.xproperty.window);
       if (f && event.xproperty.atom == dpyinfo->Xatom_net_wm_state)
-        x_handle_net_wm_state (f, &event.xproperty);
+        if (x_handle_net_wm_state (f, &event.xproperty) && f->iconified)
+          {
+            /* Gnome shell does not iconify us when C-z is pressed.  It hides
+               the frame.  So if our state says we aren't hidden anymore,
+               treat is as deiconfied.  */
+            if (! f->async_iconified)
+              SET_FRAME_GARBAGED (f);
+            f->async_visible = 1;
+            f->async_iconified = 0;
+            f->output_data.x->has_been_visible = 1;
+            inev.ie.kind = DEICONIFY_EVENT;
+            XSETFRAME (inev.ie.frame_or_window, f);
+          }
 
       x_handle_property_notify (&event.xproperty);
       xft_settings_event (dpyinfo, &event);
@@ -7857,6 +7872,15 @@ static void x_error_quitter (Display *, XErrorEvent *);
 static int
 x_error_handler (Display *display, XErrorEvent *event)
 {
+#ifdef HAVE_GTK3
+  if (event->error_code == BadMatch
+      && event->request_code == X_SetInputFocus
+      && event->minor_code == 0)
+    {
+      return 0;
+    }
+#endif
+
   if (x_error_message)
     x_error_catcher (display, event);
   else
@@ -8415,9 +8439,11 @@ x_set_sticky (struct frame *f, Lisp_Object new_value, Lisp_Object old_value)
 
 /* Return the current _NET_WM_STATE.
    SIZE_STATE is set to one of the FULLSCREEN_* values.
-   STICKY is set to 1 if the sticky state is set, 0 if not.  */
+   STICKY is set to 1 if the sticky state is set, 0 if not.
 
-static void
+   Return non-zero if we are not hidden, zero if we are.  */
+
+static int
 get_current_wm_state (struct frame *f,
                       Window window,
                       int *size_state,
@@ -8425,7 +8451,7 @@ get_current_wm_state (struct frame *f,
 {
   Atom actual_type;
   unsigned long actual_size, bytes_remaining;
-  int i, rc, actual_format;
+  int i, rc, actual_format, is_hidden = 0;
   struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
   long max_len = 65536;
   Display *dpy = FRAME_X_DISPLAY (f);
@@ -8447,7 +8473,7 @@ get_current_wm_state (struct frame *f,
       if (tmp_data) XFree (tmp_data);
       x_uncatch_errors ();
       UNBLOCK_INPUT;
-      return;
+      return ! f->iconified;
     }
 
   x_uncatch_errors ();
@@ -8455,7 +8481,9 @@ get_current_wm_state (struct frame *f,
   for (i = 0; i < actual_size; ++i)
     {
       Atom a = ((Atom*)tmp_data)[i];
-      if (a == dpyinfo->Xatom_net_wm_state_maximized_horz)
+      if (a == dpyinfo->Xatom_net_wm_state_hidden)
+        is_hidden = 1;
+      else if (a == dpyinfo->Xatom_net_wm_state_maximized_horz)
         {
           if (*size_state == FULLSCREEN_HEIGHT)
             *size_state = FULLSCREEN_MAXIMIZED;
@@ -8477,6 +8505,7 @@ get_current_wm_state (struct frame *f,
 
   if (tmp_data) XFree (tmp_data);
   UNBLOCK_INPUT;
+  return ! is_hidden;
 }
 
 /* Do fullscreen as specified in extended window manager hints */
@@ -8488,7 +8517,7 @@ do_ewmh_fullscreen (struct frame *f)
   int have_net_atom = wm_supports (f, dpyinfo->Xatom_net_wm_state);
   int cur, dummy;
 
-  get_current_wm_state (f, FRAME_OUTER_WINDOW (f), &cur, &dummy);
+  (void)get_current_wm_state (f, FRAME_OUTER_WINDOW (f), &cur, &dummy);
 
   /* Some window managers don't say they support _NET_WM_STATE, but they do say
      they support _NET_WM_STATE_FULLSCREEN.  Try that also.  */
@@ -8563,14 +8592,14 @@ XTfullscreen_hook (FRAME_PTR f)
 }
 
 
-static void
+static int
 x_handle_net_wm_state (struct frame *f, XPropertyEvent *event)
 {
   int value = FULLSCREEN_NONE;
   Lisp_Object lval;
   int sticky = 0;
+  int not_hidden = get_current_wm_state (f, event->window, &value, &sticky);
 
-  get_current_wm_state (f, event->window, &value, &sticky);
   lval = Qnil;
   switch (value)
     {
@@ -8590,6 +8619,8 @@ x_handle_net_wm_state (struct frame *f, XPropertyEvent *event)
 
   store_frame_param (f, Qfullscreen, lval);
   store_frame_param (f, Qsticky, sticky ? Qt : Qnil);
+
+  return not_hidden;
 }
 
 /* Check if we need to resize the frame due to a fullscreen request.
@@ -9273,7 +9304,7 @@ x_iconify_frame (struct frame *f)
   if (!NILP (type))
     x_bitmap_icon (f, type);
 
-#ifdef USE_GTK
+#if defined (USE_GTK)
   if (FRAME_GTK_OUTER_WIDGET (f))
     {
       if (! FRAME_VISIBLE_P (f))
@@ -10253,6 +10284,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
       { "_NET_WM_STATE_MAXIMIZED_VERT",
         &dpyinfo->Xatom_net_wm_state_maximized_vert },
       { "_NET_WM_STATE_STICKY", &dpyinfo->Xatom_net_wm_state_sticky },
+      { "_NET_WM_STATE_HIDDEN", &dpyinfo->Xatom_net_wm_state_hidden },
       { "_NET_WM_WINDOW_TYPE", &dpyinfo->Xatom_net_window_type },
       { "_NET_WM_WINDOW_TYPE_TOOLTIP",
         &dpyinfo->Xatom_net_window_type_tooltip },
diff --git a/src/xterm.h b/src/xterm.h
index 11d5d50d952..e10a6bc34f0 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -341,7 +341,8 @@ struct x_display_info
   /* Atoms dealing with EWMH (i.e. _NET_...) */
   Atom Xatom_net_wm_state, Xatom_net_wm_state_fullscreen,
     Xatom_net_wm_state_maximized_horz, Xatom_net_wm_state_maximized_vert,
-    Xatom_net_wm_state_sticky, Xatom_net_frame_extents;
+    Xatom_net_wm_state_sticky, Xatom_net_wm_state_hidden,
+    Xatom_net_frame_extents;
 
   /* XSettings atoms and windows.  */
   Atom Xatom_xsettings_sel, Xatom_xsettings_prop, Xatom_xsettings_mgr;