* mail/smtpmail.el (smtpmail-default-smtp-server): Made into a defcustom again for...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b82c58da3ae889d5219679d69860899cb82cacd9..26e8bec79372a9a94fb7776ce6101ea4cae937bf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * mail/smtpmail.el (smtpmail-default-smtp-server): Made into a
+       defcustom again for backwards compatibility.
+
        * simple.el (shell-command-on-region): Fill.
 
        * dired-aux.el (dired-kill-line): Add a doc string.

diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 3fd2d9ddf21a293f6c76bfc17dfa0bd668a76058..1b53b47499bf58d2e2c0966813c952d885757bea 100644 (file)
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -71,9 +71,11 @@
   :group 'mail)
 
 
-(defvar smtpmail-default-smtp-server nil
+(defcustom smtpmail-default-smtp-server nil
   "Specify default SMTP server.
-This only has effect if you specify it before loading the smtpmail library.")
+This only has effect if you specify it before loading the smtpmail library."
+  :type '(choice (const nil) string)
+  :group 'smtpmail)
 
 (defcustom smtpmail-smtp-server
   (or (getenv "SMTPSERVER") smtpmail-default-smtp-server)