Merged from miles@gnu.org--gnu-2005 (patch 438-440)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-438
   Rename vertical-divider face to vertical-border

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-439
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-440
   Change escape-glyph color on dark backgrounds back to cyan

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-353

8 files changed, 47 insertions, 16 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a6532912246..659f1066efc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,27 @@
+2005-06-22  Miles Bader  <miles@gnu.org>
+
+        * xfaces.c (Qvertical_border): Renamed from `Qvertical_divider'.
+        (realize_basic_faces, syms_of_xfaces): Update references to it.
+        * dispextern.h (enum face_id): Rename `VERTICAL_DIVIDER_FACE_ID'
+        to `VERTICAL_BORDER_FACE_ID'.
+        * dispnew.c (build_frame_matrix_from_leaf_window): Update references.
+
+2005-06-21  Juri Linkov  <juri@jurta.org>
+
+        * dispextern.h: Add extern Qframe_set_background_mode.
+
+        * xfaces.c: Rename obsolete function Qframe_update_face_colors to
+        Qframe_set_background_mode.
+
+        * frame.c (Fmodify_frame_parameters):
+        Call frame-set-background-mode after changing the background color
+        on non-window non-dos branch.
+
+2005-06-21  Juanma Barranquero  <lekktu@gmail.com>
+
+        * fns.c (Fchar_table_range):
+        * process.c (Fmake_network_process): Fix spellings.
+
 2005-06-20  Kim F. Storm  <storm@cua.dk>
 
         * fns.c (Fsort): Doc fix.
diff --git a/src/dispextern.h b/src/dispextern.h
index 5219a6e924f..3fb4f76a61f 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1588,7 +1588,7 @@ enum face_id
   CURSOR_FACE_ID,
   MOUSE_FACE_ID,
   MENU_FACE_ID,
-  VERTICAL_DIVIDER_FACE_ID,
+  VERTICAL_BORDER_FACE_ID,
   BASIC_FACE_ID_SENTINEL
 };
 
@@ -2786,6 +2786,7 @@ int merge_faces P_ ((struct frame *, Lisp_Object, int, int));
 int compute_char_face P_ ((struct frame *, int, Lisp_Object));
 void free_all_realized_faces P_ ((Lisp_Object));
 extern Lisp_Object Qforeground_color, Qbackground_color;
+extern Lisp_Object Qframe_set_background_mode;
 extern char unspecified_fg[], unspecified_bg[];
 void free_realized_multibyte_face P_ ((struct frame *, int));
 
diff --git a/src/dispnew.c b/src/dispnew.c
index 307e3c5f010..c5256142588 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -2716,7 +2716,7 @@ build_frame_matrix_from_leaf_window (frame_matrix, w)
 
           if (FAST_GLYPH_FACE (right_border_glyph) <= 0)
             right_border_glyph
-              = FAST_MAKE_GLYPH (right_border_glyph, VERTICAL_DIVIDER_FACE_ID);
+              = FAST_MAKE_GLYPH (right_border_glyph, VERTICAL_BORDER_FACE_ID);
         }
     }
   else
diff --git a/src/fns.c b/src/fns.c
index 792f94189d1..7365aa05e79 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2546,7 +2546,7 @@ RANGE should be nil (for the default value),
 a vector which identifies a character set or a row of a character set,
 a character set name, or a character code.
 If the characters in the specified range have different values,
-an error is signalled.
+an error is signaled.
 
 Note that this function doesn't check the parent of CHAR-TABLE.  */)
      (char_table, range)
diff --git a/src/frame.c b/src/frame.c
index 10318ba7110..62dba4d4d15 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2548,6 +2548,12 @@ enabled such bindings for that variable with `make-variable-frame-local'.  */)
           prop = parms[i];
           val = values[i];
           store_frame_param (f, prop, val);
+
+          /* Changing the background color might change the background
+             mode, so that we have to load new defface specs.
+             Call frame-set-background-mode to do that.  */
+          if (EQ (prop, Qbackground_color))
+            call1 (Qframe_set_background_mode, frame);
         }
     }
 
diff --git a/src/process.c b/src/process.c
index dd13138e273..46808674a0d 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2552,7 +2552,7 @@ DEFUN ("make-network-process", Fmake_network_process, Smake_network_process,
 In Emacs, network connections are represented by process objects, so
 input and output work as for subprocesses and `delete-process' closes
 a network connection.  However, a network process has no process id,
-it cannot be signalled, and the status codes are different from normal
+it cannot be signaled, and the status codes are different from normal
 processes.
 
 Arguments are specified as keyword/argument pairs.  The following
diff --git a/src/window.c b/src/window.c
index 5bfff27f976..df284420ddf 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4182,7 +4182,7 @@ enlarge_window (window, delta, widthflag, preserve_before)
 
              The number of children n equals the number of resizable
              children of this window + 1 because we know window itself
-             is resizable (otherwise we would have signalled an error.  */
+             is resizable (otherwise we would have signalled an error).  */
 
           struct window *w = XWINDOW (window);
           Lisp_Object s;
diff --git a/src/xfaces.c b/src/xfaces.c
index 2494e1e1837..78dc41116e4 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -319,15 +319,15 @@ Lisp_Object Qunspecified;
 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.  */
+   has changed, frame_set_background_mode.  */
 
-Lisp_Object Qframe_update_face_colors;
+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 @@ update_face_from_frame_parameter (f, param, new_value)
       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_basic_faces (f)
       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 @@ syms_of_xfaces ()
   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 @@ syms_of_xfaces ()
   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");