(vc-update-change-log): Use add-log-full-name and

add-log-mailing-address only if non-nil.

1 files changed, 4 insertions, 6 deletions

diff --git a/lisp/vc.el b/lisp/vc.el
index d8605b9fa12..4578d8211e3 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1770,12 +1770,10 @@ From a program, any arguments are passed to the `rcs2log' script."
                               f)))
                          (directory-files RCS nil "...\\|^[^.]\\|^.[^.]")))))))
   (let ((odefault default-directory)
-        (full-name (if (boundp 'add-log-full-name)
-                       add-log-full-name
-                     (user-full-name)))
-        (mailing-address (if (boundp 'add-log-mailing-address)
-                             add-log-mailing-address
-                           user-mail-address)))
+        (full-name (or add-log-full-name
+                       (user-full-name)))
+        (mailing-address (or add-log-mailing-address
+                             user-mail-address)))
     (find-file-other-window (find-change-log))
     (barf-if-buffer-read-only)
     (vc-buffer-sync)