Merge remote-tracking branch 'savannah/master' into HEAD

14 files changed, 114 insertions, 57 deletions

diff --git a/src/dispextern.h b/src/dispextern.h
index 6246c7c0808..08380f1f17f 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2782,7 +2782,8 @@ struct it
     else                                                \
       produce_glyphs ((IT));                            \
     if ((IT)->glyph_row != NULL)                        \
-      inhibit_free_realized_faces = true;               \
+      inhibit_free_realized_faces =true;                \
+    reset_box_start_end_flags ((IT));                   \
   } while (false)
 
 /* Bit-flags indicating what operation move_it_to should perform.  */
@@ -3003,6 +3004,9 @@ struct redisplay_interface
   /* Cancel hourglass cursor on frame F.  */
   void (*hide_hourglass) (struct frame *f);
 
+  /* Called to (re)calculate the default face when changing the font
+     backend.  */
+  void (*default_font_parameter) (struct frame *f, Lisp_Object parms);
 #endif /* HAVE_WINDOW_SYSTEM */
 };
 
diff --git a/src/frame.c b/src/frame.c
index 51fc78ab703..c7e4f2f6bd9 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4565,7 +4565,11 @@ gui_set_font_backend (struct frame *f, Lisp_Object new_value, Lisp_Object old_va
     return;
 
   if (FRAME_FONT (f))
-    free_all_realized_faces (Qnil);
+    {
+      Lisp_Object frame;
+      XSETFRAME (frame, f);
+      free_all_realized_faces (frame);
+    }
 
   new_value = font_update_drivers (f, NILP (new_value) ? Qt : new_value);
   if (NILP (new_value))
@@ -4579,10 +4583,8 @@ gui_set_font_backend (struct frame *f, Lisp_Object new_value, Lisp_Object old_va
 
   if (FRAME_FONT (f))
     {
-      Lisp_Object frame;
-
-      XSETFRAME (frame, f);
-      gui_set_font (f, Fframe_parameter (frame, Qfont), Qnil);
+      /* Reconsider default font after backend(s) change (Bug#23386).  */
+      FRAME_RIF(f)->default_font_parameter (f, Qnil);
       face_change = true;
       windows_or_buffers_changed = 18;
     }
diff --git a/src/ftfont.c b/src/ftfont.c
index 219e21408e8..2b442ead4bf 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -102,7 +102,7 @@ static struct
     { "iso8859-15", { 0x00A0, 0x00A1, 0x00D0, 0x0152 }},
     { "iso8859-16", { 0x00A0, 0x0218}},
     { "gb2312.1980-0", { 0x4E13 }, "zh-cn"},
-    { "big5-0", { 0xF6B1 }, "zh-tw" },
+    { "big5-0", { 0x9C21 }, "zh-tw" },
     { "jisx0208.1983-0", { 0x4E55 }, "ja"},
     { "ksc5601.1985-0", { 0xAC00 }, "ko"},
     { "cns11643.1992-1", { 0xFE32 }, "zh-tw"},
diff --git a/src/macfont.m b/src/macfont.m
index 442a2566037..21bc7dde5b3 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -664,7 +664,7 @@ static struct
     { "iso8859-15", { 0x00A0, 0x00A1, 0x00D0, 0x0152 }},
     { "iso8859-16", { 0x00A0, 0x0218}},
     { "gb2312.1980-0", { 0x4E13 }, CFSTR ("zh-Hans")},
-    { "big5-0", { /* 0xF6B1 in ftfont.c */ 0x4EDC }, CFSTR ("zh-Hant") },
+    { "big5-0", { /* 0x9C21 in ftfont.c */ 0x4EDC }, CFSTR ("zh-Hant") },
     { "jisx0208.1983-0", { 0x4E55 }, CFSTR ("ja")},
     { "ksc5601.1987-0", { 0xAC00 }, CFSTR ("ko")},
     { "cns11643.1992-1", { 0xFE32 }, CFSTR ("zh-Hant")},
diff --git a/src/nsterm.m b/src/nsterm.m
index 96a7fdc0184..04fc0512234 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5155,6 +5155,13 @@ ns_initialize_display_info (struct ns_display_info *dpyinfo)
     reset_mouse_highlight (&dpyinfo->mouse_highlight);
 }
 
+/* This currently does nothing, since it's only really needed when
+   changing the font-backend, but macOS currently only has one
+   possible backend.  This may change if we add HarfBuzz support.  */
+static void
+ns_default_font_parameter (struct frame *f, Lisp_Object parms)
+{
+}
 
 /* This and next define (many of the) public functions in this file.  */
 /* gui_* are generic versions in xdisp.c that we, and other terms, get away
@@ -5190,7 +5197,8 @@ static struct redisplay_interface ns_redisplay_interface =
   ns_draw_window_divider,
   ns_shift_glyphs_for_insert,
   ns_show_hourglass,
-  ns_hide_hourglass
+  ns_hide_hourglass,
+  ns_default_font_parameter
 };
 
 
diff --git a/src/regex-emacs.c b/src/regex-emacs.c
index 694431c95e2..0ae004e4636 100644
--- a/src/regex-emacs.c
+++ b/src/regex-emacs.c
@@ -2113,17 +2113,20 @@ regex_compile (re_char *pattern, ptrdiff_t size,
                         if (CHAR_BYTE8_P (c1))
                           c = BYTE8_TO_CHAR (128);
                       }
-                    if (CHAR_BYTE8_P (c))
-                      {
-                        c = CHAR_TO_BYTE8 (c);
-                        c1 = CHAR_TO_BYTE8 (c1);
-                        for (; c <= c1; c++)
-                          SET_LIST_BIT (c);
-                      }
-                    else if (multibyte)
-                      SETUP_MULTIBYTE_RANGE (range_table_work, c, c1);
-                    else
-                      SETUP_UNIBYTE_RANGE (range_table_work, c, c1);
+                    if (c <= c1)
+                      {
+                        if (CHAR_BYTE8_P (c))
+                          {
+                            c = CHAR_TO_BYTE8 (c);
+                            c1 = CHAR_TO_BYTE8 (c1);
+                            for (; c <= c1; c++)
+                              SET_LIST_BIT (c);
+                          }
+                        else if (multibyte)
+                          SETUP_MULTIBYTE_RANGE (range_table_work, c, c1);
+                        else
+                          SETUP_UNIBYTE_RANGE (range_table_work, c, c1);
+                      }
                   }
               }
 
diff --git a/src/timefns.c b/src/timefns.c
index 404ce4973b7..7bcc37d7c1e 100644
--- a/src/timefns.c
+++ b/src/timefns.c
@@ -593,7 +593,7 @@ timespec_to_lisp (struct timespec t)
 }
 
 /* Return NUMERATOR / DENOMINATOR, rounded to the nearest double.
-   Arguments must be Lisp integers, and DENOMINATOR must be nonzero.  */
+   Arguments must be Lisp integers, and DENOMINATOR must be positive.  */
 static double
 frac_to_double (Lisp_Object numerator, Lisp_Object denominator)
 {
@@ -601,7 +601,6 @@ frac_to_double (Lisp_Object numerator, Lisp_Object denominator)
   if (FASTER_TIMEFNS
       && integer_to_intmax (numerator, &intmax_numerator)
       && integer_to_intmax (denominator, &intmax_denominator)
-      && ! INT_DIVIDE_OVERFLOW (intmax_numerator, intmax_denominator)
       && intmax_numerator % intmax_denominator == 0)
     return intmax_numerator / intmax_denominator;
 
@@ -611,9 +610,6 @@ frac_to_double (Lisp_Object numerator, Lisp_Object denominator)
   ptrdiff_t ndig = mpz_sizeinbase (*n, FLT_RADIX);
   ptrdiff_t ddig = mpz_sizeinbase (*d, FLT_RADIX);
 
-  if (FASTER_TIMEFNS && ndig <= DBL_MANT_DIG && ddig <= DBL_MANT_DIG)
-    return mpz_get_d (*n) / mpz_get_d (*d);
-
   /* Scale with SCALE when doing integer division.  That is, compute
      (N * FLT_RADIX**SCALE) / D [or, if SCALE is negative, N / (D *
      FLT_RADIX**-SCALE)] as a bignum, convert the bignum to double,
diff --git a/src/w32fns.c b/src/w32fns.c
index 61e22e57009..2f01fb52e92 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5749,7 +5749,7 @@ do_unwind_create_frame (Lisp_Object frame)
   unwind_create_frame (frame);
 }
 
-static void
+void
 w32_default_font_parameter (struct frame *f, Lisp_Object parms)
 {
   struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (f);
diff --git a/src/w32term.c b/src/w32term.c
index f515f5604d6..76cf6bd6964 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -7249,7 +7249,8 @@ static struct redisplay_interface w32_redisplay_interface =
   w32_draw_window_divider,
   w32_shift_glyphs_for_insert,
   w32_show_hourglass,
-  w32_hide_hourglass
+  w32_hide_hourglass,
+  w32_default_font_parameter
 };
 
 static void w32_delete_terminal (struct terminal *term);
diff --git a/src/w32term.h b/src/w32term.h
index 737764b8942..f8a8a727e8a 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -267,6 +267,10 @@ extern void w32con_show_cursor (void);
 extern const char *w32_get_string_resource (void *v_rdb,
                                             const char *name,
                                             const char *class);
+
+/* w32fns.c */
+extern void w32_default_font_parameter (struct frame* f, Lisp_Object parms);
+
 
 #define PIX_TYPE COLORREF
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 3c594b54add..04fc8aa3c45 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1020,6 +1020,7 @@ static Lisp_Object calc_line_height_property (struct it *, Lisp_Object,
 static void produce_special_glyphs (struct it *, enum display_element_type);
 static void show_mouse_face (Mouse_HLInfo *, enum draw_glyphs_face);
 static bool coords_in_mouse_face_p (struct window *, int, int);
+static void reset_box_start_end_flags (struct it *);
 
 
 
@@ -1435,6 +1436,29 @@ window_hscroll_limited (struct window *w, struct frame *f)
   return window_hscroll;
 }
 
+/* Reset the box-face start and end flags in the iterator.  This is
+   called after producing glyphs, such that we reset these flags only
+   after producing a glyph with the flag set.  */
+
+static void
+reset_box_start_end_flags (struct it *it)
+{
+  /* Don't reset if we've drawn the glyph in the display margins --
+     those don't count as "produced glyphs".  */
+  if (it->area == TEXT_AREA
+      /* Don't reset if we displayed a fringe bitmap.  */
+      && !(it->what == IT_IMAGE && it->image_id < 0))
+    {
+      /* Don't reset if the face is not a box face: that might mean we
+         are iterating some overlay or display string, and the first
+         character to have the box face is yet to be seen, when we pop
+         the iterator stack. */
+      if (it->face_box_p)
+        it->start_of_box_run_p = false;
+      it->end_of_box_run_p = false;
+    }
+}
+
 /* Return true if position CHARPOS is visible in window W.
    CHARPOS < 0 means return info about WINDOW_END position.
    If visible, set *X and *Y to pixel coordinates of top left corner.
@@ -4315,8 +4339,11 @@ handle_face_prop (struct it *it)
          this is the start of a run of characters with box face,
          i.e. this character has a shadow on the left side.  */
       it->face_id = new_face_id;
-      it->start_of_box_run_p = (new_face->box != FACE_NO_BOX
-                                && (old_face == NULL || !old_face->box));
+      /* Don't reset the start_of_box_run_p flag, only set it if
+         needed.  */
+      if (!(it->start_of_box_run_p && old_face && old_face->box))
+        it->start_of_box_run_p = (new_face->box != FACE_NO_BOX
+                                  && (old_face == NULL || !old_face->box));
       it->face_box_p = new_face->box != FACE_NO_BOX;
     }
 
@@ -6457,7 +6484,16 @@ pop_it (struct it *it)
       it->object = p->u.stretch.object;
       break;
     case GET_FROM_BUFFER:
-      it->object = it->w->contents;
+      {
+        struct face *face = FACE_FROM_ID_OR_NULL (it->f, it->face_id);
+
+        /* Restore the face_box_p flag, since it could have been
+           overwritten by the face of the object that we just finished
+           displaying.  */
+        if (face)
+          it->face_box_p = face->box != FACE_NO_BOX;
+        it->object = it->w->contents;
+      }
       break;
     case GET_FROM_STRING:
       {
@@ -7586,9 +7622,8 @@ get_next_display_element (struct it *it)
                   /* If the box comes from face properties in a
                      display string, check faces in that string.  */
                   int string_face_id = face_after_it_pos (it);
-                  it->end_of_box_run_p
-                    = (FACE_FROM_ID (it->f, string_face_id)->box
-                       == FACE_NO_BOX);
+                  if (FACE_FROM_ID (it->f, string_face_id)->box == FACE_NO_BOX)
+                    it->end_of_box_run_p = true;
                 }
               /* Otherwise, the box comes from the underlying face.
                  If this is the last string character displayed, check
@@ -7657,9 +7692,9 @@ get_next_display_element (struct it *it)
                                                        CHARPOS (pos), 0,
                                                        &ignore, face_id,
                                                        false, 0);
-                          it->end_of_box_run_p
-                            = (FACE_FROM_ID (it->f, next_face_id)->box
-                               == FACE_NO_BOX);
+                          if (FACE_FROM_ID (it->f, next_face_id)->box
+                              == FACE_NO_BOX)
+                            it->end_of_box_run_p = true;
                         }
                     }
                   else if (CHARPOS (pos) >= ZV)
@@ -7672,9 +7707,9 @@ get_next_display_element (struct it *it)
                                                  CHARPOS (pos)
                                                  + TEXT_PROP_DISTANCE_LIMIT,
                                                  false, -1, 0);
-                      it->end_of_box_run_p
-                        = (FACE_FROM_ID (it->f, next_face_id)->box
-                           == FACE_NO_BOX);
+                      if (FACE_FROM_ID (it->f, next_face_id)->box
+                          == FACE_NO_BOX)
+                        it->end_of_box_run_p = true;
                     }
                 }
             }
@@ -7684,9 +7719,9 @@ get_next_display_element (struct it *it)
       else if (it->method != GET_FROM_DISPLAY_VECTOR)
         {
           int face_id = face_after_it_pos (it);
-          it->end_of_box_run_p
-            = (face_id != it->face_id
-               && FACE_FROM_ID (it->f, face_id)->box == FACE_NO_BOX);
+          if (face_id != it->face_id
+              && FACE_FROM_ID (it->f, face_id)->box == FACE_NO_BOX)
+            it->end_of_box_run_p = true;
         }
     }
   /* If we reached the end of the object we've been iterating (e.g., a
@@ -7723,10 +7758,6 @@ get_next_display_element (struct it *it)
 void
 set_iterator_to_next (struct it *it, bool reseat_p)
 {
-  /* Reset flags indicating start and end of a sequence of characters
-     with box.  Reset them at the start of this function because
-     moving the iterator to a new position might set them.  */
-  it->start_of_box_run_p = it->end_of_box_run_p = false;
 
   switch (it->method)
     {
@@ -8138,9 +8169,9 @@ next_element_from_display_vector (struct it *it)
             }
         }
       next_face = FACE_FROM_ID_OR_NULL (it->f, next_face_id);
