diff src/xfaces.c @ 83313:bdcbdec78dd3

Merged from [e-mail]--gnu-2005 (patch 438-440) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-438 Rename vertical-divider face to vertical-border * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-439 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-440 Change escape-glyph color on dark backgrounds back to cyan git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-353

--- a/src/xfaces.c	Tue Jun 21 15:45:30 2005 +0000
+++ b/src/xfaces.c	Wed Jun 22 17:53:21 2005 +0000
@@ -319,15 +319,15 @@
 char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg";
 
 /* The name of the function to call when the background of the frame
-   has changed, frame_update_face_colors.  */
-
-Lisp_Object Qframe_update_face_colors;
+   has changed, frame_set_background_mode.  */
+
+Lisp_Object Qframe_set_background_mode;
 
 /* Names of basic faces.  */
 
 Lisp_Object Qdefault, Qtool_bar, Qregion, Qfringe;
 Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu;
-Lisp_Object Qmode_line_inactive, Qvertical_divider;
+Lisp_Object Qmode_line_inactive, Qvertical_border;
 extern Lisp_Object Qmode_line;
 
 /* The symbol `face-alias'.  A symbols having that property is an
@@ -4526,10 +4526,10 @@
       Lisp_Object frame;
 
       /* Changing the background color might change the background
-	 mode, so that we have to load new defface specs.  Call
-	 frame-update-face-colors to do that.  */
+	 mode, so that we have to load new defface specs.
+	 Call frame-set-background-mode to do that.  */
       XSETFRAME (frame, f);
-      call1 (Qframe_update_face_colors, frame);
+      call1 (Qframe_set_background_mode, frame);
 
       face = Qdefault;
       lface = lface_from_face_name (f, face, 1);
@@ -6899,7 +6899,7 @@
       realize_named_face (f, Qcursor, CURSOR_FACE_ID);
       realize_named_face (f, Qmouse, MOUSE_FACE_ID);
       realize_named_face (f, Qmenu, MENU_FACE_ID);
-      realize_named_face (f, Qvertical_divider, VERTICAL_DIVIDER_FACE_ID);
+      realize_named_face (f, Qvertical_border, VERTICAL_BORDER_FACE_ID);
 
       /* Reflect changes in the `menu' face in menu bars.  */
       if (FRAME_FACE_CACHE (f)->menu_face_changed_p)
@@ -7910,8 +7910,8 @@
   staticpro (&Qface_no_inherit);
   Qbitmap_spec_p = intern ("bitmap-spec-p");
   staticpro (&Qbitmap_spec_p);
-  Qframe_update_face_colors = intern ("frame-update-face-colors");
-  staticpro (&Qframe_update_face_colors);
+  Qframe_set_background_mode = intern ("frame-set-background-mode");
+  staticpro (&Qframe_set_background_mode);
 
   /* Lisp face attribute keywords.  */
   QCfamily = intern (":family");
@@ -8035,8 +8035,8 @@
   staticpro (&Qmouse);
   Qmode_line_inactive = intern ("mode-line-inactive");
   staticpro (&Qmode_line_inactive);
-  Qvertical_divider = intern ("vertical-divider");
-  staticpro (&Qvertical_divider);
+  Qvertical_border = intern ("vertical-border");
+  staticpro (&Qvertical_border);
   Qtty_color_desc = intern ("tty-color-desc");
   staticpro (&Qtty_color_desc);
   Qtty_color_standard_values = intern ("tty-color-standard-values");