summaryrefslogtreecommitdiff
path: root/lisp/gnus/message.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2014-12-29 12:39:58 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2014-12-29 12:42:07 -0800
commit973110680c094b7a3bbcebbfbafb9abfc7adc8fd (patch)
treed4a329e7633a0e2e685c9cf2b7476a771de6006c /lisp/gnus/message.el
parentf9acac751d4cd22480e62cc63936b1208ca9fe48 (diff)
Fix previous patch to match its commit message
Diffstat (limited to 'lisp/gnus/message.el')
-rw-r--r--lisp/gnus/message.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index d58a292221..ee5d824a85 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5849,7 +5849,7 @@ give as trustworthy answer as possible."
(defun message-make-fqdn ()
"Return user's fully qualified domain name."
- (let* ((system-name (system-name))
+ (let* ((sysname (system-name))
(user-mail (message-user-mail-address))
(user-domain
(if (and user-mail
@@ -5863,10 +5863,10 @@ give as trustworthy answer as possible."
(not (string-match message-bogus-system-names message-user-fqdn)))
;; `message-user-fqdn' seems to be valid
message-user-fqdn)
- ((and (string-match message-valid-fqdn-regexp system-name)
- (not (string-match message-bogus-system-names system-name)))
+ ((and (string-match message-valid-fqdn-regexp sysname)
+ (not (string-match message-bogus-system-names sysname)))
;; `system-name' returned the right result.
- system-name)
+ sysname)
;; Try `mail-host-address'.
((and (boundp 'mail-host-address)
(stringp mail-host-address)
@@ -5881,7 +5881,7 @@ give as trustworthy answer as possible."
user-domain)
;; Default to this bogus thing.
(t
- (concat system-name
+ (concat sysname
".i-did-not-set--mail-host-address--so-tickle-me")))))
(defun message-make-domain ()