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

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 192-205)

   - Update from CVS
   - Use gdb-ui breakpoint faces on ttys too
   - Tweak gdb-ui breakpoint faces
   - Tweak info/.arch-inventory to identify info/.cvsignore as source
   - Clean up gdb-ui breakpoint faces

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/font-lock.el
Simple merge

diff --cc lisp/generic.el
index 556cb59,4db830e..35f4e52
--- 1/lisp/generic.el
--- 2/lisp/generic.el
+++ b/lisp/generic.el
@@@ -289,14 -292,14 +292,14 @@@ Some generic modes are defined in `gene
  
      ;; Go through all the comments
      (dolist (start comment-list)
-       (let ((end nil) (comstyle ""))
+       (let (end (comstyle ""))
        ;; Normalize
        (when (consp start)
-         (setq end (or (cdr start) end))
+         (setq end (cdr start))
          (setq start (car start)))
 -      (when (char-valid-p start) (setq start (char-to-string start)))
 +      (when (characterp start) (setq start (char-to-string start)))
        (cond
 -       ((char-valid-p end)   (setq end (char-to-string end)))
 +       ((characterp end)   (setq end (char-to-string end)))
         ((zerop (length end)) (setq end "\n")))
  
        ;; Setup the vars for `comment-region'

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

diff --cc lisp/international/mule.el
Simple merge

diff --cc lisp/ldefs-boot.el
Simple merge

diff --cc lisp/progmodes/perl-mode.el
Simple merge

diff --cc lisp/ps-print.el
index 330a09d,726b0e4..95af591
--- 1/lisp/ps-print.el
--- 2/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@@ -4833,12 -4869,9 +4833,12 @@@ page-height == ((floor print-height ((t
  
     ;; Functions are called -- they should return strings; they will be inserted
     ;; as strings and the PS string delimiters added.
-    ((and (symbolp content) (fboundp content))
-      (if (fboundp ps-encode-header-string-function)
-        (dolist (l (funcall ps-encode-header-string-function
-                            (funcall content) fonttag))
-          (ps-output-string l))
-     (ps-output-string (funcall content))))
 -   ((functionp content)
 -    (ps-output-string (ps-mule-encode-header-string (funcall content)
 -                                                  fonttag)))
++   ((fboundp content)
++    (if (fboundp ps-encode-header-string-function)
++      (dolist (l (funcall ps-encode-header-string-function
++                          (funcall content) fonttag))
++        (ps-output-string l))
++      (ps-output-string (funcall content))))
  
     ;; Variables will have their contents inserted.  They should contain
     ;; strings, and will be inserted as strings.

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

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

diff --cc src/ChangeLog
Simple merge

diff --cc src/dispextern.h
index b69f56d,fa7d1f8..36f570b
--- 1/src/dispextern.h
--- 2/src/dispextern.h
+++ b/src/dispextern.h
@@@ -2772,12 -2775,11 +2772,12 @@@ char *choose_face_font P_ ((struct fram
  int ascii_face_of_lisp_face P_ ((struct frame *, int));
  void prepare_face_for_display P_ ((struct frame *, struct face *));
  int xstricmp P_ ((const unsigned char *, const unsigned char *));
 -int lookup_face P_ ((struct frame *, Lisp_Object *, int, struct face *));
 -int lookup_named_face P_ ((struct frame *, Lisp_Object, int, int));
 +int lookup_face P_ ((struct frame *, Lisp_Object *));
 +int lookup_non_ascii_face P_ ((struct frame *, int, struct face *));
 +int lookup_named_face P_ ((struct frame *, Lisp_Object, int));
  int smaller_face P_ ((struct frame *, int, int));
  int face_with_height P_ ((struct frame *, int, int));
- int lookup_derived_face P_ ((struct frame *, Lisp_Object, int));
 -int lookup_derived_face P_ ((struct frame *, Lisp_Object, int, int, int));
++int lookup_derived_face P_ ((struct frame *, Lisp_Object, int, int));
  void init_frame_faces P_ ((struct frame *));
  void free_frame_faces P_ ((struct frame *));
  void recompute_basic_faces P_ ((struct frame *));

diff --cc src/frame.c
Simple merge

diff --cc src/fringe.c
index 771e7d4,f375159..ed73232
--- 1/src/fringe.c
--- 2/src/fringe.c
+++ b/src/fringe.c
@@@ -551,7 -551,8 +551,8 @@@ draw_fringe_bitmap_1 (w, row, left_p, o
        Lisp_Object face;
  
        if ((face = fringe_faces[which], NILP (face))
-         || (face_id = lookup_named_face (f, face, 1), face_id < 0))
 -        || (face_id = lookup_derived_face (f, face, 'A', FRINGE_FACE_ID, 0),
++        || (face_id = lookup_derived_face (f, face, FRINGE_FACE_ID, 0),
+             face_id < 0))
        face_id = FRINGE_FACE_ID;
      }
  
@@@ -1360,7 -1361,8 +1361,8 @@@ If FACE is nil, reset face to default f
  
    if (!NILP (face))
      {
-       face_id = lookup_named_face (SELECTED_FRAME (), face, 1);
+       face_id = lookup_derived_face (SELECTED_FRAME (), face,
 -                                   'A', FRINGE_FACE_ID, 1);
++                                   FRINGE_FACE_ID, 1);
        if (face_id < 0)
        error ("No such face");
      }

diff --cc src/keyboard.c
Simple merge

diff --cc src/msdos.c
index f863984,f471740..c987244
--- 1/src/msdos.c
--- 2/src/msdos.c
+++ b/src/msdos.c
@@@ -3799,15 -3799,15 +3799,15 @@@ XMenuActivate (Display *foo, XMenu *men
    screensize = screen_size * 2;
    faces[0]
      = lookup_derived_face (sf, intern ("msdos-menu-passive-face"),
-                          DEFAULT_FACE_ID);
 -                         0, DEFAULT_FACE_ID, 1);
++                         DEFAULT_FACE_ID, 1);
    faces[1]
      = lookup_derived_face (sf, intern ("msdos-menu-active-face"),
-                          DEFAULT_FACE_ID);
 -                         0, DEFAULT_FACE_ID, 1);
++                         DEFAULT_FACE_ID, 1);
    selectface = intern ("msdos-menu-select-face");
    faces[2] = lookup_derived_face (sf, selectface,
-                                 faces[0]);
 -                                0, faces[0], 1);
++                                faces[0], 1);
    faces[3] = lookup_derived_face (sf, selectface,
-                                 faces[1]);
 -                                0, faces[1], 1);
