Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-78

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-719
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-732
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-733
   Update from CVS: man/calc.texi: Fix some TeX definitions.

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-734
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-75
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-76
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-77
   Update from CVS

diff --cc etc/NEWS
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/bindings.el
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/files.el
Simple merge

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

diff --cc lisp/isearch.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/term.el
Simple merge

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

diff --cc src/ChangeLog
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/indent.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/syntax.c
Simple merge

diff --cc src/w32term.c
Simple merge

diff --cc src/xdisp.c
index c50edb9856171d0b5a0e599bc58ab8e04c809c8f,b27b5e2e744d6f0b27fc953f0aeb7ff7d7b18e4a..ba6ee253d7923018b51c3e9ac2e8976134e29473
--- 1/src/xdisp.c
--- 2/src/xdisp.c
+++ b/src/xdisp.c
@@@ -5043,30 -4971,26 +5063,30 @@@ get_next_display_element (it
                      && GLYPH_CHAR_VALID_P (XFASTINT (DISP_ESCAPE_GLYPH (it->dp))))
                    escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp));
                  else
-                   escape_glyph = FAST_MAKE_GLYPH ('\\', 0);
+                   escape_glyph = FAST_MAKE_GLYPH ('\\', face_id);
  
 -                if (SINGLE_BYTE_CHAR_P (it->c))
 -                  str[0] = it->c, len = 1;
 +                if (CHAR_BYTE8_P (it->c))
 +                  {
 +                    str[0] = CHAR_TO_BYTE8 (it->c);
 +                    len = 1;
 +                  }
 +                else if (it->c < 256)
 +                  {
 +                    str[0] = it->c;
 +                    len = 1;
 +                  }
                  else
                    {
 -                    len = CHAR_STRING_NO_SIGNAL (it->c, str);
 -                    if (len < 0)
 -                      {
 -                        /* It's an invalid character, which
 -                           shouldn't happen actually, but due to
 -                           bugs it may happen.  Let's print the char
 -                           as is, there's not much meaningful we can
 -                           do with it.  */
 -                        str[0] = it->c;
 -                        str[1] = it->c >> 8;
 -                        str[2] = it->c >> 16;
 -                        str[3] = it->c >> 24;
 -                        len = 4;
 -                      }
 +                    /* It's an invalid character, which
 +                       shouldn't happen actually, but due to
 +                       bugs it may happen.  Let's print the char
 +                       as is, there's not much meaningful we can
 +                       do with it.  */
 +                    str[0] = it->c;
 +                    str[1] = it->c >> 8;
 +                    str[2] = it->c >> 16;
 +                    str[3] = it->c >> 24;
 +                    len = 4;
                    }
  
                  for (i = 0; i < len; i++)

diff --cc src/xterm.c
Simple merge