[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108354: * paths.el (news-inews-program): Move to gnus/nnspool.el.

[Glenn Morris]

------------------------------------------------------------
revno: 108354
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-05-24 00:31:45 -0700
message:
  * paths.el (news-inews-program): Move to gnus/nnspool.el.
  
  * gnus/nnspool.el (news-inews-program): Move here from paths.el.
  Don't see a need for this to be autoloaded.  (Or even to exist; it is
  only used 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:27:24 +0000
+++ b/lisp/ChangeLog    2012-05-24 07:31:45 +0000
@@ -1,6 +1,7 @@
 2012-05-24  Glenn Morris  <address@hidden>
 
-       * paths.el (news-directory, news-path): Move to gnus/nnspool.el.
+       * paths.el (news-directory, news-path, news-inews-program):
+       Move to gnus/nnspool.el.
 
        * paths.el (gnus-default-nntp-server): Remove (gnus.el defines it).
 

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-05-24 07:27:24 +0000
+++ b/lisp/gnus/ChangeLog       2012-05-24 07:31:45 +0000
@@ -1,7 +1,7 @@
 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.
+       * nnspool.el (news-directory, news-path, news-inews-program):
+       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

=== modified file 'lisp/gnus/nnspool.el'
--- a/lisp/gnus/nnspool.el      2012-05-24 07:27:24 +0000
+++ b/lisp/gnus/nnspool.el      2012-05-24 07:31:45 +0000
@@ -40,6 +40,16 @@
   "The root directory below which all news files are stored.")
 (defvaralias 'news-path 'news-directory)
 
+;; Ditto re obsolescence.
+(defvar news-inews-program
+  (cond ((file-exists-p "/usr/bin/inews") "/usr/bin/inews")
+       ((file-exists-p "/usr/local/inews") "/usr/local/inews")
+       ((file-exists-p "/usr/local/bin/inews") "/usr/local/bin/inews")
+       ((file-exists-p "/usr/contrib/lib/news/inews") 
"/usr/contrib/lib/news/inews")
+       ((file-exists-p "/usr/lib/news/inews") "/usr/lib/news/inews")
+       (t "inews"))
+  "Program to post news.")
+
 (nnoo-declare nnspool)
 
 (defvoo nnspool-inews-program news-inews-program

=== modified file 'lisp/paths.el'
--- a/lisp/paths.el     2012-05-24 07:27:24 +0000
+++ b/lisp/paths.el     2012-05-24 07:31:45 +0000
@@ -101,16 +101,6 @@
 for initializing `Info-directory-list' when Info is started, unless
 the environment variable INFOPATH is set.")
 
-(defvar news-inews-program
-  (purecopy
-  (cond ((file-exists-p "/usr/bin/inews") "/usr/bin/inews")
-       ((file-exists-p "/usr/local/inews") "/usr/local/inews")
-       ((file-exists-p "/usr/local/bin/inews") "/usr/local/bin/inews")
-       ((file-exists-p "/usr/contrib/lib/news/inews") 
"/usr/contrib/lib/news/inews")
-       ((file-exists-p "/usr/lib/news/inews") "/usr/lib/news/inews")
-       (t "inews")))
-  "Program to post news.")
-
 (defcustom remote-shell-program
   (purecopy
   (cond