(x_set_mouse_face_gc): If the last use mouse face

has gone in the meantime, use face MOUSE_FACE_ID.

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.

src/ChangeLog

 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.
 

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