[Emacs-diffs] Changes to emacs/lisp/add-log.el,v [EMACS_22_BASE]

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Richard M. Stallman <rms>       07/07/15 18:15:47

Index: add-log.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/add-log.el,v
retrieving revision 1.184
retrieving revision 1.184.2.1
diff -u -b -r1.184 -r1.184.2.1
--- add-log.el  27 Jan 2007 19:53:25 -0000      1.184
+++ add-log.el  15 Jul 2007 18:15:47 -0000      1.184.2.1
@@ -509,19 +509,19 @@
         (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 @@
     (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")