2 files changed, 15 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 41b1874282a..c181aac7387 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2001-05-07  Gerd Moellmann  <gerd@gnu.org>
 
+        * mail/smtpmail.el (smtpmail-warn-about-unknown-extensions): New
+        option.
+        (smtpmail-via-smtp): Print warnings about unknown SMTP extensions
+        only if smtpmail-warn-about-unknown-extensions is set.
+
         * mail/rmail.el (rmail-mode-map): Use rmail-sort-by-labels
         instead of rmail-sort-by-keywords.
 
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 6f53489571b..72c9d5c1964 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -2,7 +2,7 @@
 ;;; ### Hacked by Mike Taylor, 11th October 1999 to add support for
 ;;;     automatically appending a domain to RCPT TO: addresses.
 
-;; Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 2001 Free Software Foundation, Inc.
 
 ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp>
 ;; Maintainer: Brian D. Carlstrom <bdc@ai.mit.edu>
@@ -121,6 +121,13 @@ and sent with `smtpmail-send-queued-mail'."
   :type 'directory
   :group 'smtpmail)
 
+(defcustom smtpmail-warn-about-unknown-extensions nil
+  "*If set, print warnings about unknown SMTP extensions.
+This is mainly useful for development purposes, to learn about
+new SMTP extensions that might be useful to support."
+  :type 'boolean
+  :group 'smtpmail)
+
 (defvar smtpmail-queue-index-file "index"
   "File name of queued mail index,
 This is relative to `smtpmail-queue-dir'.")
@@ -393,8 +400,8 @@ This is relative to `smtpmail-queue-dir'.")
                                                   help xusr))
                                 (setq supported-extensions
                                       (cons name supported-extensions)))
-                               (t (message "unknown extension %s"
-                                           name)))))
+                               (smtpmail-warn-about-unknown-extensions
+                                (message "Unknown extension %s" name)))))
                   (setq extension-lines (cdr extension-lines)))))
 
             (if (or (member 'onex supported-extensions)