Merged in changes from CVS trunk.

Patches applied:

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
   (Fdisplay_supports_face_attributes_p): Work around bootstrapping problem

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
   Face merging cleanups


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

7 files changed, 287 insertions, 183 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d9000d6dd05..0770eaeff69 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,62 @@
+2004-06-07  Miles Bader  <miles@gnu.org>
+
+        * (struct named_merge_point): New type.
+        (push_named_merge_point): New function.
+        (merge_named_face): New function.
+        (merge_face_ref, face_at_buffer_position, face_at_string_position):
+        Use `merge_named_face'.
+        (merge_face_inheritance): Function removed.
+        (merge_face_ref): Renamed from `merge_face_vector_with_property'.
+        Add new `err_msgs' and `named_merge_points' args.  Return error
+        status.  Only print error messages if ERR_MSGS is true.  Don't try to
+        do :inherit attribute validation.
+        (merge_face_heights): Handle `unspecified' in both directions.
+        (merge_face_vectors): Rename `cycle_check' arg to `named_merge_points'.
+        Call `merge_face_ref' instead of `merge_face_inheritance'.
+        (Fdisplay_supports_face_attributes_p, Fface_attributes_as_vector)
+        (compute_char_face, face_at_buffer_position)
+        (face_at_string_position): Call `merge_face_ref' instead of
+        `merge_face_vector_with_property'.
+
+2004-06-07  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (find_safe_codings): Check NILP (safe_codings) only at
+        the necessary places.
+
+2004-06-07  Kim F. Storm  <storm@cua.dk>
+
+        * process.c (Fdelete_process): Undo 2004-05-28 change.
+        Instead, call status_notify also for network process.
+        (status_message): Use process instead of status as arg.
+        Give messages "deleted" or "connection broken by remote peer" for
+        an exited network process.
+        (status_notify): Change call to status_message.
+        (read_process_output): Increase readmax to 4096.  Do not increase
+        buffer size for datagram channels (default is now large enough).
+
+2004-06-06  Steven Tamm  <tamm@Steven-Tamms-Computer.local>
+
+        * macfns.c (x_create_tip_frame): Fix Mac OS X 10.1 compilation
+        problem due to newly defined variable.
+
+2004-06-06  Miles Bader  <miles@gnu.org>
+
+        * xfaces.c (Fdisplay_supports_face_attributes_p): Give up
+        immediately if non-interactive or not initialized.
+
+2004-06-05  Richard M. Stallman  <rms@gnu.org>
+
+        * minibuf.c (Fcompleting_read): Doc fix.
+
+2004-06-05  Andreas Schwab  <schwab@suse.de>
+
+        * macfns.c (x_create_tip_frame): Fix declaration after statement.
+
+2004-06-05  Juanma Barranquero  <lektu@terra.es>
+
+        * keymap.c (Fdescribe_vector): Fix docstring.
+        (Fkey_description, Fglobal_key_binding): Fix typo in docstring.
+
 2004-06-05  Miles Bader  <miles@gnu.org>
 
         * xfaces.c (tty_supports_face_attributes_p): Make sure the specified
@@ -18,7 +77,7 @@
         (Ftty_supports_face_attributes_p): Function deleted.
         (Fdisplay_supports_face_attributes_p): New function.
         (syms_of_xfaces): Initialize Sdisplay_supports_face_attributes_p.
-        (face_attr_equal_p): New function
+        (face_attr_equal_p): New function.
         (lface_equal_p): Use it.
 
 2004-06-03  Juanma Barranquero  <lektu@terra.es>
@@ -3828,7 +3887,7 @@
 
 2003-07-09  Kim F. Storm  <storm@cua.dk>
 
