add-change-add-log-entry regression, with fix

[Roland McGrath]

Before version 22, a function on change-log-mode-hook could set
add-log-mailing-address or add-log-full-name as a buffer-local variable in
the change-log-mode buffer and have this affect what
add-change-add-log-entry inserted in the buffer.  In 22, this is broken.

This patch restores the behavior that hooks have been able to rely on since 18.


Thanks,
Roland


--- add-log.el.orig     2007-07-05 12:15:24.000000000 -0700
+++ add-log.el  2007-07-05 12:15:05.000000000 -0700
@@ -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")