From ee2f89a66507839a1234a1ff5b96b20776fcd5ef Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 24 May 2012 00:31:45 -0700 Subject: [PATCH] * 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.) --- lisp/ChangeLog | 3 ++- lisp/gnus/ChangeLog | 4 ++-- lisp/gnus/nnspool.el | 10 ++++++++++ lisp/paths.el | 10 ---------- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5d065a617a6..1b3b9f9e07d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,7 @@ 2012-05-24 Glenn Morris - * 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). diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index f990c82e665..e096b9b2b26 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,7 +1,7 @@ 2012-05-24 Glenn Morris - * 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 diff --git a/lisp/gnus/nnspool.el b/lisp/gnus/nnspool.el index 3c197b92b27..fd079d909eb 100644 --- a/lisp/gnus/nnspool.el +++ b/lisp/gnus/nnspool.el @@ -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 diff --git a/lisp/paths.el b/lisp/paths.el index ec5b3f4c5dd..5269933d245 100644 --- a/lisp/paths.el +++ b/lisp/paths.el @@ -101,16 +101,6 @@ This variable `Info-default-directory-list' is used as the default 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 -- 2.11.4.GIT