-        * xterm.c (use_xim) [!USE_XIM]: Default to disable XIM if emacs
+        * xterm.c (use_xim) [!USE_XIM]: Default to disable XIM if Emacs
         was configured with --without-xim.
         (x_term_init) [!USE_XIM]: Use `useXIM' resource to turn on XIM.
 
@@ -4685,7 +4744,7 @@
         window to only preserve the display margins in one of the windows.
         When splitting horizontally, call adjust_window_margins on both
         windows to ensure that the text area of the new windows is non too
-        narrow.  This fixes a bug which could cause emacs to trap if the
+        narrow.  This fixes a bug which could cause Emacs to trap if the
         width of the split window was less than the width of the display
         margins.
         (window_box_text_cols): Renamed from window_internal_width.
@@ -4716,7 +4775,7 @@
         (Fset_window_margins): Do nothing if display margins are not
         really changed.  Otherwise, call adjust_window_margins to ensure
         the text area doesn't get too narrow.  This fixes a bug which
-        could cause emacs to trap if setting display margins wider than
+        could cause Emacs to trap if setting display margins wider than
         the width of the window.
         (Fset_window_fringes): New defun to allow user to specifically set
         this window's fringe widths and position vs. display margins.
@@ -7990,7 +8049,7 @@
         * process.c (Fformat_network_address): New function.
         (syms_of_process): Defsubr it.
         (list_processes_1): Use it to format :local/:remote address if
-        service/host is not set; before emacs would crash in that case.
+        service/host is not set; before Emacs would crash in that case.
         (Fmake_network_process): Don't use Ffind_operation_coding_system
         to setup coding system if host or service is not set.
 
@@ -9288,11 +9347,11 @@
 2002-07-11  Juanma Barranquero  <lektu@terra.es>
 
         * alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, coding.c,
-        composite.c, dired.c, dispnew.c, editfns.c, emacs.c, eval.c,
-        fileio.c, fns.c, insdel.c, keyboard.c, keymap.c, lread.c, macfns.c,
-        macmenu.c, macros.c, minibuf.c, print.c, process.c, sound.c,
-        textprop.c, w32fns.c, w32menu.c, window.c, xfaces.c, xfns.c,
-        xmenu.c, xselect.c, xterm.c: Use SPECPDL_INDEX wherever makes sense.
+        * composite.c, dired.c, dispnew.c, editfns.c, emacs.c, eval.c,
+        * fileio.c, fns.c, insdel.c, keyboard.c, keymap.c, lread.c, macfns.c,
+        * macmenu.c, macros.c, minibuf.c, print.c, process.c, sound.c,
+        * textprop.c, w32fns.c, w32menu.c, window.c, xfaces.c, xfns.c,
+        * xmenu.c, xselect.c, xterm.c: Use SPECPDL_INDEX wherever makes sense.
 
 2002-07-10  Juanma Barranquero  <lektu@terra.es>
 
@@ -12315,7 +12374,7 @@
 2001-12-14  Andrew Innes  <andrewi@gnu.org>
 
         * makefile.w32-in (EMACSLOADPATH): Define.
-        ($(EMACS)): Run `list-load-path-shadows' after dumping emacs.
+        ($(EMACS)): Run `list-load-path-shadows' after dumping Emacs.
         (bootstrap-temacs): Remove dependency on bootstrap-clean.
 
 2001-12-13  Eli Zaretskii  <eliz@is.elta.co.il>
@@ -13612,7 +13671,7 @@
 
 2001-10-28  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
-        * emacs.c: Use argv[0] instead of emacs when -t was specified.
+        * emacs.c: Use argv[0] instead of "emacs" when -t was specified.
 
         * keyboard.c: Change doc-string comments to `new style' [w/`doc:'
         keyword].
diff --git a/src/coding.c b/src/coding.c
index 7e90b985143..328507de499 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -6566,8 +6566,8 @@ highest priority.  */)
     possible coding systems.  If it is nil, it means that we have not
     yet found any coding systems.
 
-    WORK_TABLE is a copy of the char-table Vchar_coding_system_table.  An
-    element of WORK_TABLE is set to t once the element is looked up.
+    WORK_TABLE a char-table of which element is set to t once the
+    element is looked up.
 
     If a non-ASCII single byte char is found, set
     *single_byte_char_found to 1.  */
@@ -6582,6 +6582,8 @@ find_safe_codings (p, pend, safe_codings, work_table, single_byte_char_found)
   Lisp_Object val, ch;
   Lisp_Object prev, tail;
 
+  if (NILP (safe_codings))
+    goto done_safe_codings;
   while (p < pend)
     {
       c = STRING_CHAR_AND_LENGTH (p, pend - p, len);
@@ -6591,11 +6593,6 @@ find_safe_codings (p, pend, safe_codings, work_table, single_byte_char_found)
         continue;
       if (SINGLE_BYTE_CHAR_P (c))
         *single_byte_char_found = 1;
-      if (NILP (safe_codings))
-        /* Already all coding systems are excluded.  But, we can't
-           terminate the loop here because non-ASCII single-byte char
-           must be found.  */
-        continue;
       /* Check the safe coding systems for C.  */
       ch = make_number (c);
       val = Faref (work_table, ch);
@@ -6673,12 +6670,33 @@ find_safe_codings (p, pend, safe_codings, work_table, single_byte_char_found)
             {
               /* Exclude this coding system from SAFE_CODINGS.  */
               if (EQ (tail, safe_codings))
-                safe_codings = XCDR (safe_codings);
+                {
+                  safe_codings = XCDR (safe_codings);
+                  if (NILP (safe_codings))
+                    goto done_safe_codings;
+                }
               else
                 XSETCDR (prev, XCDR (tail));
             }
         }
     }
+
+ done_safe_codings:
+  /* If the above loop was terminated before P reaches PEND, it means
+     SAFE_CODINGS was set to nil.  If we have not yet found an
+     non-ASCII single-byte char, check it now.  */
+  if (! *single_byte_char_found)
+    while (p < pend)
+      {
+        c = STRING_CHAR_AND_LENGTH (p, pend - p, len);
+        p += len;
+        if (! ASCII_BYTE_P (c)
+            && SINGLE_BYTE_CHAR_P (c))
+          {
+            *single_byte_char_found = 1;
+            break;
+          }
+      }
   return safe_codings;
 }
 
