summaryrefslogtreecommitdiff
path: root/lisp/gnus/message.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-01-01 03:21:06 +0000
committerMiles Bader <miles@gnu.org>2007-01-01 03:21:06 +0000
commit4c34eeeee5886d14f3e60b77fb563cb549c8896f (patch)
treeaf17010f0864173dd6416585f08d686377791412 /lisp/gnus/message.el
parent76acf92ebe73e35528c5966a21328305ba7b5aef (diff)
parentdb6292445840e2795f35ebad62a14314fc3c7c21 (diff)
downloademacs-4c34eeeee5886d14f3e60b77fb563cb549c8896f.tar.gz
emacs-4c34eeeee5886d14f3e60b77fb563cb549c8896f.tar.bz2
emacs-4c34eeeee5886d14f3e60b77fb563cb549c8896f.zip
Merge from emacs--devo--0
Patches applied: * emacs--devo--0 (patch 563-582) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 177-185) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158
Diffstat (limited to 'lisp/gnus/message.el')
-rw-r--r--lisp/gnus/message.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index a3d0298ce0e..f7d876c120f 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1579,7 +1579,7 @@ functionality to work."
(defvar message-send-mail-real-function nil
"Internal send mail function.")
-(defvar message-bogus-system-names "^localhost\\."
+(defvar message-bogus-system-names "^localhost\\.\\|\\.local$"
"The regexp of bogus system names.")
(defcustom message-valid-fqdn-regexp
@@ -5000,8 +5000,8 @@ give as trustworthy answer as possible."
(stringp message-user-fqdn)
(string-match message-valid-fqdn-regexp message-user-fqdn)
(not (string-match message-bogus-system-names message-user-fqdn)))
+ ;; `message-user-fqdn' seems to be valid
message-user-fqdn)
- ;; `message-user-fqdn' seems to be valid
((and (string-match message-valid-fqdn-regexp system-name)
(not (string-match message-bogus-system-names system-name)))
;; `system-name' returned the right result.