Merge from origin/emacs-26

8c8b673288 Fix backing up remote files in local directories on MS-Win...
8eb6870be6 Fix vertical cursor motion in pixel-scroll.el
625e84f156 Fix typos in doc strings of message.el
9292276a44 Fix a typo in the Emacs manual
42509c0649 Improve the documentation of 'table-insert-sequence'
93dc7ae4a4 Port better to QNX
ad99550610 Make tramp-test42-auto-load more robust
af0ce33d08 ; * lisp/composite.el (find-composition): Fix a typo in la...
bdbcdbac43 Avoid assertions in find-composition

1 files changed, 15 insertions, 8 deletions

diff --git a/src/font.c b/src/font.c
index f7cebdce78c..441652b0951 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3794,19 +3794,26 @@ font_range (ptrdiff_t pos, ptrdiff_t pos_byte, ptrdiff_t *limit,
   int c;
   Lisp_Object font_object = Qnil;
 
-  if (NILP (string))
+  if (!face)
     {
-      if (! face)
+      struct frame *f = XFRAME (w->frame);
+      int face_id;
+
+      if (NILP (string))
+          face_id = face_at_buffer_position (w, pos, &ignore, *limit,
+                                             false, -1);
+      else
         {
-          int face_id;
+          face_id =
+            NILP (Vface_remapping_alist)
+            ? DEFAULT_FACE_ID
+            : lookup_basic_face (f, DEFAULT_FACE_ID);
 
-          face_id = face_at_buffer_position (w, pos, &ignore,
-                                             *limit, false, -1);
-          face = FACE_FROM_ID (XFRAME (w->frame), face_id);
+          face_id = face_at_string_position (w, string, pos, 0, &ignore,
+                                             face_id, false);
         }
+      face = FACE_FROM_ID (f, face_id);
     }
-  else
-    eassert (face);
 
   while (pos < *limit)
     {