diff options
| author | Richard M. Stallman <rms@gnu.org> | 2007-07-15 18:16:21 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2007-07-15 18:16:21 +0000 |
| commit | f9b9868496ff25dabafcd3c35b6bb5600dbdd2fd (patch) | |
| tree | 8124f3a2cdc5292d970eea4e43c30494961d58fe /lisp | |
| parent | 0a2ea418fcf2061ad0cc0e88e98f1cbf9363278a (diff) | |
| download | emacs-f9b9868496ff25dabafcd3c35b6bb5600dbdd2fd.tar.gz | |
(add-change-log-entry): Check add-log-full-name
and add-log-mailing-address later, after change-log-mode-hook.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/add-log.el | 15 |
2 files changed, 15 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6fd0a3b3e44..fc755882a6b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-07-15 Roland McGrath <roland@frob.com> + + * add-log.el (add-change-log-entry): Check add-log-full-name + and add-log-mailing-address later, after change-log-mode-hook. + 2007-07-15 Richard Stallman <rms@gnu.org> * isearch.el (isearch-mode, isearch-done): diff --git a/lisp/add-log.el b/lisp/add-log.el index 08ce78d371d..09368d08f9e 100644 --- a/lisp/add-log.el +++ b/lisp/add-log.el @@ -509,19 +509,19 @@ non-nil, otherwise in local time." (file-name (expand-file-name (find-change-log file-name buffer-file))) ;; Set ITEM to the file name to use in the new item. (item (add-log-file-name buffer-file file-name)) - bound - (full-name (or add-log-full-name (user-full-name))) - (mailing-address (or add-log-mailing-address user-mail-address))) + bound full-name mailing-address) (if whoami (progn - (setq full-name (read-string "Full name: " full-name)) + (setq full-name (read-string "Full name: " + (or add-log-full-name (user-full-name)))) ;; Note that some sites have room and phone number fields in ;; full name which look silly when inserted. Rather than do ;; anything about that here, let user give prefix argument so that ;; s/he can edit the full name field in prompter if s/he wants. (setq mailing-address - (read-string "Mailing address: " mailing-address)))) + (read-string "Mailing address: " + (or add-log-mailing-address user-mail-address))))) (unless (equal file-name buffer-file-name) (if (or other-window (window-dedicated-p (selected-window))) @@ -532,6 +532,11 @@ non-nil, otherwise in local time." (undo-boundary) (goto-char (point-min)) + (or full-name + (setq full-name (or add-log-full-name (user-full-name)))) + (or mailing-address + (setq mailing-address (or add-log-mailing-address user-mail-address))) + ;; If file starts with a copyright and permission notice, skip them. ;; Assume they end at first blank line. (when (looking-at "Copyright") |