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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/12/03 03:11:17

Modified files:
        lisp           : ChangeLog vc.el 

Log message:
        (log-view-vc-backend, log-view-vc-fileset): Declare.
        (vc-print-log-internal): Fix previous change.
        (vc-revert): Correct pluralization.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16805&r2=1.16806
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc.el?cvsroot=emacs&r1=1.743&r2=1.744

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16805
retrieving revision 1.16806
diff -u -b -r1.16805 -r1.16806
--- ChangeLog   3 Dec 2009 03:02:34 -0000       1.16805
+++ ChangeLog   3 Dec 2009 03:11:14 -0000       1.16806
@@ -1,3 +1,9 @@
+2009-12-03  Glenn Morris  <address@hidden>
+
+       * vc.el (log-view-vc-backend, log-view-vc-fileset): Declare.
+       (vc-print-log-internal): Fix previous change.
+       (vc-revert): Correct pluralization.
+
 2009-12-03  Stefan Monnier  <address@hidden>
 
        * progmodes/make-mode.el (makefile-special-targets-list): No need for

Index: vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.743
retrieving revision 1.744
diff -u -b -r1.743 -r1.744
--- vc.el       1 Dec 2009 20:08:23 -0000       1.743
+++ vc.el       3 Dec 2009 03:11:17 -0000       1.744
@@ -1859,6 +1859,9 @@
 If it contains `file' then show short logs for files.
 Not all VC backends support short logs!")
 
+(defvar log-view-vc-backend)
+(defvar log-view-vc-fileset)
+
 (defun vc-print-log-internal (backend files working-revision
                                       &optional limit)
   ;; Don't switch to the output buffer before running the command,
@@ -1882,8 +1885,8 @@
       ;; log-view-mode used to be called with inhibit-read-only bound
       ;; to t, so let's keep doing it, just in case.
       (vc-call-backend backend 'log-view-mode))
-    (set (make-local-variable 'log-view-vc-backend) ',backend)
-    (set (make-local-variable 'log-view-vc-fileset) ',files)
+    (set (make-local-variable 'log-view-vc-backend) backend)
+    (set (make-local-variable 'log-view-vc-fileset) files)
 
     (vc-exec-after
      `(let ((inhibit-read-only t))
@@ -1985,10 +1988,12 @@
     (when (vc-diff-internal vc-allow-async-revert vc-fileset nil nil)
       (unless (yes-or-no-p
               (format "Discard changes in %s? "
-                      (let ((str (vc-delistify files)))
+                      (let ((str (vc-delistify files))
+                            (nfiles (length files)))
                         (if (< (length str) 50)
                             str
-                          (format "%d files" (length files))))))
+                          (format "%d file%s" nfiles
+                                  (if (= nfiles 1) "" "s"))))))
        (error "Revert canceled"))
       (delete-windows-on "*vc-diff*")
       (kill-buffer "*vc-diff*"))