Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

14 files changed, 253 insertions, 126 deletions

diff --git a/src/cmds.c b/src/cmds.c
index 7a575ae7348..ccc68911624 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -264,7 +264,7 @@ because it respects values of `delete-active-region' and `overwrite-mode'.  */)
 
   CHECK_NUMBER (n);
 
-  if (abs (XINT (n)) < 2)
+  if (eabs (XINT (n)) < 2)
     remove_excessive_undo_boundaries ();
 
   pos = PT + XINT (n);
diff --git a/src/coding.c b/src/coding.c
index 3fc6fb684c6..c5099a7b0b9 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -6004,6 +6004,8 @@ coding_inherit_eol_type (Lisp_Object coding_system, Lisp_Object parent)
 
   if (NILP (coding_system))
     coding_system = Qraw_text;
+  else
+    CHECK_CODING_SYSTEM (coding_system);
   spec = CODING_SYSTEM_SPEC (coding_system);
   eol_type = AREF (spec, 2);
   if (VECTORP (eol_type))
@@ -6014,6 +6016,7 @@ coding_inherit_eol_type (Lisp_Object coding_system, Lisp_Object parent)
         {
           Lisp_Object parent_spec;
 
+          CHECK_CODING_SYSTEM (parent);
           parent_spec = CODING_SYSTEM_SPEC (parent);
           parent_eol_type = AREF (parent_spec, 2);
           if (VECTORP (parent_eol_type))
diff --git a/src/dired.c b/src/dired.c
index 97736673f5d..3486e49b566 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -397,8 +397,10 @@ Returns nil if DIRECTORY contains no name starting with FILE.
 If PREDICATE is non-nil, call PREDICATE with each possible
 completion (in absolute form) and ignore it if PREDICATE returns nil.
 
-This function ignores some of the possible completions as
-determined by the variable `completion-ignored-extensions', which see.  */)
+This function ignores some of the possible completions as determined
+by the variables `completion-regexp-list' and
+`completion-ignored-extensions', which see.  `completion-regexp-list'
+is matched against file and directory names relative to DIRECTORY.  */)
   (Lisp_Object file, Lisp_Object directory, Lisp_Object predicate)
 {
   Lisp_Object handler;
@@ -422,7 +424,12 @@ determined by the variable `completion-ignored-extensions', which see.  */)
 DEFUN ("file-name-all-completions", Ffile_name_all_completions,
        Sfile_name_all_completions, 2, 2, 0,
        doc: /* Return a list of all completions of file name FILE in directory DIRECTORY.
-These are all file names in directory DIRECTORY which begin with FILE.  */)
+These are all file names in directory DIRECTORY which begin with FILE.
+
+This function ignores some of the possible completions as determined
+by the variables `completion-regexp-list' and
+`completion-ignored-extensions', which see.  `completion-regexp-list'
+is matched against file and directory names relative to DIRECTORY.  */)
   (Lisp_Object file, Lisp_Object directory)
 {
   Lisp_Object handler;
diff --git a/src/fileio.c b/src/fileio.c
index e4b255a53ac..3155ef0edf1 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3470,7 +3470,11 @@ by calling `format-decode', which see.  */)
       mtime = time_error_value (save_errno);
       st.st_size = -1;
       if (!NILP (Vcoding_system_for_read))
-        Fset (Qbuffer_file_coding_system, Vcoding_system_for_read);
+        {
+          /* Don't let invalid values into buffer-file-coding-system.  */
+          CHECK_CODING_SYSTEM (Vcoding_system_for_read);
+          Fset (Qbuffer_file_coding_system, Vcoding_system_for_read);
+        }
       goto notfound;
     }
 
@@ -4569,7 +4573,7 @@ choose_write_coding_system (Lisp_Object start, Lisp_Object end, Lisp_Object file
       if (NILP (val))
         {
           /* If we still have not decided a coding system, use the
-             default value of buffer-file-coding-system.  */
+             current buffer's value of buffer-file-coding-system.  */
           val = BVAR (current_buffer, buffer_file_coding_system);
           using_default_coding = 1;
         }
@@ -4578,6 +4582,7 @@ choose_write_coding_system (Lisp_Object start, Lisp_Object end, Lisp_Object file
         {
           Lisp_Object spec, attrs;
 
+          CHECK_CODING_SYSTEM (val);
           CHECK_CODING_SYSTEM_GET_SPEC (val, spec);
           attrs = AREF (spec, 0);
           if (EQ (CODING_ATTR_TYPE (attrs), Qraw_text))
@@ -4586,17 +4591,27 @@ choose_write_coding_system (Lisp_Object start, Lisp_Object end, Lisp_Object file
 
       if (!force_raw_text
           && !NILP (Ffboundp (Vselect_safe_coding_system_function)))
-        /* Confirm that VAL can surely encode the current region.  */
-        val = call5 (Vselect_safe_coding_system_function,
-                     start, end, val, Qnil, filename);
+        {
+          /* Confirm that VAL can surely encode the current region.  */
+          val = call5 (Vselect_safe_coding_system_function,
+                       start, end, val, Qnil, filename);
+          /* As the function specified by select-safe-coding-system-function
+             is out of our control, make sure we are not fed by bogus
+             values.  */
+          if (!NILP (val))
+            CHECK_CODING_SYSTEM (val);
+        }
 
       /* If the decided coding-system doesn't specify end-of-line
          format, we use that of
          `default-buffer-file-coding-system'.  */
-      if (! using_default_coding
-          && ! NILP (BVAR (&buffer_defaults, buffer_file_coding_system)))
-        val = (coding_inherit_eol_type
-               (val, BVAR (&buffer_defaults, buffer_file_coding_system)));
+      if (! using_default_coding)
+        {
+          Lisp_Object dflt = BVAR (&buffer_defaults, buffer_file_coding_system);
+
+          if (! NILP (dflt))
+            val = coding_inherit_eol_type (val, dflt);
+        }
 
       /* If we decide not to encode text, use `raw-text' or one of its
          subsidiaries.  */
diff --git a/src/font.c b/src/font.c
index ce144e78a08..a52a653d29b 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1770,7 +1770,7 @@ font_parse_family_registry (Lisp_Object family, Lisp_Object registry, Lisp_Objec
       p1 = strchr (p0, '-');
       if (! p1)
         {
-          AUTO_STRING (extra, ("*-*" + (len && p0[len - 1] == '*')));
+          AUTO_STRING (extra, (&"*-*"[len && p0[len - 1] == '*']));
           registry = concat2 (registry, extra);
         }
       registry = Fdowncase (registry);
diff --git a/src/frame.c b/src/frame.c
index 121c55fdb20..f1a78fbdbf8 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3539,8 +3539,8 @@ x_set_screen_gamma (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu
             (f, bgcolor, Qnil);
     }
 
-  clear_face_cache (true);
-  windows_or_buffers_changed = 70;
+  clear_face_cache (true);      /* FIXME: Why of all frames?  */
+  fset_redisplay (f);
 }
 
 
diff --git a/src/gfilenotify.c b/src/gfilenotify.c
index 8b6b0a0cd2d..69f635d4115 100644
--- a/src/gfilenotify.c
+++ b/src/gfilenotify.c
@@ -195,6 +195,7 @@ will be reported only in case of the `moved' event.  */)
 
   /* Enable watch.  */
   monitor = g_file_monitor (gfile, gflags, NULL, &gerror);
+  g_object_unref (gfile);
   if (gerror)
     {
       char msg[1024];
diff --git a/src/macfont.m b/src/macfont.m
index 97a255bf018..fae284fad89 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -190,6 +190,14 @@ cfstring_create_with_string_noencode (Lisp_Object s)
   return string;
 }
 
+static CFIndex
+mac_font_get_weight (CTFontRef font)
+{
+  NSFont *nsFont = (NSFont *) font;
+
+  return [[NSFontManager sharedFontManager] weightOfFont:nsFont];
+}
+
 static CGFloat
 mac_screen_font_get_advance_width_for_glyph (ScreenFontRef font, CGGlyph glyph)
 {
@@ -198,57 +206,53 @@ mac_screen_font_get_advance_width_for_glyph (ScreenFontRef font, CGGlyph glyph)
   return advancement.width;
 }
 
+#if !USE_CT_GLYPH_INFO
 static CGGlyph
 mac_font_get_glyph_for_cid (CTFontRef font, CTCharacterCollection collection,
                             CGFontIndex cid)
 {
-#if USE_CT_GLYPH_INFO
-  return mac_ctfont_get_glyph_for_cid ((CTFontRef) font, collection, cid);
-#else
-  {
-    CGGlyph result = kCGFontIndexInvalid;
-    NSFont *nsFont = (NSFont *) font;
-    unichar characters[] = {0xfffd};
-    NSString *string =
-      [NSString stringWithCharacters:characters
-                              length:ARRAYELTS (characters)];
-    NSGlyphInfo *glyphInfo =
-      [NSGlyphInfo glyphInfoWithCharacterIdentifier:cid
-                                         collection:collection
-                                         baseString:string];
-    NSDictionary *attributes =
-      [NSDictionary dictionaryWithObjectsAndKeys:nsFont,NSFontAttributeName,
-                    glyphInfo,NSGlyphInfoAttributeName,nil];
-    NSTextStorage *textStorage =
-      [[NSTextStorage alloc] initWithString:string
-                                 attributes:attributes];
-    NSLayoutManager *layoutManager = [[NSLayoutManager alloc] init];
-    NSTextContainer *textContainer = [[NSTextContainer alloc] init];
-    NSFont *fontInTextStorage;
-
-    [layoutManager addTextContainer:textContainer];
-    [textContainer release];
-    [textStorage addLayoutManager:layoutManager];
-    [layoutManager release];
-
-    /* Force layout.  */
-    (void) [layoutManager glyphRangeForTextContainer:textContainer];
-
-    fontInTextStorage = [textStorage attribute:NSFontAttributeName atIndex:0
-                                effectiveRange:NULL];
-    if (fontInTextStorage == nsFont
-        || [[fontInTextStorage fontName] isEqualToString:[nsFont fontName]])
-      {
-        NSGlyph glyph = [layoutManager glyphAtIndex:0];
+  CGGlyph result = kCGFontIndexInvalid;
+  NSFont *nsFont = (NSFont *) font;
+  unichar characters[] = {0xfffd};
+  NSString *string =
+    [NSString stringWithCharacters:characters
+                            length:ARRAYELTS (characters)];
+  NSGlyphInfo *glyphInfo =
+    [NSGlyphInfo glyphInfoWithCharacterIdentifier:cid
+                                       collection:collection
+                                       baseString:string];
+  NSDictionary *attributes =
+    [NSDictionary dictionaryWithObjectsAndKeys:nsFont,NSFontAttributeName,
+                  glyphInfo,NSGlyphInfoAttributeName,nil];
+  NSTextStorage *textStorage =
+    [[NSTextStorage alloc] initWithString:string
+                               attributes:attributes];
+  NSLayoutManager *layoutManager = [[NSLayoutManager alloc] init];
+  NSTextContainer *textContainer = [[NSTextContainer alloc] init];
+  NSFont *fontInTextStorage;
 
-        if (glyph < [nsFont numberOfGlyphs])
-          result = glyph;
-      }
+  [layoutManager addTextContainer:textContainer];
+  [textContainer release];
+  [textStorage addLayoutManager:layoutManager];
+  [layoutManager release];
 
-    [textStorage release];
+  /* Force layout.  */
+  (void) [layoutManager glyphRangeForTextContainer:textContainer];
 
-    return result;
-  }
+  fontInTextStorage = [textStorage attribute:NSFontAttributeName atIndex:0
+                              effectiveRange:NULL];
+  if (fontInTextStorage == nsFont
+      || [[fontInTextStorage fontName] isEqualToString:[nsFont fontName]])
+    {
+      NSGlyph glyph = [layoutManager glyphAtIndex:0];
+
+      if (glyph < [nsFont numberOfGlyphs])
+        result = glyph;
+    }
+
+  [textStorage release];
+
+  return result;
 }
 #endif
 
@@ -762,6 +766,46 @@ cfnumber_get_font_symbolic_traits_value (CFNumberRef number,
   return false;
 }
 
+static CGFloat
+mac_font_descriptor_get_adjusted_weight (CTFontDescriptorRef desc, CGFloat val)
+{
+  long percent_val = lround (val * 100);
+
+  if (percent_val == -40 || percent_val == 56)
+    {
+      CTFontRef font = NULL;
+      CFStringRef name =
+        CTFontDescriptorCopyAttribute (desc, kCTFontNameAttribute);
+
+      if (name)
+        {
+          font = CTFontCreateWithName (name, 0, NULL);
+          CFRelease (name);
+        }
+      if (font)
+        {
+          CFIndex weight = mac_font_get_weight (font);
+
+          if (percent_val == -40)
+            {
+              /* Workaround for crash when displaying Oriya characters
+                 with Arial Unicode MS on OS X 10.11.  */
+              if (weight == 5)
+                val = 0;
+            }
+          else                  /* percent_val == 56 */
+            {
+              if (weight == 9)
+                /* Adjustment for HiraginoSans-W7 on OS X 10.11.  */
+                val = 0.4;
+            }
+          CFRelease (font);
+        }
+    }
+
+  return val;
+}
+
 static void
 macfont_store_descriptor_attributes (CTFontDescriptorRef desc,
                                      Lisp_Object spec_or_entity)
@@ -785,6 +829,7 @@ macfont_store_descriptor_attributes (CTFontDescriptorRef desc,
         enum font_property_index index;
         CFStringRef trait;
         CGPoint points[6];
+        CGFloat (*adjust_func) (CTFontDescriptorRef, CGFloat);
       } numeric_traits[] =
           {{FONT_WEIGHT_INDEX, kCTFontWeightTrait,
             {{-0.4, 50},        /* light */
@@ -792,11 +837,12 @@ macfont_store_descriptor_attributes (CTFontDescriptorRef desc,
              {0, 100},          /* normal */
              {0.24, 140},       /* (semi-bold + normal) / 2 */
              {0.4, 200},        /* bold */
-             {CGFLOAT_MAX, CGFLOAT_MAX}}},
+             {CGFLOAT_MAX, CGFLOAT_MAX}},
+            mac_font_descriptor_get_adjusted_weight},
            {FONT_SLANT_INDEX, kCTFontSlantTrait,
-            {{0, 100}, {0.1, 200}, {CGFLOAT_MAX, CGFLOAT_MAX}}},
+            {{0, 100}, {0.1, 200}, {CGFLOAT_MAX, CGFLOAT_MAX}}, NULL},
            {FONT_WIDTH_INDEX, kCTFontWidthTrait,
-            {{0, 100}, {1, 200}, {CGFLOAT_MAX, CGFLOAT_MAX}}}};
+            {{0, 100}, {1, 200}, {CGFLOAT_MAX, CGFLOAT_MAX}}, NULL}};
       int i;
 
       for (i = 0; i < ARRAYELTS (numeric_traits); i++)
@@ -806,6 +852,8 @@ macfont_store_descriptor_attributes (CTFontDescriptorRef desc,
             {
               CGPoint *point = numeric_traits[i].points;
 
+              if (numeric_traits[i].adjust_func)
+                floatval = (*numeric_traits[i].adjust_func) (desc, floatval);
               while (point->x < floatval)
                 point++;
               if (point == numeric_traits[i].points)
@@ -2717,7 +2765,6 @@ macfont_has_char (Lisp_Object font, int c)
 static unsigned
 macfont_encode_char (struct font *font, int c)
 {
-  struct macfont_info *macfont_info = (struct macfont_info *) font;
   CGGlyph glyph;
 
   block_input ();
@@ -3379,18 +3426,24 @@ mac_font_descriptor_supports_languages (CTFontDescriptorRef descriptor,
     result = false;
   else
     {
-      CFIndex desc_languages_count, i, languages_count;
+      CFRange range = CFRangeMake (0, CFArrayGetCount (desc_languages));
+      CFIndex i, languages_count = CFArrayGetCount (languages);
 
-      desc_languages_count = CFArrayGetCount (desc_languages);
-      languages_count = CFArrayGetCount (languages);
       for (i = 0; i < languages_count; i++)
-        if (!CFArrayContainsValue (desc_languages,
-                                   CFRangeMake (0, desc_languages_count),
-                                   CFArrayGetValueAtIndex (languages, i)))
-          {
-            result = false;
-            break;
-          }
+        {
+          CFStringRef language = CFArrayGetValueAtIndex (languages, i);
+
+          if (!CFArrayContainsValue (desc_languages, range, language)
+              /* PingFang SC contains "zh" and "zh-Hant" as covered
+                 languages, but does not contain "zh-Hans".  */
+              && !(CFEqual (language, CFSTR ("zh-Hans"))
+                   && CFArrayContainsValue (desc_languages, range,
+                                            CFSTR ("zh"))))
+            {
+              result = false;
+              break;
+            }
+        }
       CFRelease (desc_languages);
     }
 
@@ -3998,8 +4051,6 @@ mac_register_font_driver (struct frame *f)
 void
 syms_of_macfont (void)
 {
-  static struct font_driver mac_font_driver;
-
   /* Core Text, for Mac OS X.  */
   DEFSYM (Qmac_ct, "mac-ct");
   macfont_driver.type = Qmac_ct;
diff --git a/src/nsterm.m b/src/nsterm.m
index a5bf06a70af..65d07b2f1e4 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6724,6 +6724,11 @@ if (cols > 0 && rows > 0)
 {
   if (fs_state != emacsframe->want_fullscreen)
     {
+      NSSize sz;
+      sz.width = frame_resize_pixelwise ? 1 : FRAME_COLUMN_WIDTH (emacsframe);
+      sz.height = frame_resize_pixelwise ? 1 : FRAME_LINE_HEIGHT (emacsframe);
+      [[self window] setResizeIncrements:sz];
+
       if (fs_state == FULLSCREEN_BOTH)
         {
           [self toggleFullScreen:self];
diff --git a/src/process.c b/src/process.c
index 42dd17c57e0..55f31a02673 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5031,18 +5031,12 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
       for (channel = 0; channel <= max_input_desc; ++channel)
         {
           struct fd_callback_data *d = &fd_callback_info[channel];
-          if (d->func)
-            {
-              if (d->condition & FOR_READ
-                  && FD_ISSET (channel, &Available))
-                {
-                  d->func (channel, d->data);
-                  FD_CLR (channel, &Available);
-                }
-              else if (d->condition & FOR_WRITE
-                       && FD_ISSET (channel, &write_mask))
-                d->func (channel, d->data);
-            }
+          if (d->func
+              && ((d->condition & FOR_READ
+                   && FD_ISSET (channel, &Available))
+                  || (d->condition & FOR_WRITE
+                      && FD_ISSET (channel, &write_mask))))
+            d->func (channel, d->data);
         }
 
       for (channel = 0; channel <= max_process_desc; channel++)
diff --git a/src/window.c b/src/window.c
index 42a2ca68f14..6d06e548094 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1686,8 +1686,10 @@ Return nil if that position is scrolled vertically out of view.  If a
 character is only partially visible, nil is returned, unless the
 optional argument PARTIALLY is non-nil.  If POS is only out of view
 because of horizontal scrolling, return non-nil.  If POS is t, it
-specifies the position of the last visible glyph in WINDOW.  POS
-defaults to point in WINDOW; WINDOW defaults to the selected window.
+specifies either the first position displayed on the last visible
+screen line in WINDOW, or the end-of-buffer position, whichever comes
+first.  POS defaults to point in WINDOW; WINDOW defaults to the
+selected window.
 
 If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil,
 the return value is a list of 2 or 6 elements (X Y [RTOP RBOT ROWH VPOS]),
@@ -6607,7 +6609,6 @@ apply_window_adjustment (struct window *w)
   eassert (w);
   clear_glyph_matrix (w->current_matrix);
   w->window_end_valid = false;
-  windows_or_buffers_changed = 30;
   wset_redisplay (w);
   adjust_frame_glyphs (XFRAME (WINDOW_FRAME (w)));
 }
diff --git a/src/xdisp.c b/src/xdisp.c
index 2c38aa9ccff..44983bb4f9d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -434,22 +434,54 @@ static Lisp_Object Vmessage_stack;
 
 static bool message_enable_multibyte;
 
-/* Nonzero if we should redraw the mode lines on the next redisplay.
-   If it has value REDISPLAY_SOME, then only redisplay the mode lines where
-   the `redisplay' bit has been set.  Otherwise, redisplay all mode lines
-   (the number used is then only used to track down the cause for this
-   full-redisplay).  */
+/* At each redisplay cycle, we should refresh everything there is to refresh.
+   To do that efficiently, we use many optimizations that try to make sure we
+   don't waste too much time updating things that haven't changed.
+   The coarsest such optimization is that, in the most common cases, we only
+   look at the selected-window.
+
+   To know whether other windows should be considered for redisplay, we use the
+   variable windows_or_buffers_changed: as long as it is 0, it means that we
+   have not noticed anything that should require updating anything else than
+   the selected-window.  If it is set to REDISPLAY_SOME, it means that since
+   last redisplay, some changes have been made which could impact other
+   windows.  To know which ones need redisplay, every buffer, window, and frame
+   has a `redisplay' bit, which (if true) means that this object needs to be
+   redisplayed.  If windows_or_buffers_changed is 0, we know there's no point
+   looking for those `redisplay' bits (actually, there might be some such bits
+   set, but then only on objects which aren't displayed anyway).
+
+   OTOH if it's non-zero we wil have to loop through all windows and then check
+   the `redisplay' bit of the corresponding window, frame, and buffer, in order
+   to decide whether that window needs attention or not.  Not that we can't
+   just look at the frame's redisplay bit to decide that the whole frame can be
+   skipped, since even if the frame's redisplay bit is unset, some of its
+   windows's redisplay bits may be set.
+
+   Mostly for historical reasons, windows_or_buffers_changed can also take
+   other non-zero values.  In that case, the precise value doesn't matter (it
+   encodes the cause of the setting but is only used for debugging purposes),
+   and what it means is that we shouldn't pay attention to any `redisplay' bits
+   and we should simply try and redisplay every window out there.  */
 
-int update_mode_lines;
+int windows_or_buffers_changed;
 
-/* Nonzero if window sizes or contents other than selected-window have changed
-   since last redisplay that finished.
-   If it has value REDISPLAY_SOME, then only redisplay the windows where
-   the `redisplay' bit has been set.  Otherwise, redisplay all windows
-   (the number used is then only used to track down the cause for this
-   full-redisplay).  */
+/* Nonzero if we should redraw the mode lines on the next redisplay.
+   Similarly to `windows_or_buffers_changed', If it has value REDISPLAY_SOME,
+   then only redisplay the mode lines in those buffers/windows/frames where the
+   `redisplay' bit has been set.
+   For any other value, redisplay all mode lines (the number used is then only
+   used to track down the cause for this full-redisplay).
+
+   The `redisplay' bits are the same as those used for
+   windows_or_buffers_changed, and setting windows_or_buffers_changed also
+   causes recomputation of the mode lines of all those windows.  IOW this
+   variable only has an effect if windows_or_buffers_changed is zero, in which
+   case we should only need to redisplay the mode-line of those objects with
+   a `redisplay' bit set but not the window's text content (tho we may still
+   need to refresh the text content of the selected-window).  */
 
-int windows_or_buffers_changed;
+int update_mode_lines;
 
 /* True after display_mode_line if %l was used and it displayed a
    line number.  */
@@ -13383,6 +13415,8 @@ redisplay_internal (void)
   pending = false;
   forget_escape_and_glyphless_faces ();
 
+  inhibit_free_realized_faces = false;
+
   /* If face_change, init_iterator will free all realized faces, which
      includes the faces referenced from current matrices.  So, we
      can't reuse current matrices in this case.  */
@@ -13430,7 +13464,7 @@ redisplay_internal (void)
           /* If cursor type has been changed on the frame
              other than selected, consider all frames.  */
           if (f != sf && f->cursor_type_changed)
-            update_mode_lines = 31;
+            fset_redisplay (f);
         }
       clear_desired_matrices (f);
     }
