procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
Glenn Morris 2012-05-23 23:53:08 -07:00
parent 6df9112c19
commit c8f3b42c71
3 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

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

27
lisp/mail/rmail.el
View file

@ -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

21
lisp/paths.el
View file

@ -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