-      it->end_of_box_run_p = (this_face && this_face->box != FACE_NO_BOX
-                              && (!next_face
-                                  || next_face->box == FACE_NO_BOX));
+      if (this_face && this_face->box != FACE_NO_BOX
+          && (!next_face || next_face->box == FACE_NO_BOX))
+        it->end_of_box_run_p = true;
       it->face_box_p = this_face && this_face->box != FACE_NO_BOX;
     }
   else
@@ -21485,6 +21516,8 @@ append_space_for_newline (struct it *it, bool default_face_p)
 
       const int indicator_column =
         fill_column_indicator_column (it, char_width);
+      int saved_end_of_box_run = it->end_of_box_run_p;
+      bool should_keep_end_of_box_run = false;
 
       if (it->current_x == indicator_column)
         {
@@ -21507,14 +21540,18 @@ append_space_for_newline (struct it *it, bool default_face_p)
              have the end_of_box_run_p flag set for it, so there's no
              need for the appended newline glyph to have that flag
              set.  */
-          if (it->glyph_row->reversed_p
-              /* But if the appended newline glyph goes all the way to
-                 the end of the row, there will be no stretch glyph,
-                 so leave the box flag set.  */
-              && saved_x + FRAME_COLUMN_WIDTH (it->f) < it->last_visible_x)
-            it->end_of_box_run_p = false;
+          if (!(it->glyph_row->reversed_p
+                /* But if the appended newline glyph goes all the way to
+                   the end of the row, there will be no stretch glyph,
+                   so leave the box flag set.  */
+                && saved_x + FRAME_COLUMN_WIDTH (it->f) < it->last_visible_x))
+            should_keep_end_of_box_run = true;
         }
       PRODUCE_GLYPHS (it);
