Mercurial > emacs
diff lisp/loadup.el @ 90180:62afea0771d8
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-51
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 289-301)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 68)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 12 May 2005 03:41:19 +0000 |
parents | 36268d866121 f6b6dfcfcc3b |
children | a1b34dec1104 |
line wrap: on
line diff
--- a/lisp/loadup.el Thu May 12 02:47:44 2005 +0000 +++ b/lisp/loadup.el Thu May 12 03:41:19 2005 +0000 @@ -183,7 +183,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))