Mercurial > emacs
diff lisp/loadup.el @ 83302:5ae8a8b0a308
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
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Mon, 09 May 2005 16:13:15 +0000 |
| parents | effe22690419 f6b6dfcfcc3b |
| children | e58cb448e07c |
line wrap: on
line diff
--- a/lisp/loadup.el Fri May 06 21:06:31 2005 +0000 +++ b/lisp/loadup.el Mon May 09 16:13:15 2005 +0000 @@ -203,7 +203,7 @@ (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))