diff --git a/src/keymap.c b/src/keymap.c
index 60a6d177e35..30d66972094 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1624,7 +1624,7 @@ DEFUN ("global-key-binding", Fglobal_key_binding, Sglobal_key_binding, 1, 2, 0,
        doc: /* Return the binding for command KEYS in current global keymap only.
 KEYS is a string, a sequence of keystrokes.
 The binding is probably a symbol with a function definition.
-This function's return values are the same as those of lookup-key
+This function's return values are the same as those of `lookup-key'
 \(which see).
 
 If optional argument ACCEPT-DEFAULT is non-nil, recognize default
@@ -1951,7 +1951,7 @@ Lisp_Object Qsingle_key_description, Qkey_description;
 DEFUN ("key-description", Fkey_description, Skey_description, 1, 2, 0,
        doc: /* Return a pretty description of key-sequence KEYS.
 Optional arg PREFIX is the sequence of keys leading up to KEYS.
-Control characters turn into "C-foo" sequences, meta into "M-foo"
+Control characters turn into "C-foo" sequences, meta into "M-foo",
 spaces are put between sequence elements, etc.  */)
   (keys, prefix)
      Lisp_Object keys, prefix;
@@ -3226,7 +3226,8 @@ describe_vector_princ (elt, fun)
 
 DEFUN ("describe-vector", Fdescribe_vector, Sdescribe_vector, 1, 2, 0,
        doc: /* Insert a description of contents of VECTOR.
-This is text showing the elements of vector matched against indices.  */)
+This is text showing the elements of vector matched against indices.
+DESCRIBER is the output function used; nil means use `princ'.  */)
      (vector, describer)
      Lisp_Object vector, describer;
 {
diff --git a/src/macfns.c b/src/macfns.c
index 4147325c288..5c1b7770640 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -1,5 +1,5 @@
 /* Graphical user interface functions for Mac OS.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -3803,13 +3803,15 @@ x_create_tip_frame (dpyinfo, parms, text)
   window_prompting = x_figure_window_size (f, parms, 0);
 
   {
-    BLOCK_INPUT;
     Rect r;
 
+    BLOCK_INPUT;
     SetRect (&r, 0, 0, 1, 1);
     if (CreateNewWindow (kHelpWindowClass,
-                         kWindowNoActivatesAttribute
-                         | kWindowIgnoreClicksAttribute,
+#ifdef MAC_OS_X_VERSION_10_2
+                         kWindowIgnoreClicksAttribute |
+#endif
+                         kWindowNoActivatesAttribute,
                          &r, &tip_window) == noErr)
       {
         FRAME_MAC_WINDOW (f) = tip_window;
diff --git a/src/minibuf.c b/src/minibuf.c
index 8ed19516080..6dd55c5ea76 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1619,7 +1619,7 @@ HIST, if non-nil, specifies a history list and optionally the initial
   is the initial position (the position in the list used by the
   minibuffer history commands).  For consistency, you should also
   specify that element of the history as the value of
-  INITIAL-CONTENTS.  (This is the only case in which you should use
+  INITIAL-INPUT.  (This is the only case in which you should use
   INITIAL-INPUT instead of DEF.)  Positions are counted starting from
   1 at the beginning of the list.  The variable `history-length'
   controls the maximum length of a history list.
diff --git a/src/process.c b/src/process.c
index c05bcbf88d5..d2789e0e42e 100644
--- a/src/process.c
+++ b/src/process.c
@@ -445,10 +445,11 @@ decode_status (l, symbol, code, coredump)
 
 /* Return a string describing a process status list.  */
 
-Lisp_Object
-status_message (status)
-     Lisp_Object status;
+static Lisp_Object
+status_message (p)
+     struct Lisp_Process *p;
 {
+  Lisp_Object status = p->status;
   Lisp_Object symbol;
   int code, coredump;
   Lisp_Object string, string2;
@@ -469,6 +470,8 @@ status_message (status)
     }
   else if (EQ (symbol, Qexit))
     {
+      if (NETCONN1_P (p))
+        return build_string (code == 0 ? "deleted\n" : "connection broken by remote peer\n");
       if (code == 0)
         return build_string ("finished\n");
       string = Fnumber_to_string (make_number (code));
@@ -764,6 +767,7 @@ nil, indicating the current buffer's process.  */)
     {
       XPROCESS (process)->status = Fcons (Qexit, Fcons (make_number (0), Qnil));
       XSETINT (XPROCESS (process)->tick, ++process_tick);
+      status_notify ();
     }
   else if (XINT (XPROCESS (process)->infd) >= 0)
     {
@@ -774,18 +778,7 @@ nil, indicating the current buffer's process.  */)
       XSETINT (XPROCESS (process)->tick, ++process_tick);
       status_notify ();
     }
-  /* Do not call remove_process here; either status_notify has already done
-     it, or will do so the next time emacs polls for input.  Thus network
-     processes are not immediately removed, and their sentinel will be
-     called.
-
-     Since Fdelete_process is called by kill_buffer_processes, this also
-     means that a network process sentinel will run after the buffer is
-     dead, which would not be the case if status_notify() were called
-     unconditionally here.  This way process sentinels observe consistent
-     behavior with regard to buffer-live-p.
-  */
-  /* remove_process (process); */
+  remove_process (process);
   return Qnil;
 }
 
@@ -4703,7 +4696,7 @@ read_process_output_error_handler (error)
    starting with our buffered-ahead character if we have one.
    Yield number of decoded characters read.
 
