Merge from emacs-23

[gnu-emacs] / lisp / vc / log-view.el

diff --git a/lisp/log-view.el b/lisp/vc/log-view.el
similarity index 99%
rename from lisp/log-view.el
rename to lisp/vc/log-view.el
index 7f8775e94fae9837f867bd05dc6ea21b56681c6e..fbcb88b3f729e1e95895ceb6e509566187eeaafb 100644 (file)
--- a/lisp/log-view.el
+++ b/lisp/vc/log-view.el
@@ -4,7 +4,7 @@
 ;;   2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; Keywords: rcs sccs cvs log version-control tools
+;; Keywords: rcs, sccs, cvs, log, vc, tools
 
 ;; This file is part of GNU Emacs.
 
@@ -256,7 +256,8 @@ The match group number 1 should match the revision number itself.")
        'log-view-beginning-of-defun)
   (set (make-local-variable 'end-of-defun-function)
        'log-view-end-of-defun)
-  (set (make-local-variable 'cvs-minor-wrap-function) 'log-view-minor-wrap))
+  (set (make-local-variable 'cvs-minor-wrap-function) 'log-view-minor-wrap)
+  (hack-dir-local-variables-non-file-buffer))
 
 ;;;;
 ;;;; Navigation