[Emacs-diffs] emacs etc/NEWS lisp/ChangeLog lisp/log-edit.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/08/19 19:56:03

Modified files:
        etc            : NEWS 
        lisp           : ChangeLog log-edit.el 

Log message:
        * log-edit.el (log-edit-strip-single-file-name): New var.
        (log-edit-insert-changelog): Use it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/NEWS?cvsroot=emacs&r1=1.2063&r2=1.2064
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15976&r2=1.15977
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/log-edit.el?cvsroot=emacs&r1=1.53&r2=1.54

Patches:
Index: etc/NEWS
===================================================================
RCS file: /sources/emacs/emacs/etc/NEWS,v
retrieving revision 1.2063
retrieving revision 1.2064
diff -u -b -r1.2063 -r1.2064
--- etc/NEWS    19 Aug 2009 03:03:06 -0000      1.2063
+++ etc/NEWS    19 Aug 2009 19:55:58 -0000      1.2064
@@ -142,6 +142,9 @@
 
 **** 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
 
 ---

Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15976
retrieving revision 1.15977
diff -u -b -r1.15976 -r1.15977
--- lisp/ChangeLog      19 Aug 2009 19:42:25 -0000      1.15976
+++ lisp/ChangeLog      19 Aug 2009 19:56:00 -0000      1.15977
@@ -1,6 +1,12 @@
+2009-08-19  Magnus Henoch  <address@hidden>
+
+       * log-edit.el (log-edit-strip-single-file-name): New var.
+       (log-edit-insert-changelog): Use it.
+
 2009-08-19  Stefan Monnier  <address@hidden>
 
        * 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.

Index: lisp/log-edit.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/log-edit.el,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- lisp/log-edit.el    5 Jan 2009 03:19:30 -0000       1.53
+++ lisp/log-edit.el    19 Aug 2009 19:56:03 -0000      1.54
@@ -148,6 +148,10 @@
   :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 @@
     (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))