[Emacs-diffs] /srv/bzr/emacs/trunk r108351: No need to define gnus-default-nntp-server in paths.el

[Glenn Morris]

------------------------------------------------------------
revno: 108351
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-05-24 00:11:19 -0700
message:
  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.
modified:
  lisp/ChangeLog
  lisp/gnus/ChangeLog
  lisp/gnus/gnus.el
  lisp/paths.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-24 06:53:08 +0000
+++ b/lisp/ChangeLog    2012-05-24 07:11:19 +0000
@@ -1,5 +1,7 @@
 2012-05-24  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-05-04 06:13:18 +0000
+++ b/lisp/gnus/ChangeLog       2012-05-24 07:11:19 +0000
@@ -1,3 +1,9 @@
+2012-05-24  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        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.
 

=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2012-04-21 07:55:02 +0000
+++ b/lisp/gnus/gnus.el 2012-05-24 07:11:19 +0000
@@ -1271,15 +1271,18 @@
   :type '(choice (const :tag "current" nil)
                 directory))
 
-;; Site dependent variables.  These variables should be defined in
-;; paths.el.
-
-(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.")
+;; Site dependent variables.
+
+;; 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 @@
 
 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

=== modified file 'lisp/paths.el'
--- a/lisp/paths.el     2012-05-24 06:53:08 +0000
+++ b/lisp/paths.el     2012-05-24 07:11:19 +0000
@@ -118,12 +118,6 @@
        (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