procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

No need to define gnus-default-nntp-server in paths.el

Browse source 
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.
This commit is contained in:
Glenn Morris 2012-05-24 00:11:19 -07:00
parent c8f3b42c71
commit f8815e4c9b
4 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ChangeLog
View file

@ -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.

8
lisp/gnus/ChangeLog
View file

@ -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.

21
lisp/gnus/gnus.el
View file

@ -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

6
lisp/paths.el
View file

@ -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