From 132b3a9ace018a120e1b30fc94c8c98904509884 Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 14 Apr 2018 15:52:16 +0200
Subject: [PATCH] Change the default From style to `angles' and make obsolete

* lisp/gnus/message.el (message-from-style): Make `angles' the
default (bug#29309) and mark as obsolete.

* lisp/mail/sendmail.el (mail-from-style): Ditto.
---
 lisp/gnus/message.el  | 8 ++++++--
 lisp/mail/sendmail.el | 7 +++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index f7c3ec04ffc..a5f1dfb103f 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -156,7 +156,7 @@ If this variable is nil, no such courtesy message will be added."
   :group 'message-interface
   :type 'regexp)
 
-(defcustom message-from-style mail-from-style
+(defcustom message-from-style 'angles
   "Specifies how \"From\" headers look.
 
 If nil, they contain just the return address like:
@@ -168,12 +168,16 @@ If `angles', they look like:
 
 Otherwise, most addresses look like `angles', but they look like
 `parens' if `angles' would need quoting and `parens' would not."
-  :version "23.2"
+  :version "27.1"
   :type '(choice (const :tag "simple" nil)
 		 (const parens)
 		 (const angles)
 		 (const default))
   :group 'message-headers)
+(make-obsolete-variable
+ 'message-from-style
+ "Only the `angles' value is valid according to RFC2822" "27.1")
+
 
 (defcustom message-insert-canlock t
   "Whether to insert a Cancel-Lock header in news postings."
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 212a6c74baa..cfbefd91d93 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -55,7 +55,7 @@
   :type 'file)
 
 ;;;###autoload
-(defcustom mail-from-style 'default
+(defcustom mail-from-style 'angles
   "Specifies how \"From:\" fields look.
 
 If nil, they contain just the return address like:
@@ -72,8 +72,11 @@ Otherwise, most addresses look like `angles', but they look like
 		 (const parens)
 		 (const angles)
 		 (const default))
-  :version "20.3"
+  :version "27.1"
   :group 'sendmail)
+(make-obsolete-variable
+ 'mail-from-style
+ "Only the `angles' value is valid according to RFC2822" "27.1")
 
 ;;;###autoload
 (defcustom mail-specify-envelope-from nil
-- 
2.39.5