Merged from miles@gnu.org--gnu-2005 (patch 435-437)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
   Implement tty vertical-divider face

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

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

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

5 files changed, 31 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 12e52237e9b..a6532912246 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2005-06-20  Kim F. Storm  <storm@cua.dk>
+
+        * fns.c (Fsort): Doc fix.
+
+2005-06-20  Miles Bader  <miles@gnu.org>
+
+        * xfaces.c (Qvertical_divider): New variable.
+        (realize_basic_faces): Realize its face.
+        (syms_of_xfaces): Initialize it.
+
+        * dispextern.h (enum face_id): Add `VERTICAL_DIVIDER_FACE_ID'.
+
+        * dispnew.c (build_frame_matrix_from_leaf_window): Display vertical
+        window-separator on ttys using `vertical-divider' face by default.
+
 2005-06-17  Richard M. Stallman  <rms@gnu.org>
 
         * xdisp.c (get_next_display_element): Reverse
@@ -6,7 +21,7 @@
         * term.c (produce_special_glyphs): Use spec_glyph_lookup_face.
         (Ftty_no_underline): New function.
         (syms_of_term): defsubr it.
-        
+
         * keyboard.c (read_char): Call restore_getcjmp after jump occurs.
 
         * dispnew.c (spec_glyph_lookup_face): New function.
diff --git a/src/dispextern.h b/src/dispextern.h
index 8648303af8c..5219a6e924f 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1588,6 +1588,7 @@ enum face_id
   CURSOR_FACE_ID,
   MOUSE_FACE_ID,
   MENU_FACE_ID,
+  VERTICAL_DIVIDER_FACE_ID,
   BASIC_FACE_ID_SENTINEL
 };
 
diff --git a/src/dispnew.c b/src/dispnew.c
index 30897a7a78f..307e3c5f010 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -2708,10 +2708,15 @@ build_frame_matrix_from_leaf_window (frame_matrix, w)
       if (!WINDOW_RIGHTMOST_P (w))
         {
           struct Lisp_Char_Table *dp = window_display_table (w);
-          right_border_glyph = (dp && INTEGERP (DISP_BORDER_GLYPH (dp))
-                                ? XINT (DISP_BORDER_GLYPH (dp))
-                                : '|');
-          right_border_glyph = spec_glyph_lookup_face (w, right_border_glyph);
+
+          right_border_glyph
+            = ((dp && INTEGERP (DISP_BORDER_GLYPH (dp)))
+               ? spec_glyph_lookup_face (w, XINT (DISP_BORDER_GLYPH (dp)))
+               : '|');
+
+          if (FAST_GLYPH_FACE (right_border_glyph) <= 0)
+            right_border_glyph
+              = FAST_MAKE_GLYPH (right_border_glyph, VERTICAL_DIVIDER_FACE_ID);
         }
     }
   else
diff --git a/src/fns.c b/src/fns.c
index a36789b4a92..792f94189d1 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1892,7 +1892,7 @@ Lisp_Object merge ();
 DEFUN ("sort", Fsort, Ssort, 2, 2, 0,
        doc: /* Sort LIST, stably, comparing elements using PREDICATE.
 Returns the sorted list.  LIST is modified by side effects.
-PREDICATE is called with two elements of LIST, and should return t
+PREDICATE is called with two elements of LIST, and should return non-nil
 if the first element is "less" than the second.  */)
      (list, predicate)
      Lisp_Object list, predicate;
diff --git a/src/xfaces.c b/src/xfaces.c
index f55ee7a901f..2494e1e1837 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -327,7 +327,7 @@ Lisp_Object Qframe_update_face_colors;
 
 Lisp_Object Qdefault, Qtool_bar, Qregion, Qfringe;
 Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu;
-Lisp_Object Qmode_line_inactive;
+Lisp_Object Qmode_line_inactive, Qvertical_divider;
 extern Lisp_Object Qmode_line;
 
 /* The symbol `face-alias'.  A symbols having that property is an
@@ -6899,6 +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);
 
       /* Reflect changes in the `menu' face in menu bars.  */
       if (FRAME_FACE_CACHE (f)->menu_face_changed_p)
@@ -8034,6 +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);
   Qtty_color_desc = intern ("tty-color-desc");
   staticpro (&Qtty_color_desc);
   Qtty_color_standard_values = intern ("tty-color-standard-values");