diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-05-02 14:38:00 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-05-02 14:38:00 +0000 |
| commit | 09a1444abb2494d0db3d71e4c942f5210786b619 (patch) | |
| tree | 0fa0b9bb0d41ed6dea6cffc07681d931431704e7 /lisp/loadup.el | |
| parent | 030cd69ff13d95f439ca0d13a03215fc45959789 (diff) | |
| parent | b21eabf6259ac5761aac04e68692384f2d23a5c3 (diff) | |
| download | emacs-09a1444abb2494d0db3d71e4c942f5210786b619.tar.gz | |
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
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 0685caf78aa..0963f5150ad 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -203,6 +203,7 @@ (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)) |