[Emacs-diffs] /srv/bzr/emacs/trunk r108350: Move some rmail variables from paths.el to rmail.el

[Glenn Morris]

------------------------------------------------------------
revno: 108350
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-05-23 23:53:08 -0700
message:
  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.
modified:
  lisp/ChangeLog
  lisp/mail/rmail.el
  lisp/paths.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-24 06:42:26 +0000
+++ b/lisp/ChangeLog    2012-05-24 06:53:08 +0000
@@ -1,5 +1,9 @@
 2012-05-24  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el        2012-05-09 03:06:08 +0000
+++ b/lisp/mail/rmail.el        2012-05-24 06:53:08 +0000
@@ -100,8 +100,6 @@
   "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 @@
   :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

=== modified file 'lisp/paths.el'
--- a/lisp/paths.el     2012-05-24 06:42:26 +0000
+++ b/lisp/paths.el     2012-05-24 06:53:08 +0000
@@ -123,27 +123,6 @@
 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