diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2003-01-18 21:20:10 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2003-01-18 21:20:10 +0000 |
| commit | 5a9ac14b684ae85e54ed236cad679eaae7eb26a5 (patch) | |
| tree | bca79f826e4e323678b868bf286b4852d3331039 /lisp/add-log.el | |
| parent | 017708e9dd7509011f5df38409c489240a773eea (diff) | |
| download | emacs-5a9ac14b684ae85e54ed236cad679eaae7eb26a5.tar.gz emacs-5a9ac14b684ae85e54ed236cad679eaae7eb26a5.tar.bz2 emacs-5a9ac14b684ae85e54ed236cad679eaae7eb26a5.zip | |
(add-change-log-entry): Don't leave space at eol.
(add-log-current-defun): Perl functions names can't have (or {.
Diffstat (limited to 'lisp/add-log.el')
| -rw-r--r-- | lisp/add-log.el | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/lisp/add-log.el b/lisp/add-log.el index 711bc64c193..86902d88432 100644 --- a/lisp/add-log.el +++ b/lisp/add-log.el @@ -545,36 +545,34 @@ non-nil, otherwise in local time." ;; Now insert the function name, if we have one. ;; Point is at the item for this file, ;; either at the end of the line or at the first blank line. - (if defun - (progn - ;; Make it easy to get rid of the function name. - (undo-boundary) - (unless (save-excursion - (beginning-of-line 1) - (looking-at "\\s *$")) - (insert ?\ )) - ;; See if the prev function name has a message yet or not. - ;; If not, merge the two items. - (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. + (if (not defun) + ;; No function name, so put in a colon unless we have just a star. + (unless (save-excursion + (beginning-of-line 1) + (looking-at "\\s *\\(\\*\\s *\\)?$")) + (insert ": ") + (if version (insert version ?\ ))) + ;; Make it easy to get rid of the function name. + (undo-boundary) (unless (save-excursion (beginning-of-line 1) - (looking-at "\\s *\\(\\*\\s *\\)?$")) - (insert ": ") - (if version (insert version ?\ )))))) + (looking-at "\\s *$")) + (insert ?\ )) + ;; See if the prev function name has a message yet or not. + ;; If not, merge the two items. + (let ((pos (point-marker))) + (skip-syntax-backward " ") + (skip-chars-backward "):") + (if (and (looking-at "):") + (> fill-column (+ (current-column) (length defun) 4))) + (progn (delete-region (point) pos) (insert ", ")) + (if (looking-at "):") + (delete-region (+ 1 (point)) (line-end-position))) + (goto-char pos) + (insert "(")) + (set-marker pos nil)) + (insert defun "): ") + (if version (insert version ?\ ))))) ;;;###autoload (defun add-change-log-entry-other-window (&optional whoami file-name) @@ -829,7 +827,7 @@ Has a preference of looking backwards." (if (re-search-backward "^@node[ \t]+\\([^,\n]+\\)" nil t) (match-string-no-properties 1))) ((memq major-mode '(perl-mode cperl-mode)) - (if (re-search-backward "^sub[ \t]+\\([^ \t\n]+\\)" nil t) + (if (re-search-backward "^sub[ \t]+\\([^({ \t\n]+\\)" nil t) (match-string-no-properties 1))) ;; Emacs's autoconf-mode installs its own ;; `add-log-current-defun-function'. This applies to |