++                                faces[1], 1);
  
    /* Make sure the menu title is always displayed with
       `msdos-menu-active-face', no matter where the mouse pointer is.  */

diff --cc src/xdisp.c
index b9ef283,a8559ca..60ac47b
--- 1/src/xdisp.c
--- 2/src/xdisp.c
+++ b/src/xdisp.c
@@@ -3729,7 -3726,8 +3729,8 @@@ handle_single_display_spec (it, spec, o
        if (CONSP (XCDR (XCDR (spec))))
        {
          Lisp_Object face_name = XCAR (XCDR (XCDR (spec)));
-         int face_id2 = lookup_named_face (it->f, face_name, 0);
+         int face_id2 = lookup_derived_face (it->f, face_name,
 -                                            'A', FRINGE_FACE_ID, 0);
++                                            FRINGE_FACE_ID, 0);
          if (face_id2 >= 0)
            face_id = face_id2;
        }

diff --cc src/xfaces.c
index 8e4d094,146036a..dfe17b9
--- 1/src/xfaces.c
--- 2/src/xfaces.c
+++ b/src/xfaces.c
@@@ -5905,17 -5768,18 +5905,18 @@@ face_with_height (f, face_id, height
  
  
  /* Return the face id of the realized face for named face SYMBOL on
 -   frame F suitable for displaying character C, and use attributes of
 -   the face FACE_ID for attributes that aren't completely specified by
 -   SYMBOL.  This is like lookup_named_face, except that the default
 -   attributes come from FACE_ID, not from the default face.  FACE_ID
 -   is assumed to be already realized.  */
 +   frame F suitable for displaying ASCII characters, and use
 +   attributes of the face FACE_ID for attributes that aren't
 +   completely specified by SYMBOL.  This is like lookup_named_face,
 +   except that the default attributes come from FACE_ID, not from the
 +   default face.  FACE_ID is assumed to be already realized.  */
  
  int
- lookup_derived_face (f, symbol, face_id)
 -lookup_derived_face (f, symbol, c, face_id, signal_p)
++lookup_derived_face (f, symbol, face_id, signal_p)
       struct frame *f;
       Lisp_Object symbol;
 -     int c;
       int face_id;
++     int signal_p;
  {
    Lisp_Object attrs[LFACE_VECTOR_SIZE];
    Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE];
@@@ -5924,10 -5788,10 +5925,10 @@@
    if (!default_face)
      abort ();
  
-   get_lface_attributes (f, symbol, symbol_attrs, 1);
+   get_lface_attributes (f, symbol, symbol_attrs, signal_p);
    bcopy (default_face->lface, attrs, sizeof attrs);
    merge_face_vectors (f, symbol_attrs, attrs, 0);
 -  return lookup_face (f, attrs, c, default_face);
 +  return lookup_face (f, attrs);
  }
  
  DEFUN ("face-attributes-as-vector", Fface_attributes_as_vector,
@@@ -7925,7 -7731,7 +7926,7 @@@ merge_faces (f, face_name, face_id, bas
        if (face_id < 0 || face_id >= lface_id_to_name_size)
        return base_face_id;
        face_name = lface_id_to_name[face_id];
-       face_id = lookup_derived_face (f, face_name, base_face_id);
 -      face_id = lookup_derived_face (f, face_name, 0, base_face_id, 1);
++      face_id = lookup_derived_face (f, face_name, base_face_id, 1);
        if (face_id >= 0)
        return face_id;
        return base_face_id;