Merged from miles@gnu.org--gnu-2005 (patch 423-434)

Patches applied:

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-425
   Remove "-face" suffix from gnus faces

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-428
   Remove "-face" suffix from MH-E faces

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-430
   Remove "-face" suffix from cc-mode faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-431
   Remove "-face" suffix from eshell faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
   Remove "-face" suffix from ediff faces

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

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

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

8 files changed, 107 insertions, 26 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 46cab9c1cba..12e52237e9b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,30 @@
+2005-06-17  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (get_next_display_element): Reverse
+        test of Vshow_nonbreak_escape.
+
+        * 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.
+        (build_frame_matrix_from_leaf_window): Use it.
+
+        * dispextern.h (spec_glyph_lookup_face): Add declaration.
+
+        * buffer.c (syms_of_buffer) <cursor-type>: Doc fix.
+
+2005-06-12  Richard M. Stallman  <rms@gnu.org>
+
+        * keyboard.c (read_char): After catching a longjmp,
+        call restore_getcjmp.
+
+2005-06-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * xselect.c (lisp_data_to_selection_data): Fix spelling.
+
 2005-06-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macterm.c (mac_compute_glyph_string_overhangs): Don't set
@@ -101,7 +128,6 @@
 
         * xdisp.c (note_mode_line_or_margin_highlight): Call clear_mouse_face
         when mouse_face is not given.
-        Remove unnecessary tabs.
 
 2005-06-09  Luc Teirlinck  <teirllm@auburn.edu>
 
diff --git a/src/buffer.c b/src/buffer.c
index a287e45df78..ed05daf77ec 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5934,8 +5934,8 @@ Values are interpreted as follows:
   hollow         display a hollow box cursor
   bar            display a vertical bar cursor with default width
   (bar . WIDTH)  display a vertical bar cursor with width WIDTH
-  hbar           display a horizontal bar cursor with default width
-  (hbar . WIDTH) display a horizontal bar cursor with width WIDTH
+  hbar           display a horizontal bar cursor with default height
+  (hbar . HEIGHT) display a horizontal bar cursor with height HEIGHT
   ANYTHING ELSE  display a hollow box cursor.
 
 When the buffer is displayed in a nonselected window,
diff --git a/src/dispextern.h b/src/dispextern.h
index df6bbd00eec..8648303af8c 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -366,7 +366,8 @@ struct glyph
 
 #define FACE_ID_BITS    21
 
-  /* Face of the glyph.  */
+  /* Face of the glyph.  This is a realized face ID,
+     an index in the face cache of the frame.  */
   unsigned face_id : FACE_ID_BITS;
 
   /* Type of font used to display the character glyph.  May be used to
@@ -2903,6 +2904,7 @@ Lisp_Object sit_for P_ ((int, int, int, int, int));
 void init_display P_ ((void));
 void syms_of_display P_ ((void));
 extern Lisp_Object Qredisplay_dont_pause;
+GLYPH spec_glyph_lookup_face P_ ((struct window *, GLYPH));
 
 /* Defined in term.c */
 
diff --git a/src/dispnew.c b/src/dispnew.c
index b0e9944868b..30897a7a78f 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -2711,6 +2711,7 @@ build_frame_matrix_from_leaf_window (frame_matrix, 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);
         }
     }
   else
@@ -2791,6 +2792,27 @@ build_frame_matrix_from_leaf_window (frame_matrix, w)
     }
 }
 
+/* Given a user-specified glyph, possibly including a Lisp-level face
+   ID, return a glyph that has a realized face ID.
+   This is used for glyphs displayed specially and not part of the text;
+   for instance, vertical separators, truncation markers, etc.  */
+
+GLYPH
+spec_glyph_lookup_face (w, glyph)
+     struct window *w;
+     GLYPH glyph;
+{
+  int lface_id = FAST_GLYPH_FACE (glyph);
+  /* Convert the glyph's specified face to a realized (cache) face.  */
+  if (lface_id > 0)
+    {
+      int face_id = merge_faces (XFRAME (w->frame),
+                                 Qt, lface_id, DEFAULT_FACE_ID);
+      glyph
+        = FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (glyph), face_id);
+    }
+  return glyph;
+}
 
 /* Add spaces to a glyph row ROW in a window matrix.
 
diff --git a/src/keyboard.c b/src/keyboard.c
index 135c3313a7b..7f81dde35c7 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2610,6 +2610,9 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
 
   if (_setjmp (local_getcjmp))
     {
+      /* We must have saved the outer value of getcjmp here,
+         so restore it now.  */
+      restore_getcjmp (save_jump);
       XSETINT (c, quit_char);
       internal_last_event_frame = selected_frame;
       Vlast_event_frame = internal_last_event_frame;
