Mercurial > emacs
changeset 108972:086d8a46a85d
* loadup.el ("vc-hooks", "ediff-hook"): Load from lisp/vc/.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Fri, 11 Jun 2010 23:19:23 +0200 |
| parents | d928a6a7c3f2 |
| children | 506ba691342f |
| files | lisp/ChangeLog lisp/loadup.el |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Jun 11 22:09:57 2010 +0300 +++ b/lisp/ChangeLog Fri Jun 11 23:19:23 2010 +0200 @@ -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"
--- a/lisp/loadup.el Fri Jun 11 22:09:57 2010 +0300 +++ b/lisp/loadup.el Fri Jun 11 23:19:23 2010 +0200 @@ -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