[Emacs-diffs] Changes to emacs/src/msdos.c,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    08/08/27 19:07:07

Index: msdos.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/msdos.c,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -b -r1.221 -r1.222
--- msdos.c     26 Aug 2008 20:27:44 -0000      1.221
+++ msdos.c     27 Aug 2008 19:07:07 -0000      1.222
@@ -2188,22 +2188,14 @@
   struct frame *f;
 
   CHECK_FRAME (frame);
-  f= XFRAME (frame);
+  f = XFRAME (frame);
 
   /* This function is called after applying default-frame-alist to the
      initial frame.  At that time, if reverse-colors option was
      specified in default-frame-alist, it was already applied, and
-     frame colors are reversed.  We need to account for that.  */
-  if (EQ (Fcdr (Fassq (Qreverse, f->param_alist)), Qt))
-    {
-      initial_screen_colors[0] = FRAME_BACKGROUND_PIXEL (f);
-      initial_screen_colors[1] = FRAME_FOREGROUND_PIXEL (f);
-    }
-  else
-    {
+     frame colors are reversed.  */
       initial_screen_colors[0] = FRAME_FOREGROUND_PIXEL (f);
       initial_screen_colors[1] = FRAME_BACKGROUND_PIXEL (f);
-    }
 }
 
 void
@@ -2233,6 +2225,7 @@
     {
       FRAME_FOREGROUND_PIXEL (f) = initial_screen_colors[0];
       FRAME_BACKGROUND_PIXEL (f) = initial_screen_colors[1];
+      init_frame_faces (f);
     }
   orig_fg = FRAME_FOREGROUND_PIXEL (f);
   orig_bg = FRAME_BACKGROUND_PIXEL (f);
@@ -2297,19 +2290,9 @@
              /* Make sure the foreground of the default face for this
                 frame is changed as well.  */
              XSETFRAME (frame, f);
-             if (need_to_reverse)
-               {
-                 Finternal_set_lisp_face_attribute (Qdefault, QCbackground,
-                                                    val, frame);
-                 prop = Qbackground_color;
-                 bg_set = 1;
-               }
-             else
-               {
                  Finternal_set_lisp_face_attribute (Qdefault, QCforeground,
                                                     val, frame);
                  fg_set = 1;
-               }
              redraw = 1;
              if (tty->termscript)
                fprintf (tty->termscript, "<FGCOLOR %lu>\n", new_color);
@@ -2328,19 +2311,9 @@
              /* Make sure the background of the default face for this
                 frame is changed as well.  */
              XSETFRAME (frame, f);
-             if (need_to_reverse)
-               {
-                 Finternal_set_lisp_face_attribute (Qdefault, QCforeground,
-                                                    val, frame);
-                 prop = Qforeground_color;
-                 fg_set = 1;
-               }
-             else
-               {
                  Finternal_set_lisp_face_attribute (Qdefault, QCbackground,
                                                     val, frame);
                  bg_set = 1;
-               }
              redraw = 1;
              if (tty->termscript)
                fprintf (tty->termscript, "<BGCOLOR %lu>\n", new_color);
@@ -2439,6 +2412,8 @@
     }
 
   tty = FRAME_TTY (sf);
+  current_kboard->Vwindow_system = Qpc;
+  sf->output_method = output_msdos_raw;
   if (init_needed)
     {
       if (!tty->termscript && getenv ("EMACSTEST"))
@@ -2511,11 +2486,9 @@
        fprintf (tty->termscript, "<SCREEN SAVED (dimensions=%dx%d)>\n",
                 screen_size_X, screen_size_Y);
 
+      init_frame_faces (sf);
       init_needed = 0;
     }
-  current_kboard->Vwindow_system = Qpc;
-  sf->output_method = output_msdos_raw;
-  init_frame_faces (sf);
 #endif
 }