[Emacs-diffs] /srv/bzr/emacs/trunk r100584: * loadup.el ("vc-hooks", "ediff-hook"): Load from lisp/vc/.

[Juanma Barranquero]

------------------------------------------------------------
revno: 100584
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Fri 2010-06-11 23:19:23 +0200
message:
  * loadup.el ("vc-hooks", "ediff-hook"): Load from lisp/vc/.
modified:
  lisp/ChangeLog
  lisp/loadup.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-11 19:09:57 +0000
+++ b/lisp/ChangeLog    2010-06-11 21:19:23 +0000
@@ -1,3 +1,7 @@
+2010-06-11  Juanma Barranquero  <address@hidden>
+
+       * loadup.el ("vc-hooks", "ediff-hook"): Load from lisp/vc/.
+
 2010-06-11  Juri Linkov  <address@hidden>
 
        * finder.el (finder-known-keywords): Add keyword "vc"

=== modified file 'lisp/loadup.el'
--- a/lisp/loadup.el    2010-05-21 00:22:58 +0000
+++ b/lisp/loadup.el    2010-06-11 21:19:23 +0000
@@ -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