From: Juanma Barranquero <lekktu@gmail.com>
Date: Fri, 11 Jun 2010 21:19:23 +0000 (+0200)
Subject: * loadup.el ("vc-hooks", "ediff-hook"): Load from lisp/vc/.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~68
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=69f18acc8d6bcbc552583dc634a030d163ea7d79;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 08b90b6f4c0..92616097b6d 100644
--- 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 b087aa79040..d4af1d4617f 100644
--- 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