diff src/font.c @ 103114:fa8e2c663118

* xfaces.c (face_at_buffer_position): New arg base_face_id. * xdisp.c (handle_face_prop): Pass base_face_id of iterator to face_at_buffer_position. (face_before_or_after_it_pos, get_next_display_element) (note_mouse_highlight): Update face_at_buffer_position call. * term.c (term_mouse_highlight): * msdos.c (IT_note_mouse_highlight): * fontset.c (Finternal_char_font): * font.c (font_at, font_range): Update face_at_buffer_position call. * dispextern.h (face_at_buffer_position): Update prototype.

--- a/src/font.c	Thu Apr 30 04:53:57 2009 +0000
+++ b/src/font.c	Thu Apr 30 05:01:57 2009 +0000
@@ -3780,7 +3780,7 @@
 					   DEFAULT_FACE_ID, 0);
       else
 	face_id = face_at_buffer_position (w, pos, -1, -1, &endptr,
-					   pos + 100, 0);
+					   pos + 100, 0, -1);
       face = FACE_FROM_ID (f, face_id);
     }
   if (multibyte)
@@ -3827,7 +3827,8 @@
 	{
 	  int face_id;
 
-	  face_id = face_at_buffer_position (w, pos, 0, 0, &ignore, *limit, 0);
+	  face_id = face_at_buffer_position (w, pos, 0, 0, &ignore,
+					     *limit, 0, -1);
 	  face = FACE_FROM_ID (XFRAME (w->frame), face_id);
 	}
     }