* log-edit.el (log-edit-strip-single-file-name): New var.

(log-edit-insert-changelog): Use it.

diff --git a/etc/NEWS b/etc/NEWS
index b06fa3e17a4a18083e9ae7c5d8cbea7fed6653cb..3d4fa59a8ca9a9b514771e9550f847fe45a9a477 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -142,6 +142,9 @@ Signed-off-by line when committing.
 
 **** vc-dir displays the stash status
 
+*** log-edit-strip-single-file-name controls whether or not single filenames
+are stripped when copying text from the ChangeLog to the *VC-Log* buffer.
+
 ** Calendar and diary
 
 ---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d8ffb2e91694cf9715279c01101b8ae06ac5ae42..9d178f367428ced7b1f6c1775ce6012ee85f8d17 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,12 @@
+2009-08-19  Magnus Henoch  <magnus.henoch@gmail.com>
+
+       * log-edit.el (log-edit-strip-single-file-name): New var.
+       (log-edit-insert-changelog): Use it.
+
 2009-08-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * subr.el (read-passwd): Use read-key so keypad keys work as well.
+       Bug#3287
 
        * help.el (help-print-return-message): Rename from
        print-help-return-message.

diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index 4ca13726c07f78f8f5cd79f3e05810b7e6a6a4c5..a9816ea664931147c7422e524aaddb77297a1f2b 100644 (file)
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -148,6 +148,10 @@ can be obtained from `log-edit-files'."
   :type '(hook :options (log-edit-set-common-indentation
                         log-edit-add-to-changelog)))
 
+(defcustom log-edit-strip-single-file-name t
+  "If non-nil, remove file name from single-file log entries."
+  :type 'boolean)
+
 (defvar cvs-changelog-full-paragraphs t)
 (make-obsolete-variable 'cvs-changelog-full-paragraphs
                         'log-edit-changelog-full-paragraphs
@@ -521,7 +525,7 @@ regardless of user name or time."
     (log-edit-insert-changelog-entries (log-edit-files)))
   (log-edit-set-common-indentation)
   (goto-char (point-min))
-  (when (looking-at "\\*\\s-+")
+  (when (and log-edit-strip-single-file-name (looking-at "\\*\\s-+"))
     (forward-line 1)
     (when (not (re-search-forward "^\\*\\s-+" nil t))
       (goto-char (point-min))