diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-02-19 11:40:59 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-02-19 11:40:59 -0800 |
| commit | 67ab0163d67fbfeb41c37c8a259f27eeef965520 (patch) | |
| tree | 0baa678a486744cc30719841ab745fe690f5bc9d /lisp/vc/log-edit.el | |
| parent | d6e96966e86d8eadec446788d19144bd69b1e798 (diff) | |
| parent | 27ac6e7908c1d7b503ac5dca42a34ab9068d0864 (diff) | |
| download | emacs-67ab0163d67fbfeb41c37c8a259f27eeef965520.tar.gz emacs-67ab0163d67fbfeb41c37c8a259f27eeef965520.tar.bz2 emacs-67ab0163d67fbfeb41c37c8a259f27eeef965520.zip | |
Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/vc/log-edit.el')
| -rw-r--r-- | lisp/vc/log-edit.el | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el index 9ec3e970b5e..192ab1f78d2 100644 --- a/lisp/vc/log-edit.el +++ b/lisp/vc/log-edit.el @@ -621,14 +621,18 @@ regardless of user name or time." (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... |