[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-commit] emacs/lisp/mh-e mh-init.el mh-customize.el Chan...
From: |
Bill Wohler |
Subject: |
[Emacs-commit] emacs/lisp/mh-e mh-init.el mh-customize.el Chan... |
Date: |
Fri, 09 Dec 2005 20:41:44 -0500 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Branch:
Changes by: Bill Wohler <address@hidden> 05/12/10 01:41:43
Modified files:
lisp/mh-e : mh-init.el mh-customize.el ChangeLog
Log message:
* mh-customize.el (mh-path): Move here from mh-init.el.
(mh-variant): Mention that mh-path can be customized.
(mh-invisible-header-fields-internal): Add X-ContentStamp,
X-MAIL-INFO, and X-UNTD- from NetZero.
* mh-init.el (mh-path): Move defcustom to mh-customize.el.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/mh-e/mh-init.el.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/mh-e/mh-customize.el.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.73 emacs/lisp/mh-e/ChangeLog:1.74
--- emacs/lisp/mh-e/ChangeLog:1.73 Mon Dec 5 02:26:03 2005
+++ emacs/lisp/mh-e/ChangeLog Sat Dec 10 01:41:43 2005
@@ -1,3 +1,12 @@
+2005-12-09 Bill Wohler <address@hidden>
+
+ * mh-customize.el (mh-path): Move here from mh-init.el.
+ (mh-variant): Mention that mh-path can be customized.
+ (mh-invisible-header-fields-internal): Add X-ContentStamp,
+ X-MAIL-INFO, and X-UNTD- from NetZero.
+
+ * mh-init.el (mh-path): Move defcustom to mh-customize.el.
+
2005-12-04 Bill Wohler <address@hidden>
* mh-customize.el (mh-sortm-args): Sync docstrings with manual.
Index: emacs/lisp/mh-e/mh-customize.el
diff -u emacs/lisp/mh-e/mh-customize.el:1.41
emacs/lisp/mh-e/mh-customize.el:1.42
--- emacs/lisp/mh-e/mh-customize.el:1.41 Mon Dec 5 02:26:03 2005
+++ emacs/lisp/mh-e/mh-customize.el Sat Dec 10 01:41:43 2005
@@ -260,15 +260,21 @@
(eval-when (compile)
(setq mh-variant 'none))
+(defcustom mh-path nil
+ "*Additional list of directories to search for MH.
+See `mh-variant'."
+ :group 'mh-e
+ :type '(repeat (directory)))
+
(defcustom mh-variant 'autodetect
"*Specifies the variant used by MH-E.
The default setting of this option is `Auto-detect' which means that MH-E will
automatically choose the first of nmh, MH, or GNU mailutils that it finds in
-the directories listed in `mh-path', `mh-sys-path', and `exec-path'. If, for
-example, you have both nmh and mailutils installed and `mh-variant-in-use' was
-initialized to nmh but you want to use mailutils, then you can set this option
-to `mailutils'.
+the directories listed in `mh-path' (which you can customize), `mh-sys-path',
+and `exec-path'. If, for example, you have both nmh and mailutils installed
+and `mh-variant-in-use' was initialized to nmh but you want to use mailutils,
+then you can set this option to `mailutils'.
When this variable is changed, MH-E resets `mh-progs', `mh-lib',
`mh-lib-progs', `mh-flists-present-flag', and `mh-variant-in-use'
@@ -1421,6 +1427,7 @@
"X-Bogosity:" ; bogofilter
"X-Bugzilla-*" ; Bugzilla
"X-Complaints-To:"
+ "X-ContentStamp:" ; NetZero
"X-Cron-Env:"
"X-DMCA"
"X-Delivered"
@@ -1453,6 +1460,7 @@
"X-Listprocessor-" ; ListProc(tm) by CREN
"X-Listserver:" ; Unknown mailing list managers
"X-Loop:" ; Unknown mailing list managers
+ "X-MAIL-INFO:" ; NetZero
"X-MHE-Checksum" ; Checksum added during index search
"X-MIME-Autoconverted:" ; sendmail
"X-MIMETrack:"
@@ -1506,6 +1514,7 @@
"X-Trace:"
"X-UID"
"X-UIDL:"
+ "X-UNTD-" ; NetZero
"X-USANET-" ; usa.net
"X-UserInfo1:"
"X-Virus-Scanned" ; amavisd-new
Index: emacs/lisp/mh-e/mh-init.el
diff -u emacs/lisp/mh-e/mh-init.el:1.14 emacs/lisp/mh-e/mh-init.el:1.15
--- emacs/lisp/mh-e/mh-init.el:1.14 Fri Dec 2 04:55:39 2005
+++ emacs/lisp/mh-e/mh-init.el Sat Dec 10 01:41:43 2005
@@ -73,6 +73,31 @@
;;;###autoload
(put 'mh-lib-progs 'risky-local-variable t)
+(defvar mh-variants nil
+ "List describing known MH variants.
+Created by the function `mh-variants'")
+
+;;;###mh-autoload
+(defun mh-variants ()
+ "Return a list of installed variants of MH on the system.
+This function looks for MH in `mh-sys-path', `mh-path' and
+`exec-path'. The format of the list of variants that is returned is described
+by the variable `mh-variants'."
+ (if mh-variants
+ mh-variants
+ (let ((list-unique))
+ ;; Make a unique list of directories, keeping the given order.
+ ;; We don't want the same MH variant to be listed multiple times.
+ (loop for dir in (append mh-path mh-sys-path exec-path) do
+ (setq dir (file-chase-links (directory-file-name dir)))
+ (add-to-list 'list-unique dir))
+ (loop for dir in (nreverse list-unique) do
+ (when (and dir (file-directory-p dir) (file-readable-p dir))
+ (let ((variant (mh-variant-info dir)))
+ (if variant
+ (add-to-list 'mh-variants variant)))))
+ mh-variants)))
+
(defvar mh-variant-in-use nil
"The MH variant currently in use; a string with variant and version number.
This differs from `mh-variant' when the latter is set to `autodetect'.")
@@ -171,17 +196,6 @@
There's no need for users to modify this list. Instead add extra
directories to the customizable variable `mh-path'.")
-(defcustom mh-path nil
- "*List of directories to search for variants of the MH variant.
-The directories will be searched for `mhparam' in addition to directories
-listed in `mh-sys-path' and `exec-path'."
- :group 'mh-e
- :type '(repeat (directory)))
-
-(defvar mh-variants nil
- "List describing known MH variants.
-Created by the function `mh-variants'")
-
(defun mh-variant-mh-info (dir)
"Return info for MH variant in DIR assuming a temporary buffer is setup."
;; MH does not have the -version option.
@@ -280,27 +294,6 @@
((mh-variant-mh-info dir))
((mh-variant-nmh-info dir))
((mh-variant-mu-mh-info dir))))))
-
-;;;###mh-autoload
-(defun mh-variants ()
- "Return a list of installed variants of MH on the system.
-This function looks for MH in `mh-sys-path', `mh-path' and
-`exec-path'. The format of the list of variants that is returned is described
-by the variable `mh-variants'."
- (if mh-variants
- mh-variants
- (let ((list-unique))
- ;; Make a unique list of directories, keeping the given order.
- ;; We don't want the same MH variant to be listed multiple times.
- (loop for dir in (append mh-path mh-sys-path exec-path) do
- (setq dir (file-chase-links (directory-file-name dir)))
- (add-to-list 'list-unique dir))
- (loop for dir in (nreverse list-unique) do
- (when (and dir (file-directory-p dir) (file-readable-p dir))
- (let ((variant (mh-variant-info dir)))
- (if variant
- (add-to-list 'mh-variants variant)))))
- mh-variants)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-commit] emacs/lisp/mh-e mh-init.el mh-customize.el Chan...,
Bill Wohler <=