* loadup.el ("vc-hooks", "ediff-hook"): Load from lisp/vc/.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 08b90b6f4c062f5820c1c0cae76c94349c5faebd..92616097b6da1807c58d231281ba38bbdd416ac1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-11  Juanma Barranquero  <lekktu@gmail.com>
+
+       * loadup.el ("vc-hooks", "ediff-hook"): Load from lisp/vc/.
+
 2010-06-11  Juri Linkov  <juri@jurta.org>
 
        * finder.el (finder-known-keywords): Add keyword "vc"

diff --git a/lisp/loadup.el b/lisp/loadup.el
index b087aa79040723ea55f8f6e53478d7ab981c3240..d4af1d4617f70e5a2c0c578c1d91a0a805688db8 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -243,8 +243,8 @@
     (progn             ; floating pt. functions if we have float support.
       (load "emacs-lisp/float-sup")))
 
-(load "vc-hooks")
-(load "ediff-hook")
+(load "vc/vc-hooks")
+(load "vc/ediff-hook")
 (if (fboundp 'x-show-tip) (load "tooltip"))
 
 ;If you want additional libraries to be preloaded and their