Merged from miles@gnu.org--gnu-2005 (patch 292-295)

Patches applied:

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

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

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

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

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

diff --cc lisp/files.el
Simple merge

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

diff --cc lisp/loadup.el
index 0963f5150ad302d12395676b87125a8d86c152ec,53d82323feb5f9457b49de4e04687c9eb1956da0..d5f97e492456d5d80dfdde17f7cb02ba2676edfd
--- 1/lisp/loadup.el
--- 2/lisp/loadup.el
+++ b/lisp/loadup.el
@@@ -192,18 -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 "jka-cmpr-hook")
  (load "ediff-hook")
  (if (fboundp 'x-show-tip) (load "tooltip"))
  (message "%s" (garbage-collect))

diff --cc lisp/simple.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/macterm.h
Simple merge

diff --cc src/xfns.c
Simple merge