summaryrefslogtreecommitdiff
path: root/lisp/loadup.el
diff options
context:
space:
mode:
authorMichael Kifer <kifer@cs.stonybrook.edu>1995-10-06 01:20:06 +0000
committerMichael Kifer <kifer@cs.stonybrook.edu>1995-10-06 01:20:06 +0000
commit83b2cca5c8d9f202761d1084a937821affe98271 (patch)
tree1e576b835c831a8930244254c6f2808b5aa78212 /lisp/loadup.el
parent27768b354b334398f45096bba54fa2634e423b41 (diff)
downloademacs-83b2cca5c8d9f202761d1084a937821affe98271.tar.gz
Added (load "ediff-hook") after loading vc-hook.
Diffstat (limited to 'lisp/loadup.el')
-rw-r--r--lisp/loadup.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 7e4980a5c8a..ad2f40b925c 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -130,6 +130,7 @@
(garbage-collect)
(load "vc-hooks")
+(load "ediff-hook")
;If you want additional libraries to be preloaded and their
;doc strings kept in the DOC file rather than in core,