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

69f18acc · Juanma Barranquero · 9766adfb · 69f18acc · 69f18acc
Commit 69f18acc authored Jun 11, 2010 by Juanma Barranquero
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

lisp/ChangeLog lisp/ChangeLog +4 -0

lisp/loadup.el lisp/loadup.el +2 -2

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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"

--- 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