Merge changes from emacs-23 branch

[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 35c105027b3bb8bf6b18fd15c9aa739c99b604f4..271fce124290c0e1fe63f7eca37949e84dd8644f 100644 (file)
--- a/lisp/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -1,11 +1,11 @@
 ;;; vc-annotate.el --- VC Annotate Support
 
-;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2000-2011 Free Software Foundation, Inc.
 
 ;; Author:     Martin Lorentzson  <emwson@emw.ericsson.se>
 ;; Maintainer: FSF
-;; Keywords: tools
+;; Keywords: vc tools
+;; Package: vc
 
 ;; 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."
@@ -674,5 +675,4 @@ The annotations are relative to the current time, unless overridden by OFFSET."
 
 (provide 'vc-annotate)
 
-;; arch-tag: c3454a89-80e5-4ffd-8993-671b59612898
 ;;; vc-annotate.el ends here