Merge remote-tracking branch 'savannah/master' into native-comp

6 files changed, 56 insertions, 16 deletions

diff --git a/src/dispnew.c b/src/dispnew.c
index b3e4587250f..f613f7b6568 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3588,6 +3588,7 @@ update_window (struct window *w, bool force_p)
       int yb;
       bool changed_p = 0, mouse_face_overwritten_p = 0;
       int n_updated = 0;
+      bool invisible_rows_marked = false;
 
 #ifdef HAVE_WINDOW_SYSTEM
       gui_update_window_begin (w);
@@ -3679,13 +3680,36 @@ update_window (struct window *w, bool force_p)
                tempted to optimize redisplay based on lines displayed
                in the first redisplay.  */
             if (MATRIX_ROW_BOTTOM_Y (row) >= yb)
-              for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i)
-                SET_MATRIX_ROW_ENABLED_P (w->current_matrix, i, false);
+              {
+                for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i)
+                  SET_MATRIX_ROW_ENABLED_P (w->current_matrix, i, false);
+                invisible_rows_marked = true;
+              }
           }
 
       /* Was display preempted?  */
       paused_p = row < end;
 
+      if (!paused_p && !invisible_rows_marked)
+        {
+          /* If we didn't mark the invisible rows in the current
+             matrix as invalid above, do that now.  This can happen if
+             scrolling_window updates the last visible rows of the
+             current matrix, in which case the above loop doesn't get
+             to examine the last visible row.  */
+          int i;
+          for (i = 0; i < w->current_matrix->nrows - 1; ++i)
+            {
+              struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, i);
+              if (current_row->enabled_p
+                  && MATRIX_ROW_BOTTOM_Y (current_row) >= yb)
+                {
+                  for (++i ; i < w->current_matrix->nrows - 1; ++i)
+                    SET_MATRIX_ROW_ENABLED_P (w->current_matrix, i, false);
+                }
+            }
+        }
+
     set_cursor:
 
       /* Update the tab line after scrolling because a new tab
diff --git a/src/editfns.c b/src/editfns.c
index fb20fc96550..bc6553a7d2c 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1697,7 +1697,11 @@ they can be in either order.  */)
 DEFUN ("buffer-string", Fbuffer_string, Sbuffer_string, 0, 0, 0,
        doc: /* Return the contents of the current buffer as a string.
 If narrowing is in effect, this function returns only the visible part
-of the buffer.  */)
+of the buffer.
+
+This function copies the text properties of that part of the buffer
+into the result string; if you don’t want the text properties,
+use `buffer-substring-no-properties' instead.  */)
   (void)
 {
   return make_buffer_string_both (BEGV, BEGV_BYTE, ZV, ZV_BYTE, 1);
diff --git a/src/frame.c b/src/frame.c
index a62347c1fb2..cfdf3b61938 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3595,7 +3595,7 @@ check_frame_pixels (Lisp_Object size, Lisp_Object pixelwise, int item_size)
 }
 
 DEFUN ("set-frame-height", Fset_frame_height, Sset_frame_height, 2, 4,
-       "(list (selected-frame) (prefix-numeric-value current-prefix-arg))",
+       "(set-frame-property--interactive \"Frame height: \" (frame-height))",
        doc: /* Set text height of frame FRAME to HEIGHT lines.
 Optional third arg PRETEND non-nil means that redisplay should use
 HEIGHT lines but that the idea of the actual height of the frame should
@@ -3620,7 +3620,7 @@ If FRAME is nil, it defaults to the selected frame.  */)
 }
 
 DEFUN ("set-frame-width", Fset_frame_width, Sset_frame_width, 2, 4,
-       "(list (selected-frame) (prefix-numeric-value current-prefix-arg))",
+       "(set-frame-property--interactive \"Frame width: \" (frame-width))",
        doc: /* Set text width of frame FRAME to WIDTH columns.
 Optional third arg PRETEND non-nil means that redisplay should use WIDTH
 columns but that the idea of the actual width of the frame should not
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 11e59b9fae5..4634c35dd4c 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -5014,11 +5014,10 @@ update_frame_tool_bar (struct frame *f)
       GtkWidget *wbutton = NULL;
       Lisp_Object specified_file;
       bool vert_only = ! NILP (PROP (TOOL_BAR_ITEM_VERT_ONLY));
-      const char *label
-        = (EQ (style, Qimage) || (vert_only && horiz)) ? NULL
-        : STRINGP (PROP (TOOL_BAR_ITEM_LABEL))
-        ? SSDATA (PROP (TOOL_BAR_ITEM_LABEL))
-        : "";
+      Lisp_Object label
+        = (EQ (style, Qimage) || (vert_only && horiz))
+        ? Qnil
+        : PROP (TOOL_BAR_ITEM_LABEL);
 
       ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), j);
 
@@ -5131,8 +5130,11 @@ update_frame_tool_bar (struct frame *f)
 
       /* If there is an existing widget, check if it's stale; if so,
          remove it and make a new tool item from scratch.  */
-      if (ti && xg_tool_item_stale_p (wbutton, stock_name, icon_name,
-                                      img, label, horiz))
+      if (ti && xg_tool_item_stale_p (wbutton, stock_name, icon_name, img,
+                                      NILP (label)
+                                      ? NULL
+                                      : STRINGP (label) ? SSDATA (label) : "",
+                                      horiz))
         {
           gtk_container_remove (GTK_CONTAINER (wtoolbar),
                                 GTK_WIDGET (ti));
@@ -5189,7 +5191,11 @@ update_frame_tool_bar (struct frame *f)
 #else
           if (w) gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin);
 #endif
-          ti = xg_make_tool_item (f, w, &wbutton, label, i, horiz, text_image);
+          ti = xg_make_tool_item (f, w, &wbutton,
+                                  NILP (label)
+                                  ? NULL
+                                  : STRINGP (label) ? SSDATA (label) : "",
+                                  i, horiz, text_image);
           gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, j);
         }
 
diff --git a/src/image.c b/src/image.c
index 2f85e3035e8..576956d4dbb 100644
--- a/src/image.c
+++ b/src/image.c
@@ -3392,6 +3392,7 @@ static int
 xbm_scan (char **s, char *end, char *sval, int *ival)
 {
   unsigned char c UNINIT;
+  char *sval_end = sval + BUFSIZ;
 
  loop:
 
@@ -3451,7 +3452,7 @@ xbm_scan (char **s, char *end, char *sval, int *ival)
   else if (c_isalpha (c) || c == '_')
     {
       *sval++ = c;
-      while (*s < end
+      while (*s < end && sval < sval_end
              && (c = *(*s)++, (c_isalnum (c) || c == '_')))
         *sval++ = c;
       *sval = 0;
diff --git a/src/keyboard.c b/src/keyboard.c
index 9ee4c4f6d68..266ebaa5fdf 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3614,6 +3614,12 @@ kbd_buffer_store_buffered_event (union buffered_input_event *event,
     case ICONIFY_EVENT: ignore_event = Qiconify_frame; break;
     case DEICONIFY_EVENT: ignore_event = Qmake_frame_visible; break;
     case SELECTION_REQUEST_EVENT: ignore_event = Qselection_request; break;
+#ifdef USE_FILE_NOTIFY
+    case FILE_NOTIFY_EVENT: ignore_event = Qfile_notify; break;
+#endif
+#ifdef HAVE_DBUS
+    case DBUS_EVENT: ignore_event = Qdbus_event; break;
+#endif
     default: ignore_event = Qnil; break;
     }
 
@@ -6679,6 +6685,7 @@ parse_solitary_modifier (Lisp_Object symbol)
     case 'c':
       MULTI_LETTER_MOD (ctrl_modifier, "ctrl", 4);
       MULTI_LETTER_MOD (ctrl_modifier, "control", 7);
+      MULTI_LETTER_MOD (click_modifier, "click", 5);
       break;
 
     case 'H':
@@ -12380,8 +12387,6 @@ syms_of_keyboard_for_pdumper (void)
   eassert (initial_kboard == NULL);
   initial_kboard = allocate_kboard (Qt);
 
-  Vwhile_no_input_ignore_events = Qnil;
-
   inhibit_record_char = false;
 }