From: Michael Kifer <kifer@cs.stonybrook.edu>
Date: Fri, 6 Oct 1995 01:20:06 +0000 (+0000)
Subject: Added (load "ediff-hook") after loading vc-hook.
X-Git-Tag: emacs-19.34~2726
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a63926dbf3677078f5ed1718a231c7f7a672e81d;p=emacs.git

Added (load "ediff-hook") after loading vc-hook.
---

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,