From: Glenn Morris <rgm@gnu.org>
Date: Mon, 3 Sep 2007 06:19:16 +0000 (+0000)
Subject: (vc-svn-print-log): Change the "Working file" prefix back to singular,
X-Git-Tag: emacs-pretest-23.0.90~11130
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cb3b6f1d3f5df8972660a06b5567881c6750c55d;p=emacs.git

(vc-svn-print-log): Change the "Working file" prefix back to singular,
for the sake of log-view.
---

diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 7dc0bea54d8..219b0b920bc 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -382,7 +382,14 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
     (let ((inhibit-read-only t))
       (goto-char (point-min))
       ;; Add a line to tell log-view-mode what file this is.
-      (insert "Working file(s): " (vc-delistify (mapcar 'file-relative-name files)) "\n"))
+      ;; 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"))
     (vc-svn-command
      buffer
      (if (and (= (length files) 1) (vc-stay-local-p (car files)) (fboundp 'start-process)) 'async 0)