[Emacs-diffs] /srv/bzr/emacs/trunk r108353: * paths.el (news-directory, news-path): Move to gnus/nnspool.el.

[Glenn Morris]

------------------------------------------------------------
revno: 108353
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-05-24 00:27:24 -0700
message:
  * paths.el (news-directory, news-path): Move to gnus/nnspool.el.
  
  * gnus/nnspool.el (news-directory, news-path): Move here from paths.el.
  Don't see a need for these to be autoloaded.  This file is the only
  place that uses them, to init another variable.
modified:
  lisp/ChangeLog
  lisp/gnus/ChangeLog
  lisp/gnus/nnspool.el
  lisp/paths.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-24 07:11:19 +0000
+++ b/lisp/ChangeLog    2012-05-24 07:27:24 +0000
@@ -1,5 +1,7 @@
 2012-05-24  Glenn Morris  <address@hidden>
 
+       * paths.el (news-directory, news-path): Move to gnus/nnspool.el.
+
        * paths.el (gnus-default-nntp-server): Remove (gnus.el defines it).
 
        * paths.el (rmail-file-name, rmail-spool-directory): Move from here...

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-05-24 07:11:19 +0000
+++ b/lisp/gnus/ChangeLog       2012-05-24 07:27:24 +0000
@@ -1,5 +1,8 @@
 2012-05-24  Glenn Morris  <address@hidden>
 
+       * nnspool.el (news-directory, news-path): Move here from paths.el.
+       Don't see a need for these to be autoloaded.
+
        * 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.

=== modified file 'lisp/gnus/nnspool.el'
--- a/lisp/gnus/nnspool.el      2012-01-19 07:21:25 +0000
+++ b/lisp/gnus/nnspool.el      2012-05-24 07:27:24 +0000
@@ -31,6 +31,15 @@
 (require 'nnoo)
 (eval-when-compile (require 'cl))
 
+;; Probably this entire thing should be obsolete.
+;; It's only used to init nnspool-spool-directory, so why not just
+;; set that variable's default directly?
+(defvar news-directory (if (file-exists-p "/usr/spool/news/")
+                          "/usr/spool/news/"
+                        "/var/spool/news/")
+  "The root directory below which all news files are stored.")
+(defvaralias 'news-path 'news-directory)
+
 (nnoo-declare nnspool)
 
 (defvoo nnspool-inews-program news-inews-program

=== modified file 'lisp/paths.el'
--- a/lisp/paths.el     2012-05-24 07:11:19 +0000
+++ b/lisp/paths.el     2012-05-24 07:27:24 +0000
@@ -101,13 +101,6 @@
 for initializing `Info-directory-list' when Info is started, unless
 the environment variable INFOPATH is set.")
 
-(defvar news-directory
-  (purecopy (if (file-exists-p "/usr/spool/news/")
-      "/usr/spool/news/"
-    "/var/spool/news/"))
-  "The root directory below which all news files are stored.")
-(defvaralias 'news-path 'news-directory)
-
 (defvar news-inews-program
   (purecopy
   (cond ((file-exists-p "/usr/bin/inews") "/usr/bin/inews")