diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-05-24 00:11:19 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-05-24 00:11:19 -0700 |
| commit | f8815e4c9b3006c2dd4727d8c602c9afc7c65a8c (patch) | |
| tree | cfeed5568c6897af161451abb0b1f394a96baf77 /lisp/gnus | |
| parent | c8f3b42c71188f634f645aaeac2c656bf5d2691f (diff) | |
| download | emacs-f8815e4c9b3006c2dd4727d8c602c9afc7c65a8c.tar.gz | |
No need to define gnus-default-nntp-server in paths.el
Don't see a need for this to be autoloaded, since it is only used in
gnus.el (in one place, as a fallback). Maybe it should be obsolete?
* paths.el (gnus-default-nntp-server): Remove (gnus.el defines it).
* gnus/gnus.el (gnus-default-nntp-server): Make it a defcustom.
Merge in doc from paths.el version.
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/gnus/gnus.el | 21 |
2 files changed, 20 insertions, 9 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 9000ccb9fef..4a5d86db12a 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2012-05-24 Glenn Morris <rgm@gnu.org> + + * gnus.el (gnus-default-nntp-server): Make it a defcustom. + Merge in doc from paths.el version. Don't see any need for this to be + autoloaded, or for the warning about users not setting it. + 2012-05-04 Paul Eggert <eggert@cs.ucla.edu> Fix minor Y10k bug. @@ -22655,7 +22661,7 @@ See ChangeLog.2 for earlier changes. - Copyright (C) 2004-2012 Free Software Foundation, Inc. + Copyright (C) 2004-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 635bb6fc96f..bba56e31d9b 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -1271,15 +1271,18 @@ Set this variable in `.emacs' instead." :type '(choice (const :tag "current" nil) directory)) -;; Site dependent variables. These variables should be defined in -;; paths.el. +;; Site dependent variables. -(defvar gnus-default-nntp-server nil - "Specify a default NNTP server. -This variable should be defined in paths.el, and should never be set -by the user. -If you want to change servers, you should use `gnus-select-method'. -See the documentation to that variable.") +;; Should this be obsolete? +(defcustom gnus-default-nntp-server nil + "The hostname of the default NNTP server. +The empty string, or nil, means to use the local host. +You may wish to set this on a site-wide basis. + +If you want to change servers, you should use `gnus-select-method'." + :group 'gnus-server + :type '(choice (const :tag "local host" nil) + (string :tag "host name"))) (defcustom gnus-nntpserver-file "/etc/nntpserver" "A file with only the name of the nntp server in it." @@ -1326,6 +1329,8 @@ If you use this variable, you must set `gnus-nntp-server' to nil. There is a lot more to know about select methods and virtual servers - see the manual for details." + ;; Emacs has set-after since 22.1. + ;set-after '(gnus-default-nntp-server) :group 'gnus-server :group 'gnus-start :initialize 'custom-initialize-default |