@@ -13528,9 +13562,12 @@ redisplay_internal (void)
   consider_all_windows_p = (update_mode_lines
                             || windows_or_buffers_changed);
 
-#define AINC(a,i) \
-  if (VECTORP (a) && i >= 0 && i < ASIZE (a) && INTEGERP (AREF (a, i))) \
-    ASET (a, i, make_number (1 + XINT (AREF (a, i))))
+#define AINC(a,i)                                                       \
+  {                                                                     \
+    Lisp_Object entry = Fgethash (make_number (i), a, make_number (0)); \
+    if (INTEGERP (entry))                                               \
+      Fputhash (make_number (i), make_number (1 + XINT (entry)), a);    \
+  }
 
   AINC (Vredisplay__all_windows_cause, windows_or_buffers_changed);
   AINC (Vredisplay__mode_lines_cause, update_mode_lines);
@@ -13745,7 +13782,8 @@ redisplay_internal (void)
 #endif
 
   /* Build desired matrices, and update the display.  If
-     consider_all_windows_p, do it for all windows on all frames.
+     consider_all_windows_p, do it for all windows on all frames that
+     require redisplay, as specified by their 'redisplay' flag.
      Otherwise do it for selected_window, only.  */
 
   if (consider_all_windows_p)
@@ -13871,6 +13909,10 @@ redisplay_internal (void)
       if (sf->fonts_changed)
         goto retry;
 
