From: Karoly Lorentey <lorentey@elte.hu>
Date: Mon, 18 Apr 2005 13:40:23 +0000 (+0000)
Subject: Merged from miles@gnu.org--gnu-2005 (patch 60-65, 246-265)
X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~272
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6ab9dd8034fcd76f5d2e92a91243f8d8be3a8f98;p=emacs.git

Merged from miles@gnu.org--gnu-2005 (patch 60-65, 246-265)

Patches applied:

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-248
   Merge from gnus--rel--5.10

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-254
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-256
   Merge from gnus--rel--5.10

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-60
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-61
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-62
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-63
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-64
   (mm-string-to-multibyte): Use Gnus trunk definition.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-65
   Update from CVS

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

6ab9dd8034fcd76f5d2e92a91243f8d8be3a8f98
diff --cc lisp/loadup.el
index b5102b4b553,58572aa1d9f..8ada4710400
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@@ -192,17 -190,9 +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 "x-dnd")
 +  (load "term/x-win"))
 +
 +(message "%s" (garbage-collect))
 +
  (load "vc-hooks")
  (load "ediff-hook")
+ (if (fboundp 'x-show-tip) (load "tooltip"))
  (message "%s" (garbage-collect))
  
  ;If you want additional libraries to be preloaded and their
diff --cc src/Makefile.in
index 53725361a80,543fbceee2a..ec5ff5a4c5f
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@ -887,10 -892,9 +894,11 @@@ SOME_MACHINE_LISP = ${dotdot}/lisp/mous
    ${dotdot}/lisp/ls-lisp.elc ${dotdot}/lisp/dos-fns.elc \
    ${dotdot}/lisp/w32-fns.elc ${dotdot}/lisp/dos-w32.elc \
    ${dotdot}/lisp/disp-table.elc ${dotdot}/lisp/dos-vars.elc \
+   ${dotdot}/lisp/tooltip.elc \
    ${dotdot}/lisp/international/ccl.elc \
 -  ${dotdot}/lisp/international/codepage.elc
 +  ${dotdot}/lisp/international/codepage.elc \
 +  ${dotdot}/lisp/mouse.elc ${dotdot}/lisp/international/fontset.elc \
 +  ${dotdot}/lisp/x-dnd.elc ${dotdot}/lisp/term/x-win.elc
  
  /* Construct full set of libraries to be linked.
     Note that SunOS needs -lm to come before -lc; otherwise, you get