New parameter to control the face extension..

* src/xdisp.c (handle_face_prop_general): New function to specialize
handle_face_prop with ATTR_FILTER.
* src/dispextern.h (face_at_buffer_position): Added
LFACE_ATTRIBUTE_INDEX.
* src/xfaces.c (merge_face_ref): Added LFACE_ATTRIBUTE_INDEX to merge
conditionally.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/font.c b/src/font.c
index 6bc977fd68e..e1e33ab8b22 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3785,10 +3785,10 @@ font_at (int c, ptrdiff_t pos, struct face *face, struct window *w,
 
       if (STRINGP (string))
         face_id = face_at_string_position (w, string, pos, 0, &endptr,
-                                           DEFAULT_FACE_ID, false);
+                                           DEFAULT_FACE_ID, 0);
       else
         face_id = face_at_buffer_position (w, pos, &endptr,
-                                           pos + 100, false, -1);
+                                           pos + 100, false, -1, 0);
       face = FACE_FROM_ID (f, face_id);
     }
   if (multibyte)
@@ -3832,7 +3832,7 @@ font_range (ptrdiff_t pos, ptrdiff_t pos_byte, ptrdiff_t *limit,
 
       if (NILP (string))
           face_id = face_at_buffer_position (w, pos, &ignore, *limit,
-                                             false, -1);
+                                             false, -1, 0);
       else
         {
           face_id =
@@ -4618,7 +4618,7 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0,
       w = XWINDOW (window);
       f = XFRAME (w->frame);
       face_id = face_at_buffer_position (w, pos, &dummy,
-                                         pos + 100, false, -1);
+                                         pos + 100, false, -1, 0);
     }
   if (! CHAR_VALID_P (c))
     return Qnil;