Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-65

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 425-445)

   - Remove "-face" suffix from gnus faces
   - Update from CVS
   - Remove "-face" suffix from MH-E faces
   - Remove "-face" suffix from cc-mode faces
   - Remove "-face" suffix from eshell faces
   - Remove "-face" suffix from ediff faces
   - Implement tty vertical-divider face
   - Rename vertical-divider face to vertical-border
   - Change escape-glyph color on dark backgrounds back to cyan
   - Update reference to renamed Buffer-menu-buffer face

diff --cc etc/NEWS
Simple merge

diff --cc etc/TODO
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/bindings.el
Simple merge

diff --cc lisp/emacs-lisp/byte-opt.el
Simple merge

diff --cc lisp/emacs-lisp/regexp-opt.el
Simple merge

diff --cc lisp/eshell/esh-mode.el
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/font-lock.el
Simple merge

diff --cc lisp/gnus/message.el
Simple merge

diff --cc lisp/language/ethio-util.el
Simple merge

diff --cc lisp/mail/sendmail.el
Simple merge

diff --cc lisp/progmodes/gdb-ui.el
Simple merge

diff --cc lisp/ps-print.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/term.el
Simple merge

diff --cc lisp/textmodes/sgml-mode.el
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/abbrev.c
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/category.c
Simple merge

diff --cc src/dispextern.h
index 0ce8c612e9c0a59d0b79102eed22716c9b09a32d,2c70de31436c0254f1e7ead6b90d8d9dc6967705..cd8488830f0dd1e319b66c760c034fbcfcd62556
--- 1/src/dispextern.h
--- 2/src/dispextern.h
+++ b/src/dispextern.h
@@@ -2790,11 -2794,10 +2792,12 @@@ int face_at_string_position P_ ((struc
  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));
 +void free_realized_face P_ ((struct frame *, struct face *));
  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));
 +extern Lisp_Object split_font_name_into_vector P_ ((Lisp_Object));
 +extern Lisp_Object build_font_name_from_vector P_ ((Lisp_Object));
  
  /* Defined in xfns.c  */
  

diff --cc src/dispnew.c
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lread.c
index 439b7e0b24c814b1d9f02315f76e44cbddb187f8,9317933013ee54ad52aaea25fd6dbd33e6b93c50..d180836ada35cce51aa6ef7a178d94354af7427d
--- 1/src/lread.c
--- 2/src/lread.c
+++ b/src/lread.c
@@@ -2985,9 -2865,9 +2985,9 @@@ read_vector (readcharfun, bytecodeflag
                  STRING_SET_CHARS (bytestr, SBYTES (bytestr));
                  STRING_SET_UNIBYTE (bytestr);
  
 -                item = Fread (bytestr);
 +                item = Fread (Fcons (bytestr, readcharfun));
                  if (!CONSP (item))
-                   error ("invalid byte code");
+                   error ("Invalid byte code");
  
                  otem = XCONS (item);
                  bytestr = XCAR (item);

diff --cc src/macfns.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/search.c
Simple merge

diff --cc src/syntax.c
Simple merge

diff --cc src/term.c
Simple merge

diff --cc src/w32fns.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
index 71fa930a4c61daf4151cea511439da41387453f2,1bb2b4292c02f27b23e752c80068fe6386a7901b..b5f69a93810db5ca520e6a0d05255f08707a96cb
--- 1/src/xdisp.c
--- 2/src/xdisp.c
+++ b/src/xdisp.c
@@@ -5183,19 -5088,23 +5183,19 @@@ get_next_display_element (it
             don't have corresponding multibyte char code are also
             translated to octal form.  */
          else if ((it->c < ' '
 -                  && (it->area != TEXT_AREA
 -                      /* In mode line, treat \n like other crl chars.  */
 -                      || (it->c != '\t'
 -                          && it->glyph_row && it->glyph_row->mode_line_p)
 -                      || (it->c != '\n' && it->c != '\t')))
 -                 || (it->multibyte_p
 -                     ? ((it->c >= 127
 -                         && it->len == 1)
 -                        || !CHAR_PRINTABLE_P (it->c)
 +                  ? (it->area != TEXT_AREA
 +                     /* In mode line, treat \n, \t like other crl chars.  */
 +                     || (it->c != '\t'
 +                         && it->glyph_row && it->glyph_row->mode_line_p)
 +                     || (it->c != '\n' && it->c != '\t'))
 +                  : (it->multibyte_p
 +                     ? (!CHAR_PRINTABLE_P (it->c)
-                         || (!NILP (Vshow_nonbreak_escape)
+                         || (!NILP (Vnobreak_char_display)
 -                            && (it->c == 0x8a0 || it->c == 0x8ad
 -                                || it->c == 0x920 || it->c == 0x92d
 -                                || it->c == 0xe20 || it->c == 0xe2d
 -                                || it->c == 0xf20 || it->c == 0xf2d)))
 +                            && (it->c == 0xA0 /* NO-BREAK SPACE */
 +                                || it->c == 0xAD /* SOFT HYPHEN */)))
                       : (it->c >= 127
 -                        && (!unibyte_display_via_language_environment
 -                            || it->c == unibyte_char_to_multibyte (it->c)))))
 +                        && (! unibyte_display_via_language_environment
 +                            || (UNIBYTE_CHAR_HAS_MULTIBYTE_P (it->c)))))))
            {
              /* IT->c is a control character which must be displayed
                 either as '\003' or as `^C' where the '\\' and '^'
@@@ -5243,11 -5152,12 +5243,11 @@@
              /* Handle non-break space in the mode where it only gets
                 highlighting.  */
  
-             if (! EQ (Vshow_nonbreak_escape, Qt)
+             if (EQ (Vnobreak_char_display, Qt)
 -                && (it->c == 0x8a0 || it->c == 0x920
 -                    || it->c == 0xe20 || it->c == 0xf20))
 +                && it->c == 0xA0)
                {
                  /* Merge the no-break-space face into the current face.  */
-                 face_id = merge_faces (it->f, Qno_break_space, 0,
+                 face_id = merge_faces (it->f, Qnobreak_space, 0,
                                         it->face_id);
  
                  g = it->c = ' ';
@@@ -5286,8 -5196,9 +5286,8 @@@
              /* Handle soft hyphens in the mode where they only get
                 highlighting.  */
  
-             if (! EQ (Vshow_nonbreak_escape, Qt)
+             if (EQ (Vnobreak_char_display, Qt)
 -                && (it->c == 0x8ad || it->c == 0x92d
 -                    || it->c == 0xe2d || it->c == 0xf2d))
 +                && it->c == 0xAD)
                {
                  g = it->c = '-';
                  XSETINT (it->ctl_chars[0], g);

diff --cc src/xfaces.c
index 25d11c066b054daabd56db323cc6e8f716dc218b,d058bb4f4064cbbe2a93ac98e91f2b1e09ef18c3..62e33c050de8f574211df035e6464b2a18977dd7
--- 1/src/xfaces.c
--- 2/src/xfaces.c
+++ b/src/xfaces.c
@@@ -6057,11 -5909,10 +6057,11 @@@ x_supports_face_attributes_p (f, attrs
  
        merge_face_vectors (f, attrs, merged_attrs, 0);
  
 -      face = FACE_FROM_ID (f, lookup_face (f, merged_attrs, 0, 0));
 +      face_id = lookup_face (f, merged_attrs);
 +      face = FACE_FROM_ID (f, face_id);
  
        if (! face)
-       error ("cannot make face");
+       error ("Cannot make face");
  
        /* If the font is the same, then not supported.  */
        if (face->font == def_face->font)