diff options
| author | Vibhav Pant <vibhavp@gmail.com> | 2017-02-13 17:07:36 +0530 |
|---|---|---|
| committer | Vibhav Pant <vibhavp@gmail.com> | 2017-02-13 17:07:36 +0530 |
| commit | cb410433e069b5bb450193353c3fea8593a643a9 (patch) | |
| tree | d2f4269781b4841e5a0c27ec57a5a4fbcec386c0 /lisp/time-stamp.el | |
| parent | e742450427007cdde242c11380dfe32a950fab61 (diff) | |
| parent | 4b18ef7ba3dd8aae4f3c3bf931365ef7da883baf (diff) | |
| download | emacs-feature/byte-switch.tar.gz | |
Merge branch 'master' into feature/byte-switchfeature/byte-switch
Diffstat (limited to 'lisp/time-stamp.el')
| -rw-r--r-- | lisp/time-stamp.el | 13 |
1 files changed, 1 insertions, 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 |