diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/add-log.el | 15 |
2 files changed, 19 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 03ad3d30505..c0d5ce89ff3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2000-05-26 Stefan Monnier <monnier@cs.yale.edu> + + * add-log.el (add-change-log-entry): Merge the current entry with the + previous one if the previous one is empty. + 2000-05-26 Dave Love <fx@gnu.org> * loadhist.el (unload-feature): Fix interactive spec [from diff --git a/lisp/add-log.el b/lisp/add-log.el index a89cbd49f6d..aeb9fb48e10 100644 --- a/lisp/add-log.el +++ b/lisp/add-log.el @@ -449,7 +449,20 @@ non-nil, otherwise in local time." (beginning-of-line 1) (looking-at "\\s *$")) (insert ?\ )) - (insert "(" defun "): ") + ;; See if the prev function name has a message yet or not + ;; If not, merge the two entries. + (let ((pos (point-marker))) + (if (and (skip-syntax-backward " ") + (skip-chars-backward "):") + (looking-at "):") + (progn (delete-region (+ 1 (point)) (+ 2 (point))) t) + (> fill-column (+ (current-column) (length defun) 3))) + (progn (delete-region (point) pos) + (insert ", ")) + (goto-char pos) + (insert "(")) + (set-marker pos nil)) + (insert defun "): ") (if version (insert version ?\ ))) ;; No function name, so put in a colon unless we have just a star. |