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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 423891d1baf26b72a3b742f749bd7e0ae3951485..709d6ff728e552343e6ef9022d9978e699d54515 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-05-24  Glenn Morris  <rgm@gnu.org>
 
+       * paths.el (gnus-default-nntp-server): Remove (gnus.el defines it).
+
        * paths.el (rmail-file-name, rmail-spool-directory): Move from here...
        * mail/rmail.el (rmail-file-name, rmail-spool-directory): ... to here.
        Make the latter a defcustom, with a delayed initialization.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9000ccb9fefce273921219f38ef5dd0e46ac0592..4a5d86db12ac9e05803f785350886d72bb4f7215 100644 (file)
--- 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 635bb6fc96f9ceaf0c11d003b9534184edb3d10e..bba56e31d9baa67b85b8af2a2e26f40980ec183b 100644 (file)
--- 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

diff --git a/lisp/paths.el b/lisp/paths.el
index 670da89b5dd758ceca96a2343f4509b627c1992f..f343809b79e87eb16b9e4caeb06cbe3905bd9e9c 100644 (file)
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -118,12 +118,6 @@ the environment variable INFOPATH is set.")
        (t "inews")))
   "Program to post news.")
 
-;; set this to your local server
-(defvar gnus-default-nntp-server (purecopy "") "\
-The name of the host running an NNTP server.
-The null string means use the local host as the server site.")
-
-
 (defcustom remote-shell-program
   (purecopy
   (cond