-   This function reads at most 1024 characters.
+   This function reads at most 4096 characters.
    If you want to read all available subprocess output,
    you must call it repeatedly until it returns zero.
 
@@ -4723,7 +4716,7 @@ read_process_output (proc, channel)
   register int opoint;
   struct coding_system *coding = proc_decode_coding_system[channel];
   int carryover = XINT (p->decoding_carryover);
-  int readmax = 1024;
+  int readmax = 4096;
 
 #ifdef VMS
   VMS_PROC_STUFF *vs, *get_vms_process_pointer();
@@ -4756,16 +4749,6 @@ read_process_output (proc, channel)
     }
 #else /* not VMS */
 
-#ifdef DATAGRAM_SOCKETS
-  /* A datagram is one packet; allow at least 1500+ bytes of data
-     corresponding to the typical Ethernet frame size.  */
-  if (DATAGRAM_CHAN_P (channel))
-    {
-      /* carryover = 0; */  /* Does carryover make sense for datagrams? */
-      readmax += 1024;
-    }
-#endif
-
   chars = (char *) alloca (carryover + readmax);
   if (carryover)
     /* See the comment above.  */
@@ -6399,7 +6382,7 @@ status_notify ()
           /* Get the text to use for the message.  */
           if (!NILP (p->raw_status_low))
             update_status (p);
-          msg = status_message (p->status);
+          msg = status_message (p);
 
           /* If process is terminated, deactivate it or delete it.  */
           symbol = p->status;
diff --git a/src/xfaces.c b/src/xfaces.c
index 6e447e0cb0e..b48ccac9d9d 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -463,6 +463,7 @@ int menu_face_changed_default;
 
 struct font_name;
 struct table_entry;
+struct named_merge_point;
 
 static void map_tty_color P_ ((struct frame *, struct face *,
                                enum lface_attribute_index, int *));
@@ -521,11 +522,10 @@ static int face_numeric_slant P_ ((Lisp_Object));
 static int face_numeric_swidth P_ ((Lisp_Object));
 static int face_fontset P_ ((Lisp_Object *));
 static char *choose_face_font P_ ((struct frame *, Lisp_Object *, int, int, int*));
-static void merge_face_vectors P_ ((struct frame *, Lisp_Object *, Lisp_Object*, Lisp_Object));
-static void merge_face_inheritance P_ ((struct frame *f, Lisp_Object,
-                                        Lisp_Object *, Lisp_Object));
-static void merge_face_vector_with_property P_ ((struct frame *, Lisp_Object *,
-                                                 Lisp_Object));
+static void merge_face_vectors P_ ((struct frame *, Lisp_Object *, Lisp_Object*,
+                                    struct named_merge_point *));
+static int merge_face_ref P_ ((struct frame *, Lisp_Object, Lisp_Object *,
+                               int, struct named_merge_point *));
 static int set_lface_from_font_name P_ ((struct frame *, Lisp_Object,
                                          Lisp_Object, int, int));
 static Lisp_Object lface_from_face_name P_ ((struct frame *, Lisp_Object, int));
@@ -3154,6 +3154,49 @@ check_lface (lface)
 #endif /* GLYPH_DEBUG == 0 */
 
 
+
+/* Face-merge cycle checking.  */
+
+/* A `named merge point' is simply a point during face-merging where we
+   look up a face by name.  We keep a stack of which named lookups we're
+   currently processing so that we can easily detect cycles, using a
+   linked- list of struct named_merge_point structures, typically
+   allocated on the stack frame of the named lookup functions which are
+   active (so no consing is required).  */
+struct named_merge_point
+{
+  Lisp_Object face_name;
+  struct named_merge_point *prev;
+};
+
+
+/* If a face merging cycle is detected for FACE_NAME, return 0,
+   otherwise add NEW_NAMED_MERGE_POINT, which is initialized using
+   FACE_NAME, as the head of the linked list
+   pointed to by NAMED_MERGE_POINTS, and return 1.  */
+
+static INLINE int
+push_named_merge_point (struct named_merge_point *new_named_merge_point,
+                        Lisp_Object face_name,
+                        struct named_merge_point **named_merge_points)
+{
+  struct named_merge_point *prev;
+
+  for (prev = *named_merge_points; prev; prev = prev->prev)
+    if (EQ (face_name, prev->face_name))
+        break;
+
+  new_named_merge_point->face_name = face_name;
+  new_named_merge_point->prev = *named_merge_points;
+
+  *named_merge_points = new_named_merge_point;
+
+  return 1;
+}
+
+
+
+
 /* Resolve face name FACE_NAME.  If FACE_NAME is a string, intern it
    to make it a symvol.  If FACE_NAME is an alias for another face,
    return that face's name.  */
@@ -3404,6 +3447,8 @@ merge_face_heights (from, to, invalid, gcpro)
       else if (FLOATP (to))
         /* relative X relative => relative */
         result = make_float (XFLOAT_DATA (from) * XFLOAT_DATA (to));
+      else if (UNSPECIFIEDP (to))
+        result = from;
     }
   else if (FUNCTIONP (from))
     /* FROM is a function, which use to adjust TO.  */
