changeset 83867:01cab4ce3218

Improve previous change. (vc-svn-print-log): If there is only one file, use "Working file:" as the prefix, for the sake of log-view-current-file.
author Glenn Morris <rgm@gnu.org>
date Mon, 03 Sep 2007 06:25:50 +0000
parents 409f4acaf5c9
children ed170f2c728f
files lisp/vc-svn.el
diffstat 1 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc-svn.el	Mon Sep 03 06:25:12 2007 +0000
+++ b/lisp/vc-svn.el	Mon Sep 03 06:25:50 2007 +0000
@@ -382,14 +382,16 @@
     (let ((inhibit-read-only t))
       (goto-char (point-min))
       ;; Add a line to tell log-view-mode what file this is.
-      ;; FIXME as far as I can tell, this function at present can only
-      ;; be called with a single file argument.  Therefore I changed
-      ;; the prompt back to singular, "file(s)" -> "file", since
-      ;; otherwise log-view-current-file breaks.  It's trivial to
-      ;; adapt log-view-file-re for the new prefix, but less trivial
-      ;; to make log-view-current-file actually do the right thing in
-      ;; the multiple file case.
-      (insert "Working file: " (vc-delistify (mapcar 'file-relative-name files)) "\n"))
+      ;; FIXME if there are multiple files, log-view-current-file
+      ;; breaks.  It's trivial to adapt log-view-file-re for the
+      ;; changed prefix, but less trivial to make
+      ;; log-view-current-file actually do the right thing in the
+      ;; multiple file case.
+      (insert (format "Working file%s: "
+		      (if (= (length files) 1)
+			  ""
+			"s"))
+		      (vc-delistify (mapcar 'file-relative-name files)) "\n"))
     (vc-svn-command
      buffer
      (if (and (= (length files) 1) (vc-stay-local-p (car files)) (fboundp 'start-process)) 'async 0)