aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-06 23:34:13 +0200
committerLars Magne Ingebrigtsen2011-07-06 23:34:13 +0200
commit4906cd3d170f550150b28a22c2000dd0b4ff326f (patch)
treeec63acd5df22a1682a4bc6802e3129d4ad60c76e
parente0457abee89abfe781a02de58ca6c35041e0e5d9 (diff)
downloademacs-4906cd3d170f550150b28a22c2000dd0b4ff326f.tar.gz
emacs-4906cd3d170f550150b28a22c2000dd0b4ff326f.zip
* mail/smtpmail.el (smtpmail-default-smtp-server): Made into a defcustom again for backwards compatibility.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/mail/smtpmail.el6
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b82c58da3ae..26e8bec7937 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12011-07-06 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-06 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * mail/smtpmail.el (smtpmail-default-smtp-server): Made into a
4 defcustom again for backwards compatibility.
5
3 * simple.el (shell-command-on-region): Fill. 6 * simple.el (shell-command-on-region): Fill.
4 7
5 * dired-aux.el (dired-kill-line): Add a doc string. 8 * dired-aux.el (dired-kill-line): Add a doc string.
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 3fd2d9ddf21..1b53b47499b 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -71,9 +71,11 @@
71 :group 'mail) 71 :group 'mail)
72 72
73 73
74(defvar smtpmail-default-smtp-server nil 74(defcustom smtpmail-default-smtp-server nil
75 "Specify default SMTP server. 75 "Specify default SMTP server.
76This only has effect if you specify it before loading the smtpmail library.") 76This only has effect if you specify it before loading the smtpmail library."
77 :type '(choice (const nil) string)
78 :group 'smtpmail)
77 79
78(defcustom smtpmail-smtp-server 80(defcustom smtpmail-smtp-server
79 (or (getenv "SMTPSERVER") smtpmail-default-smtp-server) 81 (or (getenv "SMTPSERVER") smtpmail-default-smtp-server)