+      /* Prevent freeing of realized faces, since desired matrices are
+         pending that reference the faces we computed and cached.  */
+      inhibit_free_realized_faces = true;
+
       /* Prevent various kinds of signals during display update.
          stdio is not robust about handling signals,
          which can cause an apparent I/O error.  */
@@ -19802,7 +19844,8 @@ push_prefix_prop (struct it *it, Lisp_Object prop)
 
   eassert (it->method == GET_FROM_BUFFER
            || it->method == GET_FROM_DISPLAY_VECTOR
-           || it->method == GET_FROM_STRING);
+           || it->method == GET_FROM_STRING
+           || it->method == GET_FROM_IMAGE);
 
   /* We need to save the current buffer/string position, so it will be
      restored by pop_it, because iterate_out_of_display_property
@@ -31381,13 +31424,11 @@ display table takes effect; in this case, Emacs does not consult
 
   DEFVAR_LISP ("redisplay--all-windows-cause", Vredisplay__all_windows_cause,
                doc: /*  */);
-  Vredisplay__all_windows_cause
-    = Fmake_vector (make_number (100), make_number (0));
+  Vredisplay__all_windows_cause = Fmake_hash_table (0, NULL);
 
   DEFVAR_LISP ("redisplay--mode-lines-cause", Vredisplay__mode_lines_cause,
                doc: /*  */);
