bug#3571: 23.0.94; log-edit-insert-changelog option for not stripping filename

Magnus Henoch <[email protected]>
Newsgroups gmane.emacs.bugs,gmane.emacs.pretest.bugs
Message-ID <[email protected]>
Severity: wishlist
Tags: patch

I have grown into the habit of writing ChangeLog entries while writing
code, and then using them for the commit message when I commit, pressing
C-c C-a in the log buffer.  This works great, except when I'm committing
a single file.  In that case, log-edit strips the file name from the
changelog entry, but as the version control systems I use are
changeset-based rather than file-based, I would like the file name to
stay.

I've been using the attached patch for a while with good results.

Magnus
0002--log-edit.el-log-edit-strip-single-file-name-New.patch (text/x-patch, 1.8 KB)
From 0bccc332a7e04f68d47f2b66bd6e0d425c4389c8 Mon Sep 17 00:00:00 2001
From: Magnus Henoch <[email protected]>
Date: Wed, 27 May 2009 17:19:13 +0100
Subject: [PATCH] * log-edit.el (log-edit-strip-single-file-name): New variable.
 (log-edit-insert-changelog): Check its value.

---
 lisp/log-edit.el |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index 4ca1372..7552e3c 100644
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -148,6 +148,11 @@ 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."
+  :group 'log-edit
+  :type 'boolean)
+
 (defvar cvs-changelog-full-paragraphs t)
 (make-obsolete-variable 'cvs-changelog-full-paragraphs
                         'log-edit-changelog-full-paragraphs
@@ -521,13 +526,14 @@ 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-+")
-    (forward-line 1)
-    (when (not (re-search-forward "^\\*\\s-+" nil t))
-      (goto-char (point-min))
-      (skip-chars-forward "^():")
-      (skip-chars-forward ": ")
-      (delete-region (point-min) (point)))))
+  (when log-edit-strip-single-file-name
+    (when (looking-at "\\*\\s-+")
+      (forward-line 1)
+      (when (not (re-search-forward "^\\*\\s-+" nil t))
+        (goto-char (point-min))
+        (skip-chars-forward "^():")
+        (skip-chars-forward ": ")
+        (delete-region (point-min) (point))))))
 
 ;;;;
 ;;;; functions for getting commit message from ChangeLog a file...

-- 
1.6.0.2
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.