@@ -3435,14 +3480,15 @@ merge_face_heights (from, to, invalid, gcpro)
    completely specified and contain only absolute attributes.  Every
    specified attribute of FROM overrides the corresponding attribute of
    TO; relative attributes in FROM are merged with the absolute value in
-   TO and replace it.  CYCLE_CHECK is used internally to detect loops in
-   face inheritance; it should be Qnil when called from other places.  */
+   TO and replace it.  NAMED_MERGE_POINTS is used internally to detect
+   loops in face inheritance; it should be 0 when called from other
+   places.  */
 
 static INLINE void
-merge_face_vectors (f, from, to, cycle_check)
+merge_face_vectors (f, from, to, named_merge_points)
      struct frame *f;
      Lisp_Object *from, *to;
-     Lisp_Object cycle_check;
+     struct named_merge_point *named_merge_points;
 {
   int i;
 
@@ -3453,7 +3499,7 @@ merge_face_vectors (f, from, to, cycle_check)
      other code uses `unspecified' as a generic value for face attributes. */
   if (!UNSPECIFIEDP (from[LFACE_INHERIT_INDEX])
       && !NILP (from[LFACE_INHERIT_INDEX]))
-    merge_face_inheritance (f, from[LFACE_INHERIT_INDEX], to, cycle_check);
+    merge_face_ref (f, from[LFACE_INHERIT_INDEX], to, 0, named_merge_points);
 
   /* If TO specifies a :font attribute, and FROM specifies some
      font-related attribute, we need to clear TO's :font attribute
@@ -3472,7 +3518,8 @@ merge_face_vectors (f, from, to, cycle_check)
     if (!UNSPECIFIEDP (from[i]))
       {
         if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
-          to[i] = merge_face_heights (from[i], to[i], to[i], cycle_check);
+          to[i] = merge_face_heights (from[i], to[i], to[i],
+                                      named_merge_points);
         else
           to[i] = from[i];
       }
@@ -3482,61 +3529,45 @@ merge_face_vectors (f, from, to, cycle_check)
   to[LFACE_INHERIT_INDEX] = Qnil;
 }
 
-/* Merge face attributes from the face on frame F whose name is
-   INHERITS, into the vector of face attributes TO; INHERITS may also be
-   a list of face names, in which case they are applied in order.
-   CYCLE_CHECK is used to detect loops in face inheritance.
-   Returns true if any of the inherited attributes are `font-related'.  */
+/* Merge the named face FACE_NAME on frame F, into the vector of face
+   attributes TO.  NAMED_MERGE_POINTS is used to detect loops in face
+   inheritance.  Returns true if FACE_NAME is a valid face name and
+   merging succeeded.  */
 
-static void
-merge_face_inheritance (f, inherit, to, cycle_check)
+static int
+merge_named_face (f, face_name, to, named_merge_points)
      struct frame *f;
-     Lisp_Object inherit;
+     Lisp_Object face_name;
      Lisp_Object *to;
-     Lisp_Object cycle_check;
+     struct named_merge_point *named_merge_points;
 {
-  if (SYMBOLP (inherit) && !EQ (inherit, Qunspecified))
-    /* Inherit from the named face INHERIT.  */
-    {
-      Lisp_Object lface;
-
-      /* Make sure we're not in an inheritance loop.  */
-      cycle_check = CYCLE_CHECK (cycle_check, inherit, 15);
-      if (NILP (cycle_check))
-        /* Cycle detected, ignore any further inheritance.  */
-        return;
+  struct named_merge_point named_merge_point;
 
-      lface = lface_from_face_name (f, inherit, 0);
-      if (!NILP (lface))
-        merge_face_vectors (f, XVECTOR (lface)->contents, to, cycle_check);
-    }
-  else if (CONSP (inherit))
-    /* Handle a list of inherited faces by calling ourselves recursively
-       on each element.  Note that we only do so for symbol elements, so
-       it's not possible to infinitely recurse.  */
+  if (push_named_merge_point (&named_merge_point,
+                              face_name, &named_merge_points))
     {
-      while (CONSP (inherit))
-        {
-          if (SYMBOLP (XCAR (inherit)))
-            merge_face_inheritance (f, XCAR (inherit), to, cycle_check);
+      Lisp_Object from[LFACE_VECTOR_SIZE];
+      int ok = get_lface_attributes (f, face_name, from, 0);
 
-          /* Check for a circular inheritance list.  */
-          cycle_check = CYCLE_CHECK (cycle_check, inherit, 15);
-          if (NILP (cycle_check))
-            /* Cycle detected.  */
-            break;
+      if (ok)
+        merge_face_vectors (f, from, to, named_merge_points);
 
-          inherit = XCDR (inherit);
-        }
+      return ok;
     }
+  else
+    return 0;
 }
 
 
-/* Given a Lisp face attribute vector TO and a Lisp object PROP that
-   is a face property, determine the resulting face attributes on
-   frame F, and store them in TO.  PROP may be a single face
-   specification or a list of such specifications.  Each face
-   specification can be
+/* Merge face attributes from the lisp `face reference' FACE_REF on
+   frame F into the face attribute vector TO.  If ERR_MSGS is non-zero,
+   problems with FACE_REF cause an error message to be shown.  Return
+   non-zero if no errors occurred (regardless of the value of ERR_MSGS).
+   NAMED_MERGE_POINTS is used to detect loops in face inheritance or
+   list structure; it may be 0 for most callers.
+
+   FACE_REF may be a single face specification or a list of such
+   specifications.  Each face specification can be:
 
    1. A symbol or string naming a Lisp face.
 
@@ -3551,22 +3582,26 @@ merge_face_inheritance (f, inherit, to, cycle_check)
    Face specifications earlier in lists take precedence over later
    specifications.  */
 
-static void
-merge_face_vector_with_property (f, to, prop)
+static int
+merge_face_ref (f, face_ref, to, err_msgs, named_merge_points)
      struct frame *f;
+     Lisp_Object face_ref;
      Lisp_Object *to;
-     Lisp_Object prop;
+     int err_msgs;
+     struct named_merge_point *named_merge_points;
 {
-  if (CONSP (prop))
+  int ok = 1;                   /* Succeed without an error? */
+
+  if (CONSP (face_ref))
     {
-      Lisp_Object first = XCAR (prop);
+      Lisp_Object first = XCAR (face_ref);
 
       if (EQ (first, Qforeground_color)
           || EQ (first, Qbackground_color))
         {
           /* One of (FOREGROUND-COLOR . COLOR) or (BACKGROUND-COLOR
              . COLOR).  COLOR must be a string.  */
-          Lisp_Object color_name = XCDR (prop);
+          Lisp_Object color_name = XCDR (face_ref);
           Lisp_Object color = first;
 
           if (STRINGP (color_name))
@@ -3577,23 +3612,28 @@ merge_face_vector_with_property (f, to, prop)
                 to[LFACE_BACKGROUND_INDEX] = color_name;
             }
           else
-            add_to_log ("Invalid face color", color_name, Qnil);
+            {
+              if (err_msgs)
+                add_to_log ("Invalid face color", color_name, Qnil);
+              ok = 0;
+            }
         }
       else if (SYMBOLP (first)
                && *SDATA (SYMBOL_NAME (first)) == ':')
         {
           /* Assume this is the property list form.  */
-          while (CONSP (prop) && CONSP (XCDR (prop)))
+          while (CONSP (face_ref) && CONSP (XCDR (face_ref)))
             {
-              Lisp_Object keyword = XCAR (prop);
-              Lisp_Object value = XCAR (XCDR (prop));
+              Lisp_Object keyword = XCAR (face_ref);
+              Lisp_Object value = XCAR (XCDR (face_ref));
+              int err = 0;
 
               if (EQ (keyword, QCfamily))
                 {
                   if (STRINGP (value))
                     to[LFACE_FAMILY_INDEX] = value;
                   else
-                    add_to_log ("Invalid face font family", value, Qnil);
+                    err = 1;
                 }
               else if (EQ (keyword, QCheight))
                 {
@@ -3601,10 +3641,10 @@ merge_face_vector_with_property (f, to, prop)
                     merge_face_heights (value, to[LFACE_HEIGHT_INDEX],
                                         Qnil, Qnil);
 
-                  if (NILP (new_height))
-                    add_to_log ("Invalid face font height", value, Qnil);
-                  else
+                  if (! NILP (new_height))
                     to[LFACE_HEIGHT_INDEX] = new_height;
+                  else
+                    err = 1;
                 }
               else if (EQ (keyword, QCweight))
                 {
@@ -3612,7 +3652,7 @@ merge_face_vector_with_property (f, to, prop)
                       && face_numeric_weight (value) >= 0)
                     to[LFACE_WEIGHT_INDEX] = value;
                   else
-                    add_to_log ("Invalid face weight", value, Qnil);
+                    err = 1;
                 }
               else if (EQ (keyword, QCslant))
                 {
@@ -3620,7 +3660,7 @@ merge_face_vector_with_property (f, to, prop)
                       && face_numeric_slant (value) >= 0)
                     to[LFACE_SLANT_INDEX] = value;
                   else
-                    add_to_log ("Invalid face slant", value, Qnil);
+                    err = 1;
                 }
               else if (EQ (keyword, QCunderline))
                 {
@@ -3629,7 +3669,7 @@ merge_face_vector_with_property (f, to, prop)
                       || STRINGP (value))
                     to[LFACE_UNDERLINE_INDEX] = value;
                   else
-                    add_to_log ("Invalid face underline", value, Qnil);
+                    err = 1;
                 }
               else if (EQ (keyword, QCoverline))
                 {
@@ -3638,7 +3678,7 @@ merge_face_vector_with_property (f, to, prop)
                       || STRINGP (value))
                     to[LFACE_OVERLINE_INDEX] = value;
                   else
-                    add_to_log ("Invalid face overline", value, Qnil);
+                    err = 1;
                 }
               else if (EQ (keyword, QCstrike_through))
                 {
@@ -3647,7 +3687,7 @@ merge_face_vector_with_property (f, to, prop)
                       || STRINGP (value))
                     to[LFACE_STRIKE_THROUGH_INDEX] = value;
                   else