diff --git a/src/term.c b/src/term.c
index 8aa3b3969ee..774373e82f9 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1695,6 +1695,7 @@ produce_special_glyphs (it, what)
      enum display_element_type what;
 {
   struct it temp_it;
+  GLYPH glyph;
 
   temp_it = *it;
   temp_it.dp = NULL;
@@ -1710,15 +1711,11 @@ produce_special_glyphs (it, what)
           && INTEGERP (DISP_CONTINUE_GLYPH (it->dp))
           && GLYPH_CHAR_VALID_P (XINT (DISP_CONTINUE_GLYPH (it->dp))))
         {
-          temp_it.c = FAST_GLYPH_CHAR (XINT (DISP_CONTINUE_GLYPH (it->dp)));
-          temp_it.len = CHAR_BYTES (temp_it.c);
+          glyph = XINT (DISP_CONTINUE_GLYPH (it->dp));
+          glyph = spec_glyph_lookup_face (XWINDOW (it->window), glyph);
         }
       else
-        temp_it.c = '\\';
-
-      produce_glyphs (&temp_it);
-      it->pixel_width = temp_it.pixel_width;
-      it->nglyphs = temp_it.pixel_width;
+        glyph = '\\';
     }
   else if (what == IT_TRUNCATION)
     {
@@ -1727,18 +1724,22 @@ produce_special_glyphs (it, what)
           && INTEGERP (DISP_TRUNC_GLYPH (it->dp))
           && GLYPH_CHAR_VALID_P (XINT (DISP_TRUNC_GLYPH (it->dp))))
         {
-          temp_it.c = FAST_GLYPH_CHAR (XINT (DISP_TRUNC_GLYPH (it->dp)));
-          temp_it.len = CHAR_BYTES (temp_it.c);
+          glyph = XINT (DISP_TRUNC_GLYPH (it->dp));
+          glyph = spec_glyph_lookup_face (XWINDOW (it->window), glyph);
         }
       else
-        temp_it.c = '$';
-
-      produce_glyphs (&temp_it);
-      it->pixel_width = temp_it.pixel_width;
-      it->nglyphs = temp_it.pixel_width;
+        glyph = '$';
     }
   else
     abort ();
+
+  temp_it.c = FAST_GLYPH_CHAR (glyph);
+  temp_it.face_id = FAST_GLYPH_FACE (glyph);
+  temp_it.len = CHAR_BYTES (temp_it.c);
+
+  produce_glyphs (&temp_it);
+  it->pixel_width = temp_it.pixel_width;
+  it->nglyphs = temp_it.pixel_width;
 }
 
 
@@ -1757,7 +1758,8 @@ produce_special_glyphs (it, what)
    ? (tty->TN_no_color_video & (ATTR)) == 0             \
    : 1)
 
-/* Turn appearances of face FACE_ID on tty frame F on.  */
+/* Turn appearances of face FACE_ID on tty frame F on.
+   FACE_ID is a realized face ID number, in the face cache.  */
 
 static void
 turn_on_face (f, face_id)
@@ -2195,7 +2197,7 @@ DEFUN ("display-name", Fdisplay_name, Sdisplay_name, 0, 1, 0,
        doc: /* Return the name of the device that DISPLAY uses.
 It is not guaranteed that the returned value is unique among opened displays.
 
-DISPLAY can be a display, a frame, or nil (meaning the selected
+DISPLAY may be a display, a frame, or nil (meaning the selected
 frame's display). */)
   (display)
      Lisp_Object display;