-  Vredisplay__mode_lines_cause
-    = Fmake_vector (make_number (100), make_number (0));
+  Vredisplay__mode_lines_cause = Fmake_hash_table (0, NULL);
 }
 
 
diff --git a/src/xfaces.c b/src/xfaces.c
index 40713f167ff..8cf0b427799 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -631,7 +631,7 @@ free_frame_faces (struct frame *f)
 /* Clear face caches, and recompute basic faces for frame F.  Call
    this after changing frame parameters on which those faces depend,
    or when realized faces have been freed due to changing attributes
-   of named faces. */
+   of named faces.  */
 
 void
 recompute_basic_faces (struct frame *f)
@@ -2528,10 +2528,15 @@ Value is a vector of face attributes.  */)
   if (NILP (Fget (face, Qface_no_inherit)))
     {
       if (f)
-        f->face_change = 1;
+        {
+          f->face_change = true;
+          fset_redisplay (f);
+        }
       else
-        face_change = true;
-      windows_or_buffers_changed = 54;
+        {
+          face_change = true;
+          windows_or_buffers_changed = 54;
+        }
     }
 
   eassert (LFACEP (lface));
@@ -2613,10 +2618,15 @@ The value is TO.  */)
   if (NILP (Fget (to, Qface_no_inherit)))
     {
       if (f)
-        f->face_change = 1;
+        {
+          f->face_change = true;
+          fset_redisplay (f);
+        }
       else
-        face_change = true;
-      windows_or_buffers_changed = 55;
+        {
+          face_change = true;
+          windows_or_buffers_changed = 55;
+        }
     }
 
   return to;
