Merged from miles@gnu.org--gnu-2005 (patch 281-285)

Patches applied:

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

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

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

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

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

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

diff --cc lisp/files.el
Simple merge

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

diff --cc lisp/loadup.el
index 0685caf78aa9a4b30fe5ede46bf6b16f367d963b,7db1dec425c31dd6a289569bff43c212a5d7cbc8..0963f5150ad302d12395676b87125a8d86c152ec
--- 1/lisp/loadup.el
--- 2/lisp/loadup.el
+++ b/lisp/loadup.el
@@@ -192,17 -190,8 +192,18 @@@
        (load "emacs-lisp/float-sup")))
  (message "%s" (garbage-collect))
  
 +;; Load auxiliary settings for X displays if we support them.
 +(when (fboundp 'x-create-frame)
 +  (load "mouse")
 +  (load "international/fontset")
 +  (load "dnd")
 +  (load "x-dnd")
 +  (load "term/x-win"))
 +
 +(message "%s" (garbage-collect))
 +
  (load "vc-hooks")
+ (load "jka-comp-hook")
  (load "ediff-hook")
  (if (fboundp 'x-show-tip) (load "tooltip"))
  (message "%s" (garbage-collect))

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/indent.c
Simple merge

diff --cc src/sysdep.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
index 1960e72b710ffd05f46c5f9fc597737df5f10ff5,0b0b2f97533eab4238e855cbdec057a1281ec833..2884bccb3b98e410d32999c130bdfed4d440f5ec
--- 1/src/xfaces.c
--- 2/src/xfaces.c
+++ b/src/xfaces.c
@@@ -3204,31 -3203,20 +3206,34 @@@ push_named_merge_point (struct named_me
  
  \f
  
 +static Lisp_Object
 +internal_resolve_face_name (nargs, args)
 +     int nargs;
 +     Lisp_Object *args;
 +{
 +  Fget (args[0], args[1]);
 +}
 +
 +static Lisp_Object
 +resolve_face_name_error (ignore)
 +     Lisp_Object ignore;
 +{
 +  return Qnil;
 +}
  
  /* 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.  */
+    to make it a symbol.  If FACE_NAME is an alias for another face,
+    return that face's name.
+ 
+    Return default face in case of errors.  */
  
  static Lisp_Object
- resolve_face_name (face_name)
+ resolve_face_name (face_name, signal_p)
       Lisp_Object face_name;
+      int signal_p;
  {
-   Lisp_Object aliased;
-   int alias_loop_max = 10;
+   Lisp_Object orig_face;
+   Lisp_Object tortoise, hare;
  
    if (STRINGP (face_name))
      face_name = intern (SDATA (face_name));