Merge from emacs-23

[gnu-emacs] / lisp / vc / vc-annotate.el

diff --git a/lisp/vc-annotate.el b/lisp/vc/vc-annotate.el
similarity index 99%
rename from lisp/vc-annotate.el
rename to lisp/vc/vc-annotate.el
index 437081293cbaabde092060eb1ae60cca4456250c..d0951bdd40413558b34f2f14c906ea152504b064 100644 (file)
--- a/lisp/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -5,7 +5,7 @@
 
 ;; Author:     Martin Lorentzson  <emwson@emw.ericsson.se>
 ;; Maintainer: FSF
-;; Keywords: tools
+;; Keywords: vc tools
 
 ;; This file is part of GNU Emacs.
 
@@ -162,7 +162,8 @@ menu items."
   (remove-from-invisibility-spec 'foo)
   (set (make-local-variable 'truncate-lines) t)
   (set (make-local-variable 'font-lock-defaults)
-       '(vc-annotate-font-lock-keywords t)))
+       '(vc-annotate-font-lock-keywords t))
+  (hack-dir-local-variables-non-file-buffer))
 
 (defun vc-annotate-toggle-annotation-visibility ()
   "Toggle whether or not the annotation is visible."