-                    add_to_log ("Invalid face strike-through", value, Qnil);
+                    err = 1;
                 }
               else if (EQ (keyword, QCbox))
                 {
@@ -3659,7 +3699,7 @@ merge_face_vector_with_property (f, to, prop)
                       || NILP (value))
                     to[LFACE_BOX_INDEX] = value;
                   else
-                    add_to_log ("Invalid face box", value, Qnil);
+                    err = 1;
                 }
               else if (EQ (keyword, QCinverse_video)
                        || EQ (keyword, QCreverse_video))
@@ -3667,21 +3707,21 @@ merge_face_vector_with_property (f, to, prop)
                   if (EQ (value, Qt) || NILP (value))
                     to[LFACE_INVERSE_INDEX] = value;
                   else
-                    add_to_log ("Invalid face inverse-video", value, Qnil);
+                    err = 1;
                 }
               else if (EQ (keyword, QCforeground))
                 {
                   if (STRINGP (value))
                     to[LFACE_FOREGROUND_INDEX] = value;
                   else
-                    add_to_log ("Invalid face foreground", value, Qnil);
+                    err = 1;
                 }
               else if (EQ (keyword, QCbackground))
                 {
                   if (STRINGP (value))
                     to[LFACE_BACKGROUND_INDEX] = value;
                   else
-                    add_to_log ("Invalid face background", value, Qnil);
+                    err = 1;
                 }
               else if (EQ (keyword, QCstipple))
                 {
@@ -3690,7 +3730,7 @@ merge_face_vector_with_property (f, to, prop)
                   if (!NILP (pixmap_p))
                     to[LFACE_STIPPLE_INDEX] = value;
                   else
-                    add_to_log ("Invalid face stipple", value, Qnil);
+                    err = 1;
 #endif
                 }
               else if (EQ (keyword, QCwidth))
