Re: buffer-local add-log-mailing-address (was: change-log-mode)

[Richard Stallman]

Here's my idea of how to fix this.  Does it work right?

*** add-log.el  25 Jun 2004 13:29:53 -0400      1.151
--- add-log.el  17 Oct 2004 08:07:51 -0400      
***************
*** 471,490 ****
  non-nil, otherwise in local time."
    (interactive (list current-prefix-arg
                     (prompt-for-change-log-name)))
-   (or add-log-full-name
-       (setq add-log-full-name (user-full-name)))
-   (or add-log-mailing-address
-       (setq add-log-mailing-address user-mail-address))
-   (if whoami
-       (progn
-       (setq add-log-full-name (read-input "Full name: " add-log-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 add-log-mailing-address
-             (read-input "Mailing address: " add-log-mailing-address))))
- 
    (let* ((defun (add-log-current-defun))
         (version (and change-log-version-info-enabled
                       (change-log-version-number-search)))
--- 471,476 ----
***************
*** 495,501 ****
         (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)
  
      (unless (equal file-name buffer-file-name)
        (if (or other-window (window-dedicated-p (selected-window)))
--- 481,499 ----
         (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)))
! 
!     (if whoami
!       (progn
!         (setq full-name (read-input "Full name: " 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-input "Mailing address: " mailing-address))))
  
      (unless (equal file-name buffer-file-name)
        (if (or other-window (window-dedicated-p (selected-window)))
***************
*** 515,525 ****
      ;; Advance into first entry if it is usable; else make new one.
      (let ((new-entries (mapcar (lambda (addr)
                                 (concat (funcall add-log-time-format)
!                                        "  " add-log-full-name
                                         "  <" addr ">"))
!                              (if (consp add-log-mailing-address)
!                                  add-log-mailing-address
!                                (list add-log-mailing-address)))))
        (if (and (not add-log-always-start-new-record)
                 (let ((hit nil))
                 (dolist (entry new-entries hit)
--- 513,523 ----
      ;; Advance into first entry if it is usable; else make new one.
      (let ((new-entries (mapcar (lambda (addr)
                                 (concat (funcall add-log-time-format)
!                                        "  " full-name
                                         "  <" addr ">"))
!                              (if (consp mailing-address)
!                                  mailing-address
!                                (list mailing-address)))))
        (if (and (not add-log-always-start-new-record)
                 (let ((hit nil))
                 (dolist (entry new-entries hit)