Mercurial > emacs
changeset 106383:09d0cce6cdd3
(log-view-vc-backend, log-view-vc-fileset): Declare.
(vc-print-log-internal): Fix previous change.
(vc-revert): Correct pluralization.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 03 Dec 2009 03:11:14 +0000 |
| parents | 2ae01aa75e84 |
| children | 8272f561b710 |
| files | lisp/ChangeLog lisp/vc.el |
| diffstat | 2 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Dec 03 03:09:45 2009 +0000 +++ b/lisp/ChangeLog Thu Dec 03 03:11:14 2009 +0000 @@ -1,3 +1,9 @@ +2009-12-03 Glenn Morris <rgm@gnu.org> + + * 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 <monnier@iro.umontreal.ca> * progmodes/make-mode.el (makefile-special-targets-list): No need for
--- a/lisp/vc.el Thu Dec 03 03:09:45 2009 +0000 +++ b/lisp/vc.el Thu Dec 03 03:11:14 2009 +0000 @@ -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*"))