Simplify time-stamp mail host usage

* lisp/time-stamp.el (time-stamp-mail-host-name): Remove function.
(time-stamp-string-preprocess): Handle "h" (mail host) directly.

diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index 20b6c3f83b7faefc7b9513a489d6f8178f097acb..fa7621bcd46897f54a80bfff223e55239e8ff095 100644 (file)
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -569,7 +569,7 @@ and all `time-stamp-format' compatibility."
         ((eq cur-char ?L)              ;(undocumented alt user full name)
          (user-full-name))
         ((eq cur-char ?h)              ;mail host name
-         (time-stamp-mail-host-name))
+         (or mail-host-address (system-name)))
         ((eq cur-char ?q)              ;(undocumented unqual hostname)
          (let ((qualname (system-name)))
            (if (string-match "\\." qualname)
@@ -639,17 +639,6 @@ Suggests replacing OLD-FORM with NEW-FORM."
       (insert "\"" old-form "\" -- use " new-form "\n"))
     (display-buffer "*Time-stamp-compatibility*"))))
 
-
-
-(defun time-stamp-mail-host-name ()
-  "Return the name of the host where the user receives mail.
-This is the value of `mail-host-address' if bound and a string,
-otherwise the value of the function `system-name'."
-  (or (and (boundp 'mail-host-address)
-          (stringp mail-host-address)
-          mail-host-address)
-      (system-name)))
-
 (provide 'time-stamp)
 
 ;;; time-stamp.el ends here