From e9ec1c5b26139057f85548184ee4b47f3e29f564 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 12 Feb 2017 17:44:46 -0800 Subject: [PATCH] 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. --- lisp/time-stamp.el | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el index 20b6c3f83b7..fa7621bcd46 100644 --- 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 -- 2.39.5