@@ -3699,52 +3739,51 @@ merge_face_vector_with_property (f, to, prop)
                       && face_numeric_swidth (value) >= 0)
                     to[LFACE_SWIDTH_INDEX] = value;
                   else
-                    add_to_log ("Invalid face width", value, Qnil);
+                    err = 1;
                 }
               else if (EQ (keyword, QCinherit))
                 {
-                  if (SYMBOLP (value))
-                    to[LFACE_INHERIT_INDEX] = value;
-                  else
-                    {
-                      Lisp_Object tail;
-                      for (tail = value; CONSP (tail); tail = XCDR (tail))
-                        if (!SYMBOLP (XCAR (tail)))
-                          break;
-                      if (NILP (tail))
-                        to[LFACE_INHERIT_INDEX] = value;
-                      else
-                        add_to_log ("Invalid face inherit", value, Qnil);
-                    }
+                  /* This is not really very useful; it's just like a
+                     normal face reference.  */
+                  if (! merge_face_ref (f, value, to,
+                                        err_msgs, named_merge_points))
+                    err = 1;
                 }
               else
-                add_to_log ("Invalid attribute %s in face property",
-                            keyword, Qnil);
+                err = 1;
 
-              prop = XCDR (XCDR (prop));
+              if (err)
+                {
+                  add_to_log ("Invalid face attribute %S %S", keyword, value);
+                  ok = 0;
+                }
+
+              face_ref = XCDR (XCDR (face_ref));
             }
         }
       else
         {
-          /* This is a list of face specs.  Specifications at the
-             beginning of the list take precedence over later
-             specifications, so we have to merge starting with the
-             last specification.  */
-          Lisp_Object next = XCDR (prop);
-          if (!NILP (next))
-            merge_face_vector_with_property (f, to, next);
-          merge_face_vector_with_property (f, to, first);
+          /* This is a list of face refs.  Those at the beginning of the
+             list take precedence over what follows, so we have to merge
+             from the end backwards.  */
+          Lisp_Object next = XCDR (face_ref);
+
+          if (! NILP (next))
+            ok = merge_face_ref (f, next, to, err_msgs, named_merge_points);
+
+          if (! merge_face_ref (f, first, to, err_msgs, named_merge_points))
+            ok = 0;
         }
     }
   else
     {
-      /* PROP ought to be a face name.  */
-      Lisp_Object lface = lface_from_face_name (f, prop, 0);
-      if (NILP (lface))
-        add_to_log ("Invalid face text property value: %s", prop, Qnil);
-      else
-        merge_face_vectors (f, XVECTOR (lface)->contents, to, Qnil);
+      /* FACE_REF ought to be a face name.  */
+      ok = merge_named_face (f, face_ref, to, named_merge_points);
+      if (!ok && err_msgs)
+        add_to_log ("Invalid face reference: %s", face_ref, Qnil);
     }
+
+  return ok;
 }
 
 
@@ -5572,7 +5611,8 @@ lookup_named_face (f, symbol, c)
 
   get_lface_attributes (f, symbol, symbol_attrs, 1);
   bcopy (default_face->lface, attrs, sizeof attrs);
-  merge_face_vectors (f, symbol_attrs, attrs, Qnil);
+  merge_face_vectors (f, symbol_attrs, attrs, 0);
+
   return lookup_face (f, attrs, c, NULL);
 }
 
@@ -5711,7 +5751,7 @@ lookup_derived_face (f, symbol, c, face_id)
 
   get_lface_attributes (f, symbol, symbol_attrs, 1);
   bcopy (default_face->lface, attrs, sizeof attrs);