@@ -3120,7 +3130,7 @@ FRAME 0 means change the face on all frames, and change the default
       && NILP (Fequal (old_value, value)))
     {
       f->face_change = true;
-      windows_or_buffers_changed = 56;
+      fset_redisplay (f);
     }
 
   if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)
@@ -3293,7 +3303,7 @@ update_face_from_frame_parameter (struct frame *f, Lisp_Object param,
       && NILP (Fget (face, Qface_no_inherit)))
     {
       f->face_change = true;
-      windows_or_buffers_changed = 57;
+      fset_redisplay (f);
     }
 }
 
diff --git a/src/xfns.c b/src/xfns.c
index d6a3d76e948..fc6111c4fab 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1041,7 +1041,7 @@ x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
     nlines = 0;
 
   /* Make sure we redisplay all windows in this frame.  */
-  windows_or_buffers_changed = 59;
+  fset_redisplay (f);
 
 #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
   FRAME_MENU_BAR_LINES (f) = 0;
@@ -1160,8 +1160,7 @@ x_change_tool_bar_height (struct frame *f, int height)
   Lisp_Object fullscreen;
 
   /* Make sure we redisplay all windows in this frame.  */
-  windows_or_buffers_changed = 60;
-
+  fset_redisplay (f);
 
   /* Recalculate tool bar and frame text sizes.  */
   FRAME_TOOL_BAR_HEIGHT (f) = height;