Move some rmail variables from paths.el to rmail.el

Ref eg
http://lists.gnu.org/archive/html/emacs-devel/2004-10/msg00620.html

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

3 files changed, 29 insertions, 23 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc83b323396..423891d1baf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2012-05-24  Glenn Morris  <rgm@gnu.org>
 
+	* 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.
+
 	* paths.el (gnus-nntp-service, gnus-local-organization): Remove.
 	These were deleted from Gnus itself late 2010.
 
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 14bf9d90a16..ad364edeea1 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -100,8 +100,6 @@ its character representation and its display representation.")
   "The current header display style choice, one of
 'normal (selected headers) or 'full (all headers).")
 
-;; rmail-spool-directory and rmail-file-name are defined in paths.el.
-
 (defgroup rmail nil
   "Mail reader for Emacs."
   :group 'mail)
@@ -143,6 +141,31 @@ its character representation and its display representation.")
   :prefix "rmail-edit-"
   :group 'rmail)
 
+;;;###autoload
+(defcustom rmail-file-name (purecopy "~/RMAIL")
+  "Name of user's primary mail file."
+  :type 'string
+  :group 'rmail
+  :version "21.1")
+
+;;;###autoload
+(defcustom rmail-spool-directory
+  (purecopy
+  (cond ((file-exists-p "/var/mail")
+	 ;; SVR4 and recent BSD are said to use this.
+	 ;; Rather than trying to know precisely which systems use it,
+	 ;; let's assume this dir is never used for anything else.
+	 "/var/mail/")
+	;; Many GNU/Linux systems use this name.
+	((file-exists-p "/var/spool/mail") "/var/spool/mail/")
+	((memq system-type '(hpux usg-unix-v irix)) "/usr/mail/")
+	(t "/usr/spool/mail/")))
+  "Name of directory used by system mailer for delivering new mail.
+Its name should end with a slash."
+  :initialize 'custom-initialize-delay
+  :type 'directory
+  :group 'rmail)
+
 (defcustom rmail-movemail-program nil
   "If non-nil, the file name of the `movemail' program."
   :group 'rmail-retrieve
diff --git a/lisp/paths.el b/lisp/paths.el
index 23b24f2819a..670da89b5dd 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -123,27 +123,6 @@ the environment variable INFOPATH is set.")
 The name of the host running an NNTP server.
 The null string means use the local host as the server site.")
 
-(defcustom rmail-file-name (purecopy "~/RMAIL") "\
-Name of user's primary mail file."
-  :type 'string
-  :group 'rmail
-  :version "21.1")
-
-(defvar rmail-spool-directory
-  (purecopy
-  (cond ((file-exists-p "/var/mail")
-	 ;; SVR4 and recent BSD are said to use this.
-	 ;; Rather than trying to know precisely which systems use it,
-	 ;; let's assume this dir is never used for anything else.
-	 "/var/mail/")
-	;; Many GNU/Linux systems use this name.
-	((file-exists-p "/var/spool/mail")
-	 "/var/spool/mail/")
-	((memq system-type '(hpux usg-unix-v irix))
-	 "/usr/mail/")
-	(t "/usr/spool/mail/")))
-  "Name of directory used by system mailer for delivering new mail.
-Its name should end with a slash.")
 
 (defcustom remote-shell-program
   (purecopy