From 69f18acc8d6bcbc552583dc634a030d163ea7d79 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 11 Jun 2010 23:19:23 +0200 Subject: [PATCH] * loadup.el ("vc-hooks", "ediff-hook"): Load from lisp/vc/. --- lisp/ChangeLog | 4 ++++ lisp/loadup.el | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) 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 + + * loadup.el ("vc-hooks", "ediff-hook"): Load from lisp/vc/. + 2010-06-11 Juri Linkov * 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 -- 2.11.4.GIT