diff options
| author | Glenn Morris | 2011-02-19 11:40:59 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-02-19 11:40:59 -0800 |
| commit | 67ab0163d67fbfeb41c37c8a259f27eeef965520 (patch) | |
| tree | 0baa678a486744cc30719841ab745fe690f5bc9d /lisp/vc | |
| parent | d6e96966e86d8eadec446788d19144bd69b1e798 (diff) | |
| parent | 27ac6e7908c1d7b503ac5dca42a34ab9068d0864 (diff) | |
| download | emacs-67ab0163d67fbfeb41c37c8a259f27eeef965520.tar.gz emacs-67ab0163d67fbfeb41c37c8a259f27eeef965520.zip | |
Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/vc')
| -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." | |||
| 621 | (delete-region start end) | 621 | (delete-region start end) |
| 622 | (rfc822-goto-eoh) | 622 | (rfc822-goto-eoh) |
| 623 | (insert "Fixes: " fixes "\n" (if (looking-at "\n") "" "\n"))))) | 623 | (insert "Fixes: " fixes "\n" (if (looking-at "\n") "" "\n"))))) |
| 624 | (goto-char (point-min)) | 624 | (and log-edit-strip-single-file-name |
| 625 | (when (and log-edit-strip-single-file-name (looking-at "\\*\\s-+")) | 625 | (progn (rfc822-goto-eoh) |
| 626 | (forward-line 1) | 626 | (if (looking-at "\n") (forward-char 1)) |
| 627 | (when (not (re-search-forward "^\\*\\s-+" nil t)) | 627 | (looking-at "\\*\\s-+")) |
| 628 | (goto-char (point-min)) | 628 | (let ((start (point))) |
| 629 | (skip-chars-forward "^():") | 629 | (forward-line 1) |
| 630 | (skip-chars-forward ": ") | 630 | (when (not (re-search-forward "^\\*\\s-+" nil t)) |
| 631 | (delete-region (point-min) (point)))))) | 631 | (goto-char start) |
| 632 | (skip-chars-forward "^():") | ||
| 633 | (skip-chars-forward ": ") | ||
| 634 | (delete-region start (point))))) | ||
| 635 | (goto-char (point-min)))) | ||
| 632 | 636 | ||
| 633 | ;;;; | 637 | ;;;; |
| 634 | ;;;; functions for getting commit message from ChangeLog a file... | 638 | ;;;; functions for getting commit message from ChangeLog a file... |