Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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


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

3 files changed, 55 insertions, 13 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 28030aef0e3..38a079989be 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2004-12-08  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (get_next_display_element): Use `escape-glyph' for
+        control chars and escaped octal codes.
+        (Qescape_glyph): New variable.
+        (syms_of_xdisp): Initialize it.
+        (escape_glyph_face): New variable.
+        (redisplay_window): Initialize it.
+
+2004-12-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * image.c (our_fill_input_buffer, jpeg_load, CHECK_LIB_AVAILABLE)
+        (init_image): Use 1 rather than TRUE.  TRUE's not always defined.
+
 2004-12-07  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * emacs.c (Fdump_emacs): Add ! defined (SYSTEM_MALLOC) around
diff --git a/src/image.c b/src/image.c
index d1925cf36e4..18ffc2db3a4 100644
--- a/src/image.c
+++ b/src/image.c
@@ -6378,7 +6378,7 @@ our_fill_input_buffer (cinfo)
 
   src->next_input_byte = buffer;
   src->bytes_in_buffer = 2;
-  return TRUE;
+  return 1;
 }
 
 
@@ -6533,11 +6533,11 @@ jpeg_load (f, img)
     jpeg_memory_src (&cinfo, SDATA (specified_data),
                      SBYTES (specified_data));
 
-  fn_jpeg_read_header (&cinfo, TRUE);
+  fn_jpeg_read_header (&cinfo, 1);
 
   /* Customize decompression so that color quantization will be used.
          Start decompression.  */
-  cinfo.quantize_colors = TRUE;
+  cinfo.quantize_colors = 1;
   fn_jpeg_start_decompress (&cinfo);
   width = img->width = cinfo.output_width;
   height = img->height = cinfo.output_height;
@@ -7552,7 +7552,7 @@ gif_load (f, img)
   bg_color.blue = color.blue;
   RGBBackColor (&bg_color);
   SetGWorld (old_port, old_gdh);
-  SetMovieActive (movie, TRUE);
+  SetMovieActive (movie, 1);
   SetMovieGWorld (movie, ximg, NULL);
   SampleNumToMediaTime (media, ino + 1, &time, NULL);
   SetMovieTimeValue (movie, time);
@@ -7930,7 +7930,7 @@ DEFUN ("lookup-image", Flookup_image, Slookup_image, 1, 1, 0, "")
   define_image_type (image_type, init_lib_fn (libraries))
 #else
 #define CHECK_LIB_AVAILABLE(image_type, init_lib_fn, libraries) \
-  define_image_type (image_type, TRUE)
+  define_image_type (image_type, 1)
 #endif /* HAVE_NTGUI */
 
 DEFUN ("init-image-library", Finit_image_library, Sinit_image_library, 2, 2, 0,
@@ -8114,8 +8114,8 @@ init_image ()
 {
   image_types = NULL;
 
-  define_image_type (&xbm_type, TRUE);
-  define_image_type (&pbm_type, TRUE);
+  define_image_type (&xbm_type, 1);
+  define_image_type (&pbm_type, 1);
 
 #ifdef MAC_OS
   /* Animated gifs use QuickTime Movie Toolbox.  So initialize it here. */
diff --git a/src/xdisp.c b/src/xdisp.c
index eef40a1b5e4..c58e8088141 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -342,6 +342,11 @@ Lisp_Object Vvoid_text_area_pointer;
 
 Lisp_Object Qtrailing_whitespace;
 
+/* Name and number of the face used to highlight escape glyphs.  */
+
+Lisp_Object Qescape_glyph;
+int escape_glyph_face;
+
 /* The symbol `image' which is the car of the lists used to represent
    images in Lisp.  */
 
@@ -4921,6 +4926,21 @@ get_next_display_element (it)
                  display.  Then, set IT->dpvec to these glyphs.  */
               GLYPH g;
               int ctl_len;
+              int face_id = escape_glyph_face;
+
+              /* Find the face id if `escape-glyph' unless we recently did.  */
+              if (face_id < 0)
+                {
+                  Lisp_Object tem = Fget (Qescape_glyph, Qface);
+                  if (INTEGERP (tem))
+                    face_id = XINT (tem);
+                  else
+                    face_id = 0;
+                  /* If there's overflow, use 0 instead.  */
+                  if (FAST_GLYPH_FACE (FAST_MAKE_GLYPH (0, face_id)) != face_id)
+                    face_id = 0;
+                  escape_glyph_face = face_id;
+                }
 
               if (it->c < 128 && it->ctl_arrow_p)
                 {
@@ -4930,10 +4950,10 @@ get_next_display_element (it)
                       && GLYPH_CHAR_VALID_P (XINT (DISP_CTRL_GLYPH (it->dp))))
                     g = XINT (DISP_CTRL_GLYPH (it->dp));
                   else
-                    g = FAST_MAKE_GLYPH ('^', 0);
+                    g = FAST_MAKE_GLYPH ('^', face_id);
                   XSETINT (it->ctl_chars[0], g);
 
-                  g = FAST_MAKE_GLYPH (it->c ^ 0100, 0);
+                  g = FAST_MAKE_GLYPH (it->c ^ 0100, face_id);
                   XSETINT (it->ctl_chars[1], g);
                   ctl_len = 2;
                 }
@@ -4950,7 +4970,7 @@ 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;
@@ -4977,11 +4997,14 @@ get_next_display_element (it)
                       XSETINT (it->ctl_chars[i * 4], escape_glyph);
                       /* Insert three more glyphs into IT->ctl_chars for
                          the octal display of the character.  */
-                      g = FAST_MAKE_GLYPH (((str[i] >> 6) & 7) + '0', 0);
+                      g = FAST_MAKE_GLYPH (((str[i] >> 6) & 7) + '0',
+                                           face_id);
                       XSETINT (it->ctl_chars[i * 4 + 1], g);
-                      g = FAST_MAKE_GLYPH (((str[i] >> 3) & 7) + '0', 0);
+                      g = FAST_MAKE_GLYPH (((str[i] >> 3) & 7) + '0',
+                                           face_id);
                       XSETINT (it->ctl_chars[i * 4 + 2], g);
-                      g = FAST_MAKE_GLYPH ((str[i] & 7) + '0', 0);
+                      g = FAST_MAKE_GLYPH ((str[i] & 7) + '0',
+                                           face_id);
                       XSETINT (it->ctl_chars[i * 4 + 3], g);
                     }
                   ctl_len = len * 4;
@@ -11579,6 +11602,9 @@ redisplay_window (window, just_this_one_p)
   *w->desired_matrix->method = 0;
 #endif
 
+  /* Force this to be looked up again for each redisp of each window.  */
+  escape_glyph_face = -1;
+
   specbind (Qinhibit_point_motion_hooks, Qt);
 
   reconsider_clip_changes (w, buffer);
@@ -22150,6 +22176,8 @@ syms_of_xdisp ()
   staticpro (&Qfontification_functions);
   Qtrailing_whitespace = intern ("trailing-whitespace");
   staticpro (&Qtrailing_whitespace);
+  Qescape_glyph = intern ("escape-glyph");
+  staticpro (&Qescape_glyph);
   Qimage = intern ("image");
   staticpro (&Qimage);
   QCmap = intern (":map");