[Emacs-diffs] emacs/lisp ChangeLog vc-cvs.el vc-rcs.el vc.el

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/08/29 18:56:16

Modified files:
        lisp           : ChangeLog vc-cvs.el vc-rcs.el vc.el 

Log message:
        * vc.el (vc-print-log-internal): Move RCS/CVS specific code ...
        
        * vc-rcs.el (vc-rcs-print-log-cleanup): ... here.  New function.
        (vc-rcs-print-log): Use it.
        
        * vc-cvs.el (vc-cvs-print-log): Use vc-rcs-print-log-cleanup.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16049&r2=1.16050
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-cvs.el?cvsroot=emacs&r1=1.168&r2=1.169
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-rcs.el?cvsroot=emacs&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc.el?cvsroot=emacs&r1=1.727&r2=1.728

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16049
retrieving revision 1.16050
diff -u -b -r1.16049 -r1.16050
--- ChangeLog   29 Aug 2009 14:58:15 -0000      1.16049
+++ ChangeLog   29 Aug 2009 18:56:12 -0000      1.16050
@@ -1,3 +1,12 @@
+2009-08-29  Dan Nicolaescu  <address@hidden>
+
+       * vc.el (vc-print-log-internal): Move RCS/CVS specific code ...
+
+       * vc-rcs.el (vc-rcs-print-log-cleanup): ... here.  New function.
+       (vc-rcs-print-log): Use it.
+
+       * vc-cvs.el (vc-cvs-print-log): Use vc-rcs-print-log-cleanup.
+
 2009-08-29  Stefan Monnier  <address@hidden>
 
        * files.el (get-free-disk-space): Use / for default-directory.

Index: vc-cvs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-cvs.el,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -b -r1.168 -r1.169
--- vc-cvs.el   27 Aug 2009 01:50:18 -0000      1.168
+++ vc-cvs.el   29 Aug 2009 18:56:15 -0000      1.169
@@ -494,13 +494,18 @@
 ;;; History functions
 ;;;
 
+(declare-function vc-rcs-print-log-cleanup "vc-rcs" ())
+
 (defun vc-cvs-print-log (files &optional buffer)
   "Get change logs associated with FILES."
+  (require 'vc-rcs)
   ;; It's just the catenation of the individual logs.
   (vc-cvs-command
    buffer
    (if (vc-stay-local-p files 'CVS) 'async 0)
-   files "log"))
+   files "log")
+  (with-current-buffer buffer
+    (vc-exec-after (vc-rcs-print-log-cleanup))))
 
 (defun vc-cvs-comment-history (file)
   "Get comment history of a file."

Index: vc-rcs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-rcs.el,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- vc-rcs.el   26 Aug 2009 17:54:09 -0000      1.89
+++ vc-rcs.el   29 Aug 2009 18:56:15 -0000      1.90
@@ -538,10 +538,23 @@
 ;;; History functions
 ;;;
 
+(defun vc-rcs-print-log-cleanup ()
+  (let ((inhibit-read-only t))
+    (goto-char (point-max))
+    (forward-line -1)
+    (while (looking-at "=*\n")
+      (delete-char (- (match-end 0) (match-beginning 0)))
+      (forward-line -1))
+    (goto-char (point-min))
+    (when (looking-at "[\b\t\n\v\f\r ]+")
+      (delete-char (- (match-end 0) (match-beginning 0))))))
+
 (defun vc-rcs-print-log (files &optional buffer)
   "Get change log associated with FILE.  If FILE is a
 directory the operation is applied to all registered files beneath it."
-  (vc-do-command (or buffer "*vc*") 0 "rlog" (mapcar 'vc-name (vc-expand-dirs 
files))))
+  (vc-do-command (or buffer "*vc*") 0 "rlog" (mapcar 'vc-name (vc-expand-dirs 
files)))
+  (with-current-buffer (or buffer "*vc*")
+    (vc-rcs-print-log-cleanup)))
 
 (defun vc-rcs-diff (files &optional oldvers newvers buffer)
   "Get a difference report using RCS between two sets of files."

Index: vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.727
retrieving revision 1.728
diff -u -b -r1.727 -r1.728
--- vc.el       27 Aug 2009 16:53:09 -0000      1.727
+++ vc.el       29 Aug 2009 18:56:16 -0000      1.728
@@ -1834,17 +1834,6 @@
       (set (make-local-variable 'log-view-vc-backend) ',backend)
       (set (make-local-variable 'log-view-vc-fileset) ',files)
 
-      ;; FIXME: this seems to apply only to RCS/CVS, it doesn't quite
-      ;; belong here in the generic code.
-      (goto-char (point-max))
-      (forward-line -1)
-      (while (looking-at "=*\n")
-       (delete-char (- (match-end 0) (match-beginning 0)))
-       (forward-line -1))
-      (goto-char (point-min))
-      (when (looking-at "[\b\t\n\v\f\r ]+")
-       (delete-char (- (match-end 0) (match-beginning 0))))
-
       (shrink-window-if-larger-than-buffer)
       ;; move point to the log entry for the working revision
       (vc-call-backend ',backend 'show-log-entry ',working-revision)