From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 23 Nov 2001 17:16:17 +0000 (+0000)
Subject: (IT_clear_screen): If the frame's faces are not yet
X-Git-Tag: ttn-vms-21-2-B4~18269
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=deece6f51a419739abb1eba6cde42677643e5510;p=emacs.git

(IT_clear_screen): If the frame's faces are not yet
realized, use the initial screen colors to clear the screen.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index bc9198884f4..66c7125adda 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-23  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* msdos.c (IT_clear_screen): If the frame's faces are not yet
+	realized, use the initial screen colors to clear the screen.
+
 2001-11-23  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
 	* textprop.c (Fset_text_properties): Remove unused variables
diff --git a/src/msdos.c b/src/msdos.c
index fdf8b078b3c..68386b95581 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -413,6 +413,10 @@ extern int unibyte_display_via_language_environment;
 
 Lisp_Object Qbar;
 
+/* The screen colors of the curent frame, which serve as the default
+   colors for newly-created frames.  */
+static int initial_screen_colors[2];
+
 #if __DJGPP__ > 1
 /* Update the screen from a part of relocated DOS/V screen buffer which
    begins at OFFSET and includes COUNT characters.  */
@@ -1797,7 +1801,16 @@ IT_clear_screen (void)
 {
   if (termscript)
     fprintf (termscript, "<CLR:SCR>");
-  IT_set_face (0);
+  /* We are sometimes called (from clear_garbaged_frames) when a new
+     frame is being created, but its faces are not yet realized.  In
+     such a case we cannot call IT_set_face, since it will fail to find
+     any valid faces and will abort.  Instead, use the initial screen
+     colors; that should mimic what a Unix tty does, which simply clears
+     the screen with whatever default colors are in use.  */
+  if (FACE_FROM_ID (SELECTED_FRAME (), DEFAULT_FACE_ID) == NULL)
+    ScreenAttrib = (initial_screen_colors[0] << 4) | initial_screen_colors[1];
+  else
+    IT_set_face (0);
   mouse_off ();
   ScreenClear ();
   if (screen_virtual_segment)
@@ -2275,9 +2288,6 @@ IT_set_terminal_window (int foo)
 
 /* Remember the screen colors of the curent frame, to serve as the
    default colors for newly-created frames.  */
-
-static int initial_screen_colors[2];
-
 DEFUN ("msdos-remember-default-colors", Fmsdos_remember_default_colors,
        Smsdos_remember_default_colors, 1, 1, 0,
   "Remember the screen colors of the current frame.")