@@ -2209,7 +2211,10 @@ frame's display). */)
 }
 
 DEFUN ("display-tty-type", Fdisplay_tty_type, Sdisplay_tty_type, 0, 1, 0,
-       doc: /* Return the type of the TTY device that DISPLAY uses. */)
+       doc: /* Return the type of the TTY device that DISPLAY uses.
+
+DISPLAY may be a display, a frame, or nil (meaning the selected
+frame's display).  */)
   (display)
      Lisp_Object display;
 {
@@ -2225,7 +2230,10 @@ DEFUN ("display-tty-type", Fdisplay_tty_type, Sdisplay_tty_type, 0, 1, 0,
 }
 
 DEFUN ("display-controlling-tty-p", Fdisplay_controlling_tty_p, Sdisplay_controlling_tty_p, 0, 1, 0,
-       doc: /* Return non-nil if DISPLAY is on the controlling tty of the Emacs process. */)
+       doc: /* Return non-nil if DISPLAY is on the controlling tty of the Emacs process.
+
+DISPLAY may be a display, a frame, or nil (meaning the selected
+frame's display).  */)
   (display)
      Lisp_Object display;
 {
@@ -2237,6 +2245,25 @@ DEFUN ("display-controlling-tty-p", Fdisplay_controlling_tty_p, Sdisplay_control
     return Qt;
 }
 
+DEFUN ("tty-no-underline", Ftty_no_underline, Stty_no_underline, 0, 1, 0,
+       doc: /* Declare that the tty used by DISPLAY does not handle underlining.
+This is used to override the terminfo data, for certain terminals that
+do not really do underlining, but say that they do.  This function has
+no effect if used on a non-tty display.
+
+DISPLAY may be a display, a frame, or nil (meaning the selected
+frame's display).  */)
+  (display)
+     Lisp_Object display;
+{
+  struct display *d = get_display (display, 1);
+
+  if (d->type == output_termcap)
+    d->display_info.tty->TS_enter_underline_mode = 0;
+  return Qnil;
+}
+
+
 
 /***********************************************************************
                             Initialization
@@ -3384,6 +3411,7 @@ See `resume-tty'.  */);
 
   defsubr (&Stty_display_color_p);
   defsubr (&Stty_display_color_cells);
+  defsubr (&Stty_no_underline);
   defsubr (&Sdisplay_name);
   defsubr (&Sdisplay_tty_type);
   defsubr (&Sdisplay_controlling_tty_p);
diff --git a/src/xdisp.c b/src/xdisp.c
index a7ce6159a01..6c11440dd1a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5139,7 +5139,7 @@ get_next_display_element (it)
               /* Handle non-break space in the mode where it only gets
                  highlighting.  */
 
-              if (! EQ (Vshow_nonbreak_escape, Qt)
+              if (EQ (Vshow_nonbreak_escape, Qt)
                   && (it->c == 0x8a0 || it->c == 0x920
                       || it->c == 0xe20 || it->c == 0xf20))
                 {
diff --git a/src/xselect.c b/src/xselect.c
index 5a899cfa389..7a1ceaabbb0 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2048,7 +2048,7 @@ lisp_data_to_selection_data (display, obj,
 
           /* Use sizeof(long) even if it is more than 32 bits.  See comment
              in x_get_window_property and x_fill_property_data.  */
-          
+
           if (*format_ret == 32) data_size = sizeof(long);
           *data_ret = (unsigned char *) xmalloc (*size_ret * data_size);
           for (i = 0; i < *size_ret; i++)
@@ -2062,7 +2062,7 @@ lisp_data_to_selection_data (display, obj,
     }
   else
     Fsignal (Qerror, /* Qselection_error */
-             Fcons (build_string ("unrecognised selection data"),
+             Fcons (build_string ("unrecognized selection data"),
                     Fcons (obj, Qnil)));
 
   *type_ret = symbol_to_x_atom (dpyinfo, display, type);
@@ -2864,7 +2864,7 @@ are ignored.  */)
      when sending to the root window.  */
   event.xclient.window = to_root ? FRAME_OUTER_WINDOW (f) : wdest;
 
-  
+
   memset (event.xclient.data.b, 0, sizeof (event.xclient.data.b));
   x_fill_property_data (dpyinfo->display, values, event.xclient.data.b,
                         event.xclient.format);