[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100475: log-edit.el fix for bug#8057.

[Glenn Morris]

------------------------------------------------------------
revno: 100475
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Wed 2011-02-16 23:27:37 -0800
message:
  log-edit.el fix for bug#8057.
  
  * lisp/log-edit.el (log-edit-insert-changelog):
  Fix `log-edit-strip-single-file-name' functionality.
modified:
  lisp/ChangeLog
  lisp/log-edit.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-14 22:56:38 +0000
+++ b/lisp/ChangeLog    2011-02-17 07:27:37 +0000
@@ -1,3 +1,8 @@
+2011-02-17  Glenn Morris  <address@hidden>
+
+       * log-edit.el (log-edit-insert-changelog):
+       Fix `log-edit-strip-single-file-name' functionality.  (Bug#8057)
+
 2011-02-14  Chong Yidong  <address@hidden>
 
        * pgg-gpg.el (pgg-gpg-process-region): Bind

=== modified file 'lisp/log-edit.el'
--- a/lisp/log-edit.el  2011-01-02 23:50:46 +0000
+++ b/lisp/log-edit.el  2011-02-17 07:27:37 +0000
@@ -621,14 +621,18 @@
           (delete-region start end)
           (rfc822-goto-eoh)
           (insert "Fixes: " fixes "\n" (if (looking-at "\n") "" "\n")))))
-    (goto-char (point-min))
-    (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))
-        (skip-chars-forward "^():")
-        (skip-chars-forward ": ")
-        (delete-region (point-min) (point))))))
+    (and log-edit-strip-single-file-name
+         (progn (rfc822-goto-eoh)
+                (if (looking-at "\n") (forward-char 1))
+                (looking-at "\\*\\s-+"))
+         (let ((start (point)))
+           (forward-line 1)
+           (when (not (re-search-forward "^\\*\\s-+" nil t))
+             (goto-char start)
+             (skip-chars-forward "^():")
+             (skip-chars-forward ": ")
+             (delete-region start (point)))))
+    (goto-char (point-min))))
 
 ;;;;
 ;;;; functions for getting commit message from ChangeLog a file...