-  merge_face_vectors (f, symbol_attrs, attrs, Qnil);
+  merge_face_vectors (f, symbol_attrs, attrs, 0);
   return lookup_face (f, attrs, c, default_face);
 }
 
@@ -5724,9 +5764,8 @@ DEFUN ("face-attributes-as-vector", Fface_attributes_as_vector,
   Lisp_Object lface;
   lface = Fmake_vector (make_number (LFACE_VECTOR_SIZE),
                         Qunspecified);
-  merge_face_vector_with_property (XFRAME (selected_frame),
-                                   XVECTOR (lface)->contents,
-                                   plist);
+  merge_face_ref (XFRAME (selected_frame), plist, XVECTOR (lface)->contents,
+                  1, 0);
   return lface;
 }
 
@@ -5805,7 +5844,7 @@ x_supports_face_attributes_p (f, attrs, def_face)
 
       bcopy (def_attrs, merged_attrs, sizeof merged_attrs);
 
-      merge_face_vectors (f, attrs, merged_attrs, Qnil);
+      merge_face_vectors (f, attrs, merged_attrs, 0);
 
       face = FACE_FROM_ID (f, lookup_face (f, merged_attrs, 0, 0));
 
@@ -6030,6 +6069,12 @@ face for italic. */)
   struct face *def_face;
   Lisp_Object attrs[LFACE_VECTOR_SIZE];
 
+  if (noninteractive || !initialized)
+    /* We may not be able to access low-level face information in batch
+       mode, or before being dumped, and this function is not going to
+       be very useful in those cases anyway, so just give up.  */
+    return Qnil;
+
   if (NILP (display))
     frame = selected_frame;
   else if (FRAMEP (display))
@@ -6055,7 +6100,7 @@ face for italic. */)
 
   for (i = 0; i < LFACE_VECTOR_SIZE; i++)
     attrs[i] = Qunspecified;
-  merge_face_vector_with_property (f, attrs, attributes);
+  merge_face_ref (f, attributes, attrs, 1, 0);
 
   def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
   if (def_face == NULL)
@@ -6932,7 +6977,7 @@ realize_named_face (f, symbol, id)
 
   /* Merge SYMBOL's face with the default face.  */
   get_lface_attributes (f, symbol, symbol_attrs, 1);
-  merge_face_vectors (f, symbol_attrs, attrs, Qnil);
+  merge_face_vectors (f, symbol_attrs, attrs, 0);
 
   /* Realize the face.  */
   new_face = realize_face (c, attrs, 0, NULL, id);
@@ -7402,7 +7447,7 @@ compute_char_face (f, ch, prop)
       Lisp_Object attrs[LFACE_VECTOR_SIZE];
       struct face *default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
       bcopy (default_face->lface, attrs, sizeof attrs);
-      merge_face_vector_with_property (f, attrs, prop);
+      merge_face_ref (f, prop, attrs, 1, 0);
       face_id = lookup_face (f, attrs, ch, NULL);
     }
 
@@ -7488,7 +7533,7 @@ face_at_buffer_position (w, pos, region_beg, region_end,
 
   /* Merge in attributes specified via text properties.  */
   if (!NILP (prop))
-    merge_face_vector_with_property (f, attrs, prop);
+    merge_face_ref (f, prop, attrs, 1, 0);
 
   /* Now merge the overlay data.  */
   noverlays = sort_overlays (overlay_vec, noverlays, w);
@@ -7499,7 +7544,7 @@ face_at_buffer_position (w, pos, region_beg, region_end,
 
       prop = Foverlay_get (overlay_vec[i], propname);
       if (!NILP (prop))
-        merge_face_vector_with_property (f, attrs, prop);
+        merge_face_ref (f, prop, attrs, 1, 0);
 
       oend = OVERLAY_END (overlay_vec[i]);
       oendpos = OVERLAY_POSITION (oend);
@@ -7510,8 +7555,7 @@ face_at_buffer_position (w, pos, region_beg, region_end,
   /* If in the region, merge in the region face.  */
   if (pos >= region_beg && pos < region_end)
     {
-      Lisp_Object region_face = lface_from_face_name (f, Qregion, 0);
-      merge_face_vectors (f, XVECTOR (region_face)->contents, attrs, Qnil);
+      merge_named_face (f, Qregion, attrs, 0);
 
       if (region_end < endpos)
         endpos = region_end;
@@ -7607,16 +7651,13 @@ face_at_string_position (w, string, pos, bufpos, region_beg,
 
   /* Merge in attributes specified via text properties.  */
   if (!NILP (prop))
-    merge_face_vector_with_property (f, attrs, prop);
+    merge_face_ref (f, prop, attrs, 1, 0);
 
   /* If in the region, merge in the region face.  */
   if (bufpos
       && bufpos >= region_beg
       && bufpos < region_end)
-    {
-      Lisp_Object region_face = lface_from_face_name (f, Qregion, 0);
-      merge_face_vectors (f, XVECTOR (region_face)->contents, attrs, Qnil);
-    }
+    merge_named_face (f, Qregion, attrs, 0);
 
   /* Look up a realized face with the given face attributes,
      or realize a new one for ASCII characters.  */