+      /* Restore the end_of_box_run_p flag which was reset by
+         PRODUCE_GLYPHS.  */
+      if (should_keep_end_of_box_run)
+        it->end_of_box_run_p = saved_end_of_box_run;
 #ifdef HAVE_WINDOW_SYSTEM
       if (FRAME_WINDOW_P (it->f))
         {
diff --git a/src/xfns.c b/src/xfns.c
index 5758bb7a18c..8de4c8bfd9e 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3555,7 +3555,7 @@ do_unwind_create_frame (Lisp_Object frame)
   unwind_create_frame (frame);
 }
 
-static void
+void
 x_default_font_parameter (struct frame *f, Lisp_Object parms)
 {
   struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f);
diff --git a/src/xterm.c b/src/xterm.c
index 5d229e4f524..d7d992c91b2 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -13384,7 +13384,8 @@ static struct redisplay_interface x_redisplay_interface =
     x_draw_window_divider,
     x_shift_glyphs_for_insert, /* Never called; see comment in function.  */
     x_show_hourglass,
-    x_hide_hourglass
+    x_hide_hourglass,
+    x_default_font_parameter
   };
 
 
diff --git a/src/xterm.h b/src/xterm.h
index 51e75890b60..bc10043c54c 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -1056,6 +1056,7 @@ extern void x_real_pos_and_offsets (struct frame *f,
                                     int *xptr,
                                     int *yptr,
                                     int *outer_border);
+extern void x_default_font_parameter (struct frame* f, Lisp_Object parms);
 
 /* From xrdb.c.  */