Merge from emacs-23

[gnu-emacs] / lisp / vc / cvs-status.el

diff --git a/lisp/cvs-status.el b/lisp/vc/cvs-status.el
similarity index 98%
rename from lisp/cvs-status.el
rename to lisp/vc/cvs-status.el
index ffad44ab7ff54c54dc760417a17019e54aacecc1..ffcb3a9d53da4511ddd9a648a35cdfbf92da658c 100644 (file)
--- a/lisp/cvs-status.el
+++ b/lisp/vc/cvs-status.el
@@ -4,7 +4,7 @@
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; Keywords: pcl-cvs cvs status tree tools
+;; Keywords: pcl-cvs cvs status tree vc tools
 
 ;; This file is part of GNU Emacs.
 
@@ -223,7 +223,6 @@ The tree will be printed no closer than column COLUMN."
   (let* ((eol (save-excursion (end-of-line) (current-column)))
         (column (max (+ eol 2) column)))
     (if (null tags) column
-      ;;(move-to-column-force column)
       (let* ((rev (cvs-car tags))
             (name (funcall printer (cvs-car rev)))
             (rest (append (cvs-cdr name) (cvs-cdr tags)))
@@ -356,11 +355,11 @@ the list is a three-string list TAG, KIND, REV."
       tags)))
 
 (defvar font-lock-mode)
-(defun cvs-refontify (beg end)
-  (when (and (boundp 'font-lock-mode)
-            font-lock-mode
-            (fboundp 'font-lock-fontify-region))
-    (font-lock-fontify-region (1- beg) (1+ end))))
+;; (defun cvs-refontify (beg end)
+;;   (when (and (boundp 'font-lock-mode)
+;;          font-lock-mode
+;;          (fboundp 'font-lock-fontify-region))
+;;     (font-lock-fontify-region (1- beg) (1+ end))))
 
 (defun cvs-status-trees ()
   "Look for a lists of tags, and replace them with trees."