(x_set_mouse_face_gc): If the last use mouse face

has gone in the meantime, use face MOUSE_FACE_ID.

diff --git a/etc/TODO b/etc/TODO
index 0d0cce42c3728560fd73fac94bd8cc15d73e8bc2..38eb69ac8143a402ff0bef6c487e323cedfcd6f7 100644 (file)
--- a/etc/TODO
+++ b/etc/TODO
@@ -149,3 +149,6 @@
 
 * Integrate Vroonhof's Custom themes code and make it do useful
   things.
+
+* Provide an optional feature which computes a scroll bar slider's
+  size and its position from lines instead of characters.

diff --git a/src/ChangeLog b/src/ChangeLog
index 38a5dafd89dc77231464af4cd48217eaf39a0fe6..5ef6e1787f627c186835c04a5740412a5c62a352 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-01-15  Gerd Moellmann  <gerd@gnu.org>
 
+       * xterm.c (x_set_mouse_face_gc): If the last used mouse face
+       has gone in the meantime, use face MOUSE_FACE_ID.
+       
        * xterm.c (x_connection_closed) [USE_X_TOOLKIT]: If
        x_display_info_for_display returns null, don't try to close
        the display; we didn't open it.
@@ -17,7 +20,7 @@
        * xdisp.c (insert_left_trunc_glyphs): Overwrite padding glyphs by
        truncation glyphs.
        (display_line): Optimize for wide characters.
-       (display_string): Don't try to display a multi-column characters
+       (display_string): Don't try to display a multi-column character
        partially.  On ttys, produce more than one truncation glyph for
        multi-column characters that don't fit on the line.
 

diff --git a/src/xterm.c b/src/xterm.c
index 0cd68a7f9e3d7ecaaff782ef3623e3d2da8b64dd..1ad1fd4d1f99f31b796141d86fec88db65ecd48c 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2661,9 +2661,12 @@ x_set_mouse_face_gc (s)
   int face_id;
   struct face *face;
 
-  /* What face has to be used for the mouse face?  */
+  /* What face has to be used last for the mouse face?  */
   face_id = FRAME_X_DISPLAY_INFO (s->f)->mouse_face_face_id;
   face = FACE_FROM_ID (s->f, face_id);
+  if (face == NULL)
+    face = FACE_FROM_ID (s->f, MOUSE_FACE_ID);
+  
   if (s->first_glyph->type == CHAR_GLYPH)
     face_id = FACE_FOR_CHAR (s->f, face, s->first_glyph->u.ch);
   else