From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 31 Jul 2021 22:01:59 +0000 (+0200)
Subject: Adjust the fully qualified host name when nothing is set
X-Git-Tag: emacs-28.0.90~1614
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2a2e7e5466ed229feb2b4cc062c2519cd51f731f;p=emacs.git

Adjust the fully qualified host name when nothing is set

* doc/misc/message.texi (News Headers): Adjust index.
* lisp/gnus/message.el (message-check-news-header-syntax): Adjust check.
(message-make-fqdn): Be less hilarious.
---

diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index d2353e6cec6..c0e3dfae12d 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -2084,7 +2084,7 @@ This optional header will be computed by Message.
 @vindex user-mail-address
 @findex system-name
 @cindex Sun
-@cindex i-did-not-set--mail-host-address--so-tickle-me
+@cindex mail-host-address-is-not-set
 This required header will be generated by Message.  A unique ID will be
 created based on the date, time, user name (for the local part) and the
 domain part.  For the domain part, message will look (in this order) at
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 9baf09b0268..bcbf7476715 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5357,7 +5357,7 @@ Otherwise, generate and save a value for `canlock-password' first."
    ;; Check "Shoot me".
    (message-check 'shoot
      (if (re-search-forward
-	  "Message-ID.*.i-did-not-set--mail-host-address--so-tickle-me" nil t)
+	  "Message-ID.*.mail-host-address-is-not-set" nil t)
 	 (y-or-n-p "You appear to have a misconfigured system.  Really post? ")
        t))
    ;; Check for Approved.
@@ -6068,8 +6068,7 @@ give as trustworthy answer as possible."
       user-domain)
      ;; Default to this bogus thing.
      (t
-      (concat sysname
-	      ".i-did-not-set--mail-host-address--so-tickle-me")))))
+      (concat sysname ".mail-host-address-is-not-set")))))
 
 (defun message-make-domain ()
   "Return the domain name."