aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wohler2006-04-18 00:55:43 +0000
committerBill Wohler2006-04-18 00:55:43 +0000
commitc90c4cf168b968b144796515355e4cd2e898b613 (patch)
tree64e6e4f2bfedea4e0bfa19f2c4d37883f41bd4c9
parentb2853b3c5a453f8b927b59dd478d4c64bb98e147 (diff)
downloademacs-c90c4cf168b968b144796515355e4cd2e898b613.tar.gz
emacs-c90c4cf168b968b144796515355e4cd2e898b613.zip
* mh-acros.el (mh-defun-compat): Rename to defun-mh in order that
variables and functions with the same name are found correctly by find-func (invoked by clicking on the filename link in the *Help* buffer. (mh-defmacro-compat): Rename to defmacro-mh. Ditto. * mh-e.el: (mh-defgroup): Rename to defgroup-mh. Ditto. (mh-defcustom): Rename to defcustom-mh. Ditto. (mh-defface): Rename to defface-mh. Ditto. (mh-font-lock-add-keywords): Make changes according to these renamings. * mh-e.el, mh-compat.el, mh-gnus.el: Use the new names (closes SF #1472029).
Diffstat
-rw-r--r--lisp/mh-e/ChangeLog14
-rw-r--r--lisp/mh-e/mh-acros.el8
-rw-r--r--lisp/mh-e/mh-compat.el20
-rw-r--r--lisp/mh-e/mh-e.el338
-rw-r--r--lisp/mh-e/mh-gnus.el24
5 files changed, 209 insertions, 195 deletions
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index f313896c7a6..c56f68b73be 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,5 +1,19 @@
12006-04-17 Bill Wohler <wohler@newt.com> 12006-04-17 Bill Wohler <wohler@newt.com>
2 2
3 * mh-acros.el (mh-defun-compat): Rename to defun-mh in order that
4 variables and functions with the same name are found correctly by
5 find-func (invoked by clicking on the filename link in the *Help*
6 buffer).
7 (mh-defmacro-compat): Rename to defmacro-mh. Ditto.
8 * mh-e.el: (mh-defgroup): Rename to defgroup-mh. Ditto.
9 (mh-defcustom): Rename to defcustom-mh. Ditto.
10 (mh-defface): Rename to defface-mh. Ditto.
11 (mh-font-lock-add-keywords): Make changes according to these
12 renamings.
13
14 * mh-e.el, mh-compat.el, mh-gnus.el: Use the new names (closes SF
15 #1472029).
16
3 * mh-utils.el (mh-sub-folders-actual): Mention that folder must 17 * mh-utils.el (mh-sub-folders-actual): Mention that folder must
4 have been processed by mh-normalize-folder-name. 18 have been processed by mh-normalize-folder-name.
5 (mh-folder-completion-function): Handle completion of folders with 19 (mh-folder-completion-function): Handle completion of folders with
diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el
index 41fadc1ec99..9fa69fae5d9 100644
--- a/lisp/mh-e/mh-acros.el
+++ b/lisp/mh-e/mh-acros.el
@@ -82,7 +82,7 @@ loads \"cl\" appropriately."
82 (funcall ',function ,@args)))) 82 (funcall ',function ,@args))))
83 83
84;;;###mh-autoload 84;;;###mh-autoload
85(defmacro mh-defun-compat (name function arg-list &rest body) 85(defmacro defun-mh (name function arg-list &rest body)
86 "Create function NAME. 86 "Create function NAME.
87If FUNCTION exists, then NAME becomes an alias for FUNCTION. 87If FUNCTION exists, then NAME becomes an alias for FUNCTION.
88Otherwise, create function NAME with ARG-LIST and BODY." 88Otherwise, create function NAME with ARG-LIST and BODY."
@@ -90,10 +90,10 @@ Otherwise, create function NAME with ARG-LIST and BODY."
90 (if defined-p 90 (if defined-p
91 `(defalias ',name ',function) 91 `(defalias ',name ',function)
92 `(defun ,name ,arg-list ,@body)))) 92 `(defun ,name ,arg-list ,@body))))
93(put 'mh-defun-compat 'lisp-indent-function 'defun) 93(put 'defun-mh 'lisp-indent-function 'defun)
94 94
95;;;###mh-autoload 95;;;###mh-autoload
96(defmacro mh-defmacro-compat (name macro arg-list &rest body) 96(defmacro defmacro-mh (name macro arg-list &rest body)
97 "Create macro NAME. 97 "Create macro NAME.
98If MACRO exists, then NAME becomes an alias for MACRO. 98If MACRO exists, then NAME becomes an alias for MACRO.
99Otherwise, create macro NAME with ARG-LIST and BODY." 99Otherwise, create macro NAME with ARG-LIST and BODY."
@@ -101,7 +101,7 @@ Otherwise, create macro NAME with ARG-LIST and BODY."
101 (if defined-p 101 (if defined-p
102 `(defalias ',name ',macro) 102 `(defalias ',name ',macro)
103 `(defmacro ,name ,arg-list ,@body)))) 103 `(defmacro ,name ,arg-list ,@body))))
104(put 'mh-defmacro-compat 'lisp-indent-function 'defun) 104(put 'defmacro-mh 'lisp-indent-function 'defun)
105 105
106 106
107 107
diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el
index 560a7fd4709..b346a41fad7 100644
--- a/lisp/mh-e/mh-compat.el
+++ b/lisp/mh-e/mh-compat.el
@@ -62,7 +62,7 @@ Simulate NOERROR argument in XEmacs which lacks it."
62 (load filename noerror t) 62 (load filename noerror t)
63 (load (format "%s" feature) noerror t))))) 63 (load (format "%s" feature) noerror t)))))
64 64
65(mh-defun-compat mh-assoc-string assoc-string (key list case-fold) 65(defun-mh mh-assoc-string assoc-string (key list case-fold)
66 "Like `assoc' but specifically for strings. 66 "Like `assoc' but specifically for strings.
67Case is ignored if CASE-FOLD is non-nil. 67Case is ignored if CASE-FOLD is non-nil.
68This function is used by Emacs versions that lack `assoc-string', 68This function is used by Emacs versions that lack `assoc-string',
@@ -77,7 +77,7 @@ introduced in Emacs 22."
77 'cancel-timer 77 'cancel-timer
78 'delete-itimer)) 78 'delete-itimer))
79 79
80(mh-defun-compat mh-display-color-cells display-color-cells (&optional display) 80(defun-mh mh-display-color-cells display-color-cells (&optional display)
81 "Return the number of color cells supported by DISPLAY. 81 "Return the number of color cells supported by DISPLAY.
82This function is used by XEmacs to return 2 when 82This function is used by XEmacs to return 2 when
83`device-color-cells' returns nil. This happens when compiling or 83`device-color-cells' returns nil. This happens when compiling or
@@ -115,12 +115,12 @@ introduced in Emacs 22."
115 `(face-background ,face ,frame) 115 `(face-background ,face ,frame)
116 `(face-background ,face ,frame ,inherit))) 116 `(face-background ,face ,frame ,inherit)))
117 117
118(mh-defun-compat mh-font-lock-add-keywords font-lock-add-keywords 118(defun-mh mh-font-lock-add-keywords font-lock-add-keywords
119 (mode keywords &optional how) 119 (mode keywords &optional how)
120 "XEmacs does not have `font-lock-add-keywords'. 120 "XEmacs does not have `font-lock-add-keywords'.
121This function returns nil on that system.") 121This function returns nil on that system.")
122 122
123(mh-defun-compat mh-image-load-path-for-library 123(defun-mh mh-image-load-path-for-library
124 image-load-path-for-library (library image &optional path no-error) 124 image-load-path-for-library (library image &optional path no-error)
125 "Return a suitable search path for images used by LIBRARY. 125 "Return a suitable search path for images used by LIBRARY.
126 126
@@ -215,7 +215,7 @@ compatibility with versions of Emacs that lack the variable
215 (nconc (list image-directory) 215 (nconc (list image-directory)
216 (delete image-directory (copy-sequence (or path load-path)))))) 216 (delete image-directory (copy-sequence (or path load-path))))))
217 217
218(mh-defun-compat mh-image-search-load-path 218(defun-mh mh-image-search-load-path
219 image-search-load-path (file &optional path) 219 image-search-load-path (file &optional path)
220 "Emacs 21 and XEmacs don't have `image-search-load-path'. 220 "Emacs 21 and XEmacs don't have `image-search-load-path'.
221This function returns nil on those systems." 221This function returns nil on those systems."
@@ -234,13 +234,13 @@ This function returns nil on those systems."
234 'point-at-eol)) 234 'point-at-eol))
235 235
236(mh-require 'mailabbrev nil t) 236(mh-require 'mailabbrev nil t)
237(mh-defun-compat mh-mail-abbrev-make-syntax-table 237(defun-mh mh-mail-abbrev-make-syntax-table
238 mail-abbrev-make-syntax-table () 238 mail-abbrev-make-syntax-table ()
239 "Emacs 21 and XEmacs don't have `mail-abbrev-make-syntax-table'. 239 "Emacs 21 and XEmacs don't have `mail-abbrev-make-syntax-table'.
240This function returns nil on those systems." 240This function returns nil on those systems."
241 nil) 241 nil)
242 242
243(mh-defun-compat mh-match-string-no-properties 243(defun-mh mh-match-string-no-properties
244 match-string-no-properties (num &optional string) 244 match-string-no-properties (num &optional string)
245 "Return string of text matched by last search, without text properties. 245 "Return string of text matched by last search, without text properties.
246This function is used by XEmacs that lacks `match-string-no-properties'. 246This function is used by XEmacs that lacks `match-string-no-properties'.
@@ -249,7 +249,7 @@ The argument STRING is ignored."
249 (buffer-substring-no-properties 249 (buffer-substring-no-properties
250 (match-beginning num) (match-end num))) 250 (match-beginning num) (match-end num)))
251 251
252(mh-defun-compat mh-replace-regexp-in-string replace-regexp-in-string 252(defun-mh mh-replace-regexp-in-string replace-regexp-in-string
253 (regexp rep string &optional fixedcase literal subexp start) 253 (regexp rep string &optional fixedcase literal subexp start)
254 "Replace REGEXP with REP everywhere in STRING and return result. 254 "Replace REGEXP with REP everywhere in STRING and return result.
255This function is used by XEmacs that lacks `replace-regexp-in-string'. 255This function is used by XEmacs that lacks `replace-regexp-in-string'.
@@ -269,7 +269,7 @@ The arguments FIXEDCASE, SUBEXP, and START, used by
269 "A list of characters that are _NOT_ reserved in the URL spec. 269 "A list of characters that are _NOT_ reserved in the URL spec.
270This is taken from RFC 2396.")) 270This is taken from RFC 2396."))
271 271
272(mh-defun-compat mh-url-hexify-string url-hexify-string (str) 272(defun-mh mh-url-hexify-string url-hexify-string (str)
273 "Escape characters in a string. 273 "Escape characters in a string.
274This is a copy of `url-hexify-string' from url-util.el in Emacs 274This is a copy of `url-hexify-string' from url-util.el in Emacs
27522; needed by Emacs 21." 27522; needed by Emacs 21."
@@ -283,7 +283,7 @@ This is a copy of `url-hexify-string' from url-util.el in Emacs
283 (char-to-string char))) 283 (char-to-string char)))
284 str "")) 284 str ""))
285 285
286(mh-defun-compat mh-view-mode-enter 286(defun-mh mh-view-mode-enter
287 view-mode-enter (&optional return-to exit-action) 287 view-mode-enter (&optional return-to exit-action)
288 "Enter View mode. 288 "Enter View mode.
289This function is used by XEmacs that lacks `view-mode-enter'. 289This function is used by XEmacs that lacks `view-mode-enter'.
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 6bf9458b459..ef8a52e7fed 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -114,11 +114,11 @@
114 (eval-when-compile 114 (eval-when-compile
115 `((,(concat "(\\(" 115 `((,(concat "(\\("
116 ;; Function declarations (use font-lock-function-name-face). 116 ;; Function declarations (use font-lock-function-name-face).
117 "\\(mh-def\\(un\\|macro\\)-compat\\)\\|" 117 "\\(def\\(un\\|macro\\)-mh\\)\\|"
118 ;; Variable declarations (use font-lock-variable-name-face). 118 ;; Variable declarations (use font-lock-variable-name-face).
119 "\\(mh-def\\(custom\\|face\\)\\)\\|" 119 "\\(def\\(custom\\|face\\)-mh\\)\\|"
120 ;; Group declarations (use font-lock-type-face). 120 ;; Group declarations (use font-lock-type-face).
121 "\\(mh-defgroup\\)" 121 "\\(defgroup-mh\\)"
122 "\\)\\>" 122 "\\)\\>"
123 ;; Any whitespace and defined object. 123 ;; Any whitespace and defined object.
124 "[ \t'\(]*" 124 "[ \t'\(]*"
@@ -684,7 +684,7 @@ ARGS is returned unchanged."
684 (t t)) 684 (t t))
685 collect keyword)))) 685 collect keyword))))
686 686
687(defmacro mh-defgroup (symbol members doc &rest args) 687(defmacro defgroup-mh (symbol members doc &rest args)
688 "Declare SYMBOL as a customization group containing MEMBERS. 688 "Declare SYMBOL as a customization group containing MEMBERS.
689See documentation for `defgroup' for a description of the arguments 689See documentation for `defgroup' for a description of the arguments
690SYMBOL, MEMBERS, DOC and ARGS. 690SYMBOL, MEMBERS, DOC and ARGS.
@@ -692,9 +692,9 @@ This macro is used by Emacs versions that lack the :package-version
692keyword, introduced in Emacs 22." 692keyword, introduced in Emacs 22."
693 (declare (doc-string 3)) 693 (declare (doc-string 3))
694 `(defgroup ,symbol ,members ,doc ,@(mh-strip-package-version args))) 694 `(defgroup ,symbol ,members ,doc ,@(mh-strip-package-version args)))
695(put 'mh-defgroup 'lisp-indent-function 'defun) 695(put 'defgroup-mh 'lisp-indent-function 'defun)
696 696
697(defmacro mh-defcustom (symbol value doc &rest args) 697(defmacro defcustom-mh (symbol value doc &rest args)
698 "Declare SYMBOL as a customizable variable that defaults to VALUE. 698 "Declare SYMBOL as a customizable variable that defaults to VALUE.
699See documentation for `defcustom' for a description of the arguments 699See documentation for `defcustom' for a description of the arguments
700SYMBOL, VALUE, DOC and ARGS. 700SYMBOL, VALUE, DOC and ARGS.
@@ -702,9 +702,9 @@ This macro is used by Emacs versions that lack the :package-version
702keyword, introduced in Emacs 22." 702keyword, introduced in Emacs 22."
703 (declare (doc-string 3)) 703 (declare (doc-string 3))
704 `(defcustom ,symbol ,value ,doc ,@(mh-strip-package-version args))) 704 `(defcustom ,symbol ,value ,doc ,@(mh-strip-package-version args)))
705(put 'mh-defcustom 'lisp-indent-function 'defun) 705(put 'defcustom-mh 'lisp-indent-function 'defun)
706 706
707(defmacro mh-defface (face spec doc &rest args) 707(defmacro defface-mh (face spec doc &rest args)
708 "Declare FACE as a customizable face that defaults to SPEC. 708 "Declare FACE as a customizable face that defaults to SPEC.
709See documentation for `defface' for a description of the arguments 709See documentation for `defface' for a description of the arguments
710FACE, SPEC, DOC and ARGS. 710FACE, SPEC, DOC and ARGS.
@@ -712,13 +712,13 @@ This macro is used by Emacs versions that lack the :package-version
712keyword, introduced in Emacs 22." 712keyword, introduced in Emacs 22."
713 (declare (doc-string 3)) 713 (declare (doc-string 3))
714 `(defface ,face ,spec ,doc ,@(mh-strip-package-version args))) 714 `(defface ,face ,spec ,doc ,@(mh-strip-package-version args)))
715(put 'mh-defface 'lisp-indent-function 'defun) 715(put 'defface-mh 'lisp-indent-function 'defun)
716 716
717 717
718 718
719;;; Variant Support 719;;; Variant Support
720 720
721(mh-defcustom mh-path nil 721(defcustom-mh mh-path nil
722 "*Additional list of directories to search for MH. 722 "*Additional list of directories to search for MH.
723See `mh-variant'." 723See `mh-variant'."
724 :group 'mh-e 724 :group 'mh-e
@@ -932,7 +932,7 @@ finally GNU mailutils."
932 (mapconcat '(lambda (x) (format "%s" (car x))) 932 (mapconcat '(lambda (x) (format "%s" (car x)))
933 (mh-variants) " or ")))))) 933 (mh-variants) " or "))))))
934 934
935(mh-defcustom mh-variant 'autodetect 935(defcustom-mh mh-variant 'autodetect
936 "*Specifies the variant used by MH-E. 936 "*Specifies the variant used by MH-E.
937 937
938The default setting of this option is \"Auto-detect\" which means 938The default setting of this option is \"Auto-detect\" which means
@@ -1017,7 +1017,7 @@ windows in the frame are removed."
1017 1017
1018;;; MH-E Customization Groups 1018;;; MH-E Customization Groups
1019 1019
1020(mh-defgroup mh-e nil 1020(defgroup-mh mh-e nil
1021 "Emacs interface to the MH mail system. 1021 "Emacs interface to the MH mail system.
1022MH is the Rand Mail Handler. Other implementations include nmh 1022MH is the Rand Mail Handler. Other implementations include nmh
1023and GNU mailutils." 1023and GNU mailutils."
@@ -1025,126 +1025,126 @@ and GNU mailutils."
1025 :group 'mail 1025 :group 'mail
1026 :package-version '(MH-E . "8.0")) 1026 :package-version '(MH-E . "8.0"))
1027 1027
1028(mh-defgroup mh-alias nil 1028(defgroup-mh mh-alias nil
1029 "Aliases." 1029 "Aliases."
1030 :link '(custom-manual "(mh-e)Aliases") 1030 :link '(custom-manual "(mh-e)Aliases")
1031 :prefix "mh-alias-" 1031 :prefix "mh-alias-"
1032 :group 'mh-e 1032 :group 'mh-e
1033 :package-version '(MH-E . "7.1")) 1033 :package-version '(MH-E . "7.1"))
1034 1034
1035(mh-defgroup mh-folder nil 1035(defgroup-mh mh-folder nil
1036 "Organizing your mail with folders." 1036 "Organizing your mail with folders."
1037 :prefix "mh-" 1037 :prefix "mh-"
1038 :link '(custom-manual "(mh-e)Folders") 1038 :link '(custom-manual "(mh-e)Folders")
1039 :group 'mh-e 1039 :group 'mh-e
1040 :package-version '(MH-E . "7.1")) 1040 :package-version '(MH-E . "7.1"))
1041 1041
1042(mh-defgroup mh-folder-selection nil 1042(defgroup-mh mh-folder-selection nil
1043 "Folder selection." 1043 "Folder selection."
1044 :prefix "mh-" 1044 :prefix "mh-"
1045 :link '(custom-manual "(mh-e)Folder Selection") 1045 :link '(custom-manual "(mh-e)Folder Selection")
1046 :group 'mh-e 1046 :group 'mh-e
1047 :package-version '(MH-E . "8.0")) 1047 :package-version '(MH-E . "8.0"))
1048 1048
1049(mh-defgroup mh-identity nil 1049(defgroup-mh mh-identity nil
1050 "Identities." 1050 "Identities."
1051 :link '(custom-manual "(mh-e)Identities") 1051 :link '(custom-manual "(mh-e)Identities")
1052 :prefix "mh-identity-" 1052 :prefix "mh-identity-"
1053 :group 'mh-e 1053 :group 'mh-e
1054 :package-version '(MH-E . "7.1")) 1054 :package-version '(MH-E . "7.1"))
1055 1055
1056(mh-defgroup mh-inc nil 1056(defgroup-mh mh-inc nil
1057 "Incorporating your mail." 1057 "Incorporating your mail."
1058 :prefix "mh-inc-" 1058 :prefix "mh-inc-"
1059 :link '(custom-manual "(mh-e)Incorporating Mail") 1059 :link '(custom-manual "(mh-e)Incorporating Mail")
1060 :group 'mh-e 1060 :group 'mh-e
1061 :package-version '(MH-E . "8.0")) 1061 :package-version '(MH-E . "8.0"))
1062 1062
1063(mh-defgroup mh-junk nil 1063(defgroup-mh mh-junk nil
1064 "Dealing with junk mail." 1064 "Dealing with junk mail."
1065 :link '(custom-manual "(mh-e)Junk") 1065 :link '(custom-manual "(mh-e)Junk")
1066 :prefix "mh-junk-" 1066 :prefix "mh-junk-"
1067 :group 'mh-e 1067 :group 'mh-e
1068 :package-version '(MH-E . "7.3")) 1068 :package-version '(MH-E . "7.3"))
1069 1069
1070(mh-defgroup mh-letter nil 1070(defgroup-mh mh-letter nil
1071 "Editing a draft." 1071 "Editing a draft."
1072 :prefix "mh-" 1072 :prefix "mh-"
1073 :link '(custom-manual "(mh-e)Editing Drafts") 1073 :link '(custom-manual "(mh-e)Editing Drafts")
1074 :group 'mh-e 1074 :group 'mh-e
1075 :package-version '(MH-E . "7.1")) 1075 :package-version '(MH-E . "7.1"))
1076 1076
1077(mh-defgroup mh-ranges nil 1077(defgroup-mh mh-ranges nil
1078 "Ranges." 1078 "Ranges."
1079 :prefix "mh-" 1079 :prefix "mh-"
1080 :link '(custom-manual "(mh-e)Ranges") 1080 :link '(custom-manual "(mh-e)Ranges")
1081 :group 'mh-e 1081 :group 'mh-e
1082 :package-version '(MH-E . "8.0")) 1082 :package-version '(MH-E . "8.0"))
1083 1083
1084(mh-defgroup mh-scan-line-formats nil 1084(defgroup-mh mh-scan-line-formats nil
1085 "Scan line formats." 1085 "Scan line formats."
1086 :link '(custom-manual "(mh-e)Scan Line Formats") 1086 :link '(custom-manual "(mh-e)Scan Line Formats")
1087 :prefix "mh-" 1087 :prefix "mh-"
1088 :group 'mh-e 1088 :group 'mh-e
1089 :package-version '(MH-E . "8.0")) 1089 :package-version '(MH-E . "8.0"))
1090 1090
1091(mh-defgroup mh-search nil 1091(defgroup-mh mh-search nil
1092 "Searching." 1092 "Searching."
1093 :link '(custom-manual "(mh-e)Searching") 1093 :link '(custom-manual "(mh-e)Searching")
1094 :prefix "mh-search-" 1094 :prefix "mh-search-"
1095 :group 'mh-e 1095 :group 'mh-e
1096 :package-version '(MH-E . "8.0")) 1096 :package-version '(MH-E . "8.0"))
1097 1097
1098(mh-defgroup mh-sending-mail nil 1098(defgroup-mh mh-sending-mail nil
1099 "Sending mail." 1099 "Sending mail."
1100 :prefix "mh-" 1100 :prefix "mh-"
1101 :link '(custom-manual "(mh-e)Sending Mail") 1101 :link '(custom-manual "(mh-e)Sending Mail")
1102 :group 'mh-e 1102 :group 'mh-e
1103 :package-version '(MH-E . "8.0")) 1103 :package-version '(MH-E . "8.0"))
1104 1104
1105(mh-defgroup mh-sequences nil 1105(defgroup-mh mh-sequences nil
1106 "Sequences." 1106 "Sequences."
1107 :prefix "mh-" 1107 :prefix "mh-"
1108 :link '(custom-manual "(mh-e)Sequences") 1108 :link '(custom-manual "(mh-e)Sequences")
1109 :group 'mh-e 1109 :group 'mh-e
1110 :package-version '(MH-E . "8.0")) 1110 :package-version '(MH-E . "8.0"))
1111 1111
1112(mh-defgroup mh-show nil 1112(defgroup-mh mh-show nil
1113 "Reading your mail." 1113 "Reading your mail."
1114 :prefix "mh-" 1114 :prefix "mh-"
1115 :link '(custom-manual "(mh-e)Reading Mail") 1115 :link '(custom-manual "(mh-e)Reading Mail")
1116 :group 'mh-e 1116 :group 'mh-e
1117 :package-version '(MH-E . "7.1")) 1117 :package-version '(MH-E . "7.1"))
1118 1118
1119(mh-defgroup mh-speedbar nil 1119(defgroup-mh mh-speedbar nil
1120 "The speedbar." 1120 "The speedbar."
1121 :prefix "mh-speed-" 1121 :prefix "mh-speed-"
1122 :link '(custom-manual "(mh-e)Speedbar") 1122 :link '(custom-manual "(mh-e)Speedbar")
1123 :group 'mh-e 1123 :group 'mh-e
1124 :package-version '(MH-E . "8.0")) 1124 :package-version '(MH-E . "8.0"))
1125 1125
1126(mh-defgroup mh-thread nil 1126(defgroup-mh mh-thread nil
1127 "Threading." 1127 "Threading."
1128 :prefix "mh-thread-" 1128 :prefix "mh-thread-"
1129 :link '(custom-manual "(mh-e)Threading") 1129 :link '(custom-manual "(mh-e)Threading")
1130 :group 'mh-e 1130 :group 'mh-e
1131 :package-version '(MH-E . "8.0")) 1131 :package-version '(MH-E . "8.0"))
1132 1132
1133(mh-defgroup mh-tool-bar nil 1133(defgroup-mh mh-tool-bar nil
1134 "The tool bar" 1134 "The tool bar"
1135 :link '(custom-manual "(mh-e)Tool Bar") 1135 :link '(custom-manual "(mh-e)Tool Bar")
1136 :prefix "mh-" 1136 :prefix "mh-"
1137 :group 'mh-e 1137 :group 'mh-e
1138 :package-version '(MH-E . "8.0")) 1138 :package-version '(MH-E . "8.0"))
1139 1139
1140(mh-defgroup mh-hooks nil 1140(defgroup-mh mh-hooks nil
1141 "MH-E hooks." 1141 "MH-E hooks."
1142 :link '(custom-manual "(mh-e)Top") 1142 :link '(custom-manual "(mh-e)Top")
1143 :prefix "mh-" 1143 :prefix "mh-"
1144 :group 'mh-e 1144 :group 'mh-e
1145 :package-version '(MH-E . "7.1")) 1145 :package-version '(MH-E . "7.1"))
1146 1146
1147(mh-defgroup mh-faces nil 1147(defgroup-mh mh-faces nil
1148 "Faces used in MH-E." 1148 "Faces used in MH-E."
1149 :link '(custom-manual "(mh-e)Top") 1149 :link '(custom-manual "(mh-e)Top")
1150 :prefix "mh-" 1150 :prefix "mh-"
@@ -1160,7 +1160,7 @@ and GNU mailutils."
1160 1160
1161;;; Aliases (:group 'mh-alias) 1161;;; Aliases (:group 'mh-alias)
1162 1162
1163(mh-defcustom mh-alias-completion-ignore-case-flag t 1163(defcustom-mh mh-alias-completion-ignore-case-flag t
1164 "*Non-nil means don't consider case significant in MH alias completion. 1164 "*Non-nil means don't consider case significant in MH alias completion.
1165 1165
1166As MH ignores case in the aliases, so too does MH-E. However, you 1166As MH ignores case in the aliases, so too does MH-E. However, you
@@ -1171,7 +1171,7 @@ lowercase for mailing lists and uppercase for people."
1171 :group 'mh-alias 1171 :group 'mh-alias
1172 :package-version '(MH-E . "7.1")) 1172 :package-version '(MH-E . "7.1"))
1173 1173
1174(mh-defcustom mh-alias-expand-aliases-flag nil 1174(defcustom-mh mh-alias-expand-aliases-flag nil
1175 "*Non-nil means to expand aliases entered in the minibuffer. 1175 "*Non-nil means to expand aliases entered in the minibuffer.
1176 1176
1177In other words, aliases entered in the minibuffer will be 1177In other words, aliases entered in the minibuffer will be
@@ -1181,7 +1181,7 @@ this expansion is not performed."
1181 :group 'mh-alias 1181 :group 'mh-alias
1182 :package-version '(MH-E . "7.1")) 1182 :package-version '(MH-E . "7.1"))
1183 1183
1184(mh-defcustom mh-alias-flash-on-comma t 1184(defcustom-mh mh-alias-flash-on-comma t
1185 "*Specify whether to flash address or warn on translation. 1185 "*Specify whether to flash address or warn on translation.
1186 1186
1187This option controls the behavior when a [comma] is pressed while 1187This option controls the behavior when a [comma] is pressed while
@@ -1194,7 +1194,7 @@ does not display a warning if the alias is not found."
1194 :group 'mh-alias 1194 :group 'mh-alias
1195 :package-version '(MH-E . "7.1")) 1195 :package-version '(MH-E . "7.1"))
1196 1196
1197(mh-defcustom mh-alias-insert-file nil 1197(defcustom-mh mh-alias-insert-file nil
1198 "*Filename used to store a new MH-E alias. 1198 "*Filename used to store a new MH-E alias.
1199 1199
1200The default setting of this option is \"Use Aliasfile Profile 1200The default setting of this option is \"Use Aliasfile Profile
@@ -1208,7 +1208,7 @@ name, MH-E will prompt for one of them when MH-E adds an alias."
1208 :group 'mh-alias 1208 :group 'mh-alias
1209 :package-version '(MH-E . "7.1")) 1209 :package-version '(MH-E . "7.1"))
1210 1210
1211(mh-defcustom mh-alias-insertion-location 'sorted 1211(defcustom-mh mh-alias-insertion-location 'sorted
1212 "Specifies where new aliases are entered in alias files. 1212 "Specifies where new aliases are entered in alias files.
1213 1213
1214This option is set to \"Alphabetical\" by default. If you organize 1214This option is set to \"Alphabetical\" by default. If you organize
@@ -1220,7 +1220,7 @@ or \"Bottom\" of your alias file might be more appropriate."
1220 :group 'mh-alias 1220 :group 'mh-alias
1221 :package-version '(MH-E . "7.1")) 1221 :package-version '(MH-E . "7.1"))
1222 1222
1223(mh-defcustom mh-alias-local-users t 1223(defcustom-mh mh-alias-local-users t
1224 "*If on, local users are added to alias completion. 1224 "*If on, local users are added to alias completion.
1225 1225
1226Aliases are created from \"/etc/passwd\" entries with a user ID 1226Aliases are created from \"/etc/passwd\" entries with a user ID
@@ -1241,7 +1241,7 @@ NIS password file."
1241 :group 'mh-alias 1241 :group 'mh-alias
1242 :package-version '(MH-E . "7.1")) 1242 :package-version '(MH-E . "7.1"))
1243 1243
1244(mh-defcustom mh-alias-local-users-prefix "local." 1244(defcustom-mh mh-alias-local-users-prefix "local."
1245 "*String prefixed to the real names of users from the password file. 1245 "*String prefixed to the real names of users from the password file.
1246This option can also be set to \"Use Login\". 1246This option can also be set to \"Use Login\".
1247 1247
@@ -1263,7 +1263,7 @@ turned off."
1263 :group 'mh-alias 1263 :group 'mh-alias
1264 :package-version '(MH-E . "7.4")) 1264 :package-version '(MH-E . "7.4"))
1265 1265
1266(mh-defcustom mh-alias-passwd-gecos-comma-separator-flag t 1266(defcustom-mh mh-alias-passwd-gecos-comma-separator-flag t
1267 "*Non-nil means the gecos field in the password file uses a comma separator. 1267 "*Non-nil means the gecos field in the password file uses a comma separator.
1268 1268
1269In the example in `mh-alias-local-users-prefix', commas are used 1269In the example in `mh-alias-local-users-prefix', commas are used
@@ -1277,7 +1277,7 @@ whose contents may contain commas, you can turn this option off."
1277 1277
1278;;; Organizing Your Mail with Folders (:group 'mh-folder) 1278;;; Organizing Your Mail with Folders (:group 'mh-folder)
1279 1279
1280(mh-defcustom mh-new-messages-folders t 1280(defcustom-mh mh-new-messages-folders t
1281 "Folders searched for the \"unseen\" sequence. 1281 "Folders searched for the \"unseen\" sequence.
1282 1282
1283Set this option to \"Inbox\" to search the \"+inbox\" folder or 1283Set this option to \"Inbox\" to search the \"+inbox\" folder or
@@ -1292,7 +1292,7 @@ See also `mh-recursive-folders-flag'."
1292 :group 'mh-folder 1292 :group 'mh-folder
1293 :package-version '(MH-E . "8.0")) 1293 :package-version '(MH-E . "8.0"))
1294 1294
1295(mh-defcustom mh-ticked-messages-folders t 1295(defcustom-mh mh-ticked-messages-folders t
1296 "Folders searched for `mh-tick-seq'. 1296 "Folders searched for `mh-tick-seq'.
1297 1297
1298Set this option to \"Inbox\" to search the \"+inbox\" folder or 1298Set this option to \"Inbox\" to search the \"+inbox\" folder or
@@ -1307,7 +1307,7 @@ See also `mh-recursive-folders-flag'."
1307 :group 'mh-folder 1307 :group 'mh-folder
1308 :package-version '(MH-E . "8.0")) 1308 :package-version '(MH-E . "8.0"))
1309 1309
1310(mh-defcustom mh-large-folder 200 1310(defcustom-mh mh-large-folder 200
1311 "The number of messages that indicates a large folder. 1311 "The number of messages that indicates a large folder.
1312 1312
1313If a folder is deemed to be large, that is the number of messages 1313If a folder is deemed to be large, that is the number of messages
@@ -1319,7 +1319,7 @@ folders are treated as if they are small."
1319 :group 'mh-folder 1319 :group 'mh-folder
1320 :package-version '(MH-E . "7.0")) 1320 :package-version '(MH-E . "7.0"))
1321 1321
1322(mh-defcustom mh-recenter-summary-flag nil 1322(defcustom-mh mh-recenter-summary-flag nil
1323 "*Non-nil means to recenter the summary window. 1323 "*Non-nil means to recenter the summary window.
1324 1324
1325If this option is turned on, recenter the summary window when the 1325If this option is turned on, recenter the summary window when the
@@ -1328,13 +1328,13 @@ show window is toggled off."
1328 :group 'mh-folder 1328 :group 'mh-folder
1329 :package-version '(MH-E . "7.0")) 1329 :package-version '(MH-E . "7.0"))
1330 1330
1331(mh-defcustom mh-recursive-folders-flag nil 1331(defcustom-mh mh-recursive-folders-flag nil
1332 "*Non-nil means that commands which operate on folders do so recursively." 1332 "*Non-nil means that commands which operate on folders do so recursively."
1333 :type 'boolean 1333 :type 'boolean
1334 :group 'mh-folder 1334 :group 'mh-folder
1335 :package-version '(MH-E . "7.0")) 1335 :package-version '(MH-E . "7.0"))
1336 1336
1337(mh-defcustom mh-sortm-args nil 1337(defcustom-mh mh-sortm-args nil
1338 "*Additional arguments for \"sortm\"\\<mh-folder-mode-map>. 1338 "*Additional arguments for \"sortm\"\\<mh-folder-mode-map>.
1339 1339
1340This option is consulted when a prefix argument is used with 1340This option is consulted when a prefix argument is used with
@@ -1348,7 +1348,7 @@ an alternate view. For example, \"'(\"-nolimit\" \"-textfield\"
1348 1348
1349;;; Folder Selection (:group 'mh-folder-selection) 1349;;; Folder Selection (:group 'mh-folder-selection)
1350 1350
1351(mh-defcustom mh-default-folder-for-message-function nil 1351(defcustom-mh mh-default-folder-for-message-function nil
1352 "Function to select a default folder for refiling or \"Fcc:\". 1352 "Function to select a default folder for refiling or \"Fcc:\".
1353 1353
1354When this function is called, the current buffer contains the message 1354When this function is called, the current buffer contains the message
@@ -1360,7 +1360,7 @@ the default, or an empty string to suppress the default entirely."
1360 :group 'mh-folder-selection 1360 :group 'mh-folder-selection
1361 :package-version '(MH-E . "8.0")) 1361 :package-version '(MH-E . "8.0"))
1362 1362
1363(mh-defcustom mh-default-folder-list nil 1363(defcustom-mh mh-default-folder-list nil
1364 "*List of addresses and folders. 1364 "*List of addresses and folders.
1365 1365
1366The folder name associated with the first address found in this 1366The folder name associated with the first address found in this
@@ -1378,7 +1378,7 @@ for more information."
1378 :group 'mh-folder-selection 1378 :group 'mh-folder-selection
1379 :package-version '(MH-E . "7.2")) 1379 :package-version '(MH-E . "7.2"))
1380 1380
1381(mh-defcustom mh-default-folder-must-exist-flag t 1381(defcustom-mh mh-default-folder-must-exist-flag t
1382 "*Non-nil means guessed folder name must exist to be used. 1382 "*Non-nil means guessed folder name must exist to be used.
1383 1383
1384If the derived folder does not exist, and this option is on, then 1384If the derived folder does not exist, and this option is on, then
@@ -1392,7 +1392,7 @@ for more information."
1392 :group 'mh-folder-selection 1392 :group 'mh-folder-selection
1393 :package-version '(MH-E . "7.2")) 1393 :package-version '(MH-E . "7.2"))
1394 1394
1395(mh-defcustom mh-default-folder-prefix "" 1395(defcustom-mh mh-default-folder-prefix ""
1396 "*Prefix used for folder names generated from aliases. 1396 "*Prefix used for folder names generated from aliases.
1397The prefix is used to prevent clutter in your mail directory. 1397The prefix is used to prevent clutter in your mail directory.
1398 1398
@@ -1411,7 +1411,7 @@ for more information."
1411Real definition will take effect when mh-identity is loaded." 1411Real definition will take effect when mh-identity is loaded."
1412 nil))) 1412 nil)))
1413 1413
1414(mh-defcustom mh-identity-list nil 1414(defcustom-mh mh-identity-list nil
1415 "*List of identities. 1415 "*List of identities.
1416 1416
1417To customize this option, click on the \"INS\" button and enter a label 1417To customize this option, click on the \"INS\" button and enter a label
@@ -1480,7 +1480,7 @@ fashion."
1480 :group 'mh-identity 1480 :group 'mh-identity
1481 :package-version '(MH-E . "7.1")) 1481 :package-version '(MH-E . "7.1"))
1482 1482
1483(mh-defcustom mh-auto-fields-list nil 1483(defcustom-mh mh-auto-fields-list nil
1484 "List of recipients for which header lines are automatically inserted. 1484 "List of recipients for which header lines are automatically inserted.
1485 1485
1486This option can be used to set the identity depending on the 1486This option can be used to set the identity depending on the
@@ -1541,14 +1541,14 @@ as the result is undefined."
1541 :group 'mh-identity 1541 :group 'mh-identity
1542 :package-version '(MH-E . "7.3")) 1542 :package-version '(MH-E . "7.3"))
1543 1543
1544(mh-defcustom mh-auto-fields-prompt-flag t 1544(defcustom-mh mh-auto-fields-prompt-flag t
1545 "*Non-nil means to prompt before sending if fields inserted. 1545 "*Non-nil means to prompt before sending if fields inserted.
1546See `mh-auto-fields-list'." 1546See `mh-auto-fields-list'."
1547 :type 'boolean 1547 :type 'boolean
1548 :group 'mh-identity 1548 :group 'mh-identity
1549 :package-version '(MH-E . "8.0")) 1549 :package-version '(MH-E . "8.0"))
1550 1550
1551(mh-defcustom mh-identity-default nil 1551(defcustom-mh mh-identity-default nil
1552 "Default identity to use when `mh-letter-mode' is called. 1552 "Default identity to use when `mh-letter-mode' is called.
1553See `mh-identity-list'." 1553See `mh-identity-list'."
1554 :type (append 1554 :type (append
@@ -1559,7 +1559,7 @@ See `mh-identity-list'."
1559 :group 'mh-identity 1559 :group 'mh-identity
1560 :package-version '(MH-E . "7.1")) 1560 :package-version '(MH-E . "7.1"))
1561 1561
1562(mh-defcustom mh-identity-handlers 1562(defcustom-mh mh-identity-handlers
1563 '(("From" . mh-identity-handler-top) 1563 '(("From" . mh-identity-handler-top)
1564 (":default" . mh-identity-handler-bottom) 1564 (":default" . mh-identity-handler-bottom)
1565 (":attribution-verb" . mh-identity-handler-attribution-verb) 1565 (":attribution-verb" . mh-identity-handler-attribution-verb)
@@ -1595,7 +1595,7 @@ containing the VALUE for the field is given."
1595 1595
1596;;; Incorporating Your Mail (:group 'mh-inc) 1596;;; Incorporating Your Mail (:group 'mh-inc)
1597 1597
1598(mh-defcustom mh-inc-prog "inc" 1598(defcustom-mh mh-inc-prog "inc"
1599 "*Program to incorporate new mail into a folder. 1599 "*Program to incorporate new mail into a folder.
1600 1600
1601This program generates a one-line summary for each of the new 1601This program generates a one-line summary for each of the new
@@ -1614,7 +1614,7 @@ several scan line format variables appropriately."
1614Real definition will take effect when mh-inc is loaded." 1614Real definition will take effect when mh-inc is loaded."
1615 nil))) 1615 nil)))
1616 1616
1617(mh-defcustom mh-inc-spool-list nil 1617(defcustom-mh mh-inc-spool-list nil
1618 "*Alternate spool files. 1618 "*Alternate spool files.
1619 1619
1620You can use the `mh-inc-spool-list' variable to direct MH-E to 1620You can use the `mh-inc-spool-list' variable to direct MH-E to
@@ -1687,7 +1687,7 @@ The function is always called with SYMBOL bound to
1687 until (executable-find (symbol-name (car element))) 1687 until (executable-find (symbol-name (car element)))
1688 finally return (car element))))) 1688 finally return (car element)))))
1689 1689
1690(mh-defcustom mh-junk-background nil 1690(defcustom-mh mh-junk-background nil
1691 "If on, spam programs are run in background. 1691 "If on, spam programs are run in background.
1692 1692
1693By default, the programs are run in the foreground, but this can 1693By default, the programs are run in the foreground, but this can
@@ -1699,14 +1699,14 @@ you might try turning on this option."
1699 :group 'mh-junk 1699 :group 'mh-junk
1700 :package-version '(MH-E . "8.0")) 1700 :package-version '(MH-E . "8.0"))
1701 1701
1702(mh-defcustom mh-junk-disposition nil 1702(defcustom-mh mh-junk-disposition nil
1703 "Disposition of junk mail." 1703 "Disposition of junk mail."
1704 :type '(choice (const :tag "Delete Spam" nil) 1704 :type '(choice (const :tag "Delete Spam" nil)
1705 (string :tag "Spam Folder")) 1705 (string :tag "Spam Folder"))
1706 :group 'mh-junk 1706 :group 'mh-junk
1707 :package-version '(MH-E . "8.0")) 1707 :package-version '(MH-E . "8.0"))
1708 1708
1709(mh-defcustom mh-junk-program nil 1709(defcustom-mh mh-junk-program nil
1710 "Spam program that MH-E should use. 1710 "Spam program that MH-E should use.
1711 1711
1712The default setting of this option is \"Auto-detect\" which means 1712The default setting of this option is \"Auto-detect\" which means
@@ -1724,7 +1724,7 @@ bogofilter, then you can set this option to \"Bogofilter\"."
1724 1724
1725;;; Editing a Draft (:group 'mh-letter) 1725;;; Editing a Draft (:group 'mh-letter)
1726 1726
1727(mh-defcustom mh-compose-insertion (if (locate-library "mml") 'mml 'mh) 1727(defcustom-mh mh-compose-insertion (if (locate-library "mml") 'mml 'mh)
1728 "Type of tags used when composing MIME messages. 1728 "Type of tags used when composing MIME messages.
1729 1729
1730In addition to MH-style directives, MH-E also supports MML (MIME 1730In addition to MH-style directives, MH-E also supports MML (MIME
@@ -1738,7 +1738,7 @@ MH-style directives are preferred."
1738 :group 'mh-letter 1738 :group 'mh-letter
1739 :package-version '(MH-E . "7.0")) 1739 :package-version '(MH-E . "7.0"))
1740 1740
1741(mh-defcustom mh-compose-skipped-header-fields 1741(defcustom-mh mh-compose-skipped-header-fields
1742 '("From" "Organization" "References" "In-Reply-To" 1742 '("From" "Organization" "References" "In-Reply-To"
1743 "X-Face" "Face" "X-Image-URL" "X-Mailer") 1743 "X-Face" "Face" "X-Image-URL" "X-Mailer")
1744 "List of header fields to skip over when navigating in draft." 1744 "List of header fields to skip over when navigating in draft."
@@ -1746,13 +1746,13 @@ MH-style directives are preferred."
1746 :group 'mh-letter 1746 :group 'mh-letter
1747 :package-version '(MH-E . "7.4")) 1747 :package-version '(MH-E . "7.4"))
1748 1748
1749(mh-defcustom mh-compose-space-does-completion-flag nil 1749(defcustom-mh mh-compose-space-does-completion-flag nil
1750 "*Non-nil means \\<mh-letter-mode-map>\\[mh-letter-complete-or-space] does completion in message header." 1750 "*Non-nil means \\<mh-letter-mode-map>\\[mh-letter-complete-or-space] does completion in message header."
1751 :type 'boolean 1751 :type 'boolean
1752 :group 'mh-letter 1752 :group 'mh-letter
1753 :package-version '(MH-E . "7.4")) 1753 :package-version '(MH-E . "7.4"))
1754 1754
1755(mh-defcustom mh-delete-yanked-msg-window-flag nil 1755(defcustom-mh mh-delete-yanked-msg-window-flag nil
1756 "*Non-nil means delete any window displaying the message. 1756 "*Non-nil means delete any window displaying the message.
1757 1757
1758This deletes the window containing the original message after 1758This deletes the window containing the original message after
@@ -1762,7 +1762,7 @@ more room on your screen for your reply."
1762 :group 'mh-letter 1762 :group 'mh-letter
1763 :package-version '(MH-E . "7.0")) 1763 :package-version '(MH-E . "7.0"))
1764 1764
1765(mh-defcustom mh-extract-from-attribution-verb "wrote:" 1765(defcustom-mh mh-extract-from-attribution-verb "wrote:"
1766 "*Verb to use for attribution when a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg]. 1766 "*Verb to use for attribution when a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg].
1767 1767
1768The attribution consists of the sender's name and email address 1768The attribution consists of the sender's name and email address
@@ -1776,7 +1776,7 @@ followed by the content of this option. This option can be set to
1776 :group 'mh-letter 1776 :group 'mh-letter
1777 :package-version '(MH-E . "7.0")) 1777 :package-version '(MH-E . "7.0"))
1778 1778
1779(mh-defcustom mh-ins-buf-prefix "> " 1779(defcustom-mh mh-ins-buf-prefix "> "
1780 "*String to put before each line of a yanked or inserted message. 1780 "*String to put before each line of a yanked or inserted message.
1781 1781
1782The prefix \"> \" is the default setting of this option. I 1782The prefix \"> \" is the default setting of this option. I
@@ -1792,7 +1792,7 @@ flavors of `mh-yank-behavior' or you have added a
1792 :group 'mh-letter 1792 :group 'mh-letter
1793 :package-version '(MH-E . "6.0")) 1793 :package-version '(MH-E . "6.0"))
1794 1794
1795(mh-defcustom mh-letter-complete-function 'ispell-complete-word 1795(defcustom-mh mh-letter-complete-function 'ispell-complete-word
1796 "*Function to call when completing outside of address or folder fields. 1796 "*Function to call when completing outside of address or folder fields.
1797 1797
1798In the body of the message, 1798In the body of the message,
@@ -1802,7 +1802,7 @@ which is set to \"ispell-complete-word\" by default."
1802 :group 'mh-letter 1802 :group 'mh-letter
1803 :package-version '(MH-E . "7.1")) 1803 :package-version '(MH-E . "7.1"))
1804 1804
1805(mh-defcustom mh-letter-fill-column 72 1805(defcustom-mh mh-letter-fill-column 72
1806 "*Fill column to use in MH Letter mode. 1806 "*Fill column to use in MH Letter mode.
1807 1807
1808By default, this option is 72 to allow others to quote your 1808By default, this option is 72 to allow others to quote your
@@ -1811,7 +1811,7 @@ message without line wrapping."
1811 :group 'mh-letter 1811 :group 'mh-letter
1812 :package-version '(MH-E . "6.0")) 1812 :package-version '(MH-E . "6.0"))
1813 1813
1814(mh-defcustom mh-mml-method-default (if mh-pgp-support-flag "pgpmime" "none") 1814(defcustom-mh mh-mml-method-default (if mh-pgp-support-flag "pgpmime" "none")
1815 "Default method to use in security tags. 1815 "Default method to use in security tags.
1816 1816
1817This option is used to select between a variety of mail security 1817This option is used to select between a variety of mail security
@@ -1834,7 +1834,7 @@ you write!"
1834 :group 'mh-letter 1834 :group 'mh-letter
1835 :package-version '(MH-E . "8.0")) 1835 :package-version '(MH-E . "8.0"))
1836 1836
1837(mh-defcustom mh-signature-file-name "~/.signature" 1837(defcustom-mh mh-signature-file-name "~/.signature"
1838 "*Source of user's signature. 1838 "*Source of user's signature.
1839 1839
1840By default, the text of your signature is taken from the file 1840By default, the text of your signature is taken from the file
@@ -1857,7 +1857,7 @@ The signature is inserted into your message with the command
1857 :group 'mh-letter 1857 :group 'mh-letter
1858 :package-version '(MH-E . "6.0")) 1858 :package-version '(MH-E . "6.0"))
1859 1859
1860(mh-defcustom mh-signature-separator-flag t 1860(defcustom-mh mh-signature-separator-flag t
1861 "*Non-nil means a signature separator should be inserted. 1861 "*Non-nil means a signature separator should be inserted.
1862 1862
1863It is not recommended that you change this option since various 1863It is not recommended that you change this option since various
@@ -1868,7 +1868,7 @@ replying or yanking a letter into a draft."
1868 :group 'mh-letter 1868 :group 'mh-letter
1869 :package-version '(MH-E . "8.0")) 1869 :package-version '(MH-E . "8.0"))
1870 1870
1871(mh-defcustom mh-x-face-file "~/.face" 1871(defcustom-mh mh-x-face-file "~/.face"
1872 "*File containing face header field to insert in outgoing mail. 1872 "*File containing face header field to insert in outgoing mail.
1873 1873
1874If the file starts with either of the strings \"X-Face:\", \"Face:\" 1874If the file starts with either of the strings \"X-Face:\", \"Face:\"
@@ -1897,7 +1897,7 @@ this option doesn't exist."
1897 :group 'mh-letter 1897 :group 'mh-letter
1898 :package-version '(MH-E . "7.0")) 1898 :package-version '(MH-E . "7.0"))
1899 1899
1900(mh-defcustom mh-yank-behavior 'attribution 1900(defcustom-mh mh-yank-behavior 'attribution
1901 "*Controls which part of a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg]. 1901 "*Controls which part of a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg].
1902 1902
1903To include the entire message, including the entire header, use 1903To include the entire message, including the entire header, use
@@ -1944,7 +1944,7 @@ inserted."
1944 1944
1945;;; Ranges (:group 'mh-ranges) 1945;;; Ranges (:group 'mh-ranges)
1946 1946
1947(mh-defcustom mh-interpret-number-as-range-flag t 1947(defcustom-mh mh-interpret-number-as-range-flag t
1948 "*Non-nil means interpret a number as a range. 1948 "*Non-nil means interpret a number as a range.
1949 1949
1950Since one of the most frequent ranges used is \"last:N\", MH-E 1950Since one of the most frequent ranges used is \"last:N\", MH-E
@@ -1964,7 +1964,7 @@ message 200, then use the range \"200:200\"."
1964Real definition, below, uses variables that aren't defined yet." 1964Real definition, below, uses variables that aren't defined yet."
1965 (set-default symbol value)))) 1965 (set-default symbol value))))
1966 1966
1967(mh-defcustom mh-adaptive-cmd-note-flag t 1967(defcustom-mh mh-adaptive-cmd-note-flag t
1968 "*Non-nil means that the message number width is determined dynamically. 1968 "*Non-nil means that the message number width is determined dynamically.
1969 1969
1970If you've created your own format to handle long message numbers, 1970If you've created your own format to handle long message numbers,
@@ -1993,7 +1993,7 @@ set SYMBOL to VALUE."
1993 "unless you use \"Use MH-E scan Format\"") 1993 "unless you use \"Use MH-E scan Format\"")
1994 (set-default symbol value))) 1994 (set-default symbol value)))
1995 1995
1996(mh-defcustom mh-scan-format-file t 1996(defcustom-mh mh-scan-format-file t
1997 "Specifies the format file to pass to the scan program. 1997 "Specifies the format file to pass to the scan program.
1998 1998
1999The default setting for this option is \"Use MH-E scan Format\". This 1999The default setting for this option is \"Use MH-E scan Format\". This
@@ -2032,7 +2032,7 @@ Otherwise, set SYMBOL to VALUE."
2032 "is set to \"Use MH-E scan Format\"") 2032 "is set to \"Use MH-E scan Format\"")
2033 (set-default symbol value))) 2033 (set-default symbol value)))
2034 2034
2035(mh-defcustom mh-scan-prog "scan" 2035(defcustom-mh mh-scan-prog "scan"
2036 "*Program used to scan messages. 2036 "*Program used to scan messages.
2037 2037
2038The name of the program that generates a listing of one line per 2038The name of the program that generates a listing of one line per
@@ -2047,7 +2047,7 @@ directory. You may link another program to `scan' (see
2047 2047
2048;;; Searching (:group 'mh-search) 2048;;; Searching (:group 'mh-search)
2049 2049
2050(mh-defcustom mh-search-program nil 2050(defcustom-mh mh-search-program nil
2051 "Search program that MH-E shall use. 2051 "Search program that MH-E shall use.
2052 2052
2053The default setting of this option is \"Auto-detect\" which means 2053The default setting of this option is \"Auto-detect\" which means
@@ -2070,7 +2070,7 @@ MH-E can be found in the documentation of `mh-search'."
2070 2070
2071;;; Sending Mail (:group 'mh-sending-mail) 2071;;; Sending Mail (:group 'mh-sending-mail)
2072 2072
2073(mh-defcustom mh-compose-forward-as-mime-flag t 2073(defcustom-mh mh-compose-forward-as-mime-flag t
2074 "*Non-nil means that messages are forwarded as attachments. 2074 "*Non-nil means that messages are forwarded as attachments.
2075 2075
2076By default, this option is on which means that the forwarded 2076By default, this option is on which means that the forwarded
@@ -2086,7 +2086,7 @@ regardless of the settings of this option."
2086 :group 'mh-sending-mail 2086 :group 'mh-sending-mail
2087 :package-version '(MH-E . "8.0")) 2087 :package-version '(MH-E . "8.0"))
2088 2088
2089(mh-defcustom mh-compose-letter-function nil 2089(defcustom-mh mh-compose-letter-function nil
2090 "Invoked when starting a new draft. 2090 "Invoked when starting a new draft.
2091 2091
2092However, it is the last function called before you edit your 2092However, it is the last function called before you edit your
@@ -2098,13 +2098,13 @@ fields."
2098 :group 'mh-sending-mail 2098 :group 'mh-sending-mail
2099 :package-version '(MH-E . "6.0")) 2099 :package-version '(MH-E . "6.0"))
2100 2100
2101(mh-defcustom mh-compose-prompt-flag nil 2101(defcustom-mh mh-compose-prompt-flag nil
2102 "*Non-nil means prompt for header fields when composing a new draft." 2102 "*Non-nil means prompt for header fields when composing a new draft."
2103 :type 'boolean 2103 :type 'boolean
2104 :group 'mh-sending-mail 2104 :group 'mh-sending-mail
2105 :package-version '(MH-E . "7.4")) 2105 :package-version '(MH-E . "7.4"))
2106 2106
2107(mh-defcustom mh-forward-subject-format "%s: %s" 2107(defcustom-mh mh-forward-subject-format "%s: %s"
2108 "*Format string for forwarded message subject. 2108 "*Format string for forwarded message subject.
2109 2109
2110This option is a string which includes two escapes (\"%s\"). The 2110This option is a string which includes two escapes (\"%s\"). The
@@ -2114,7 +2114,7 @@ and the second one is replaced with the original \"Subject:\"."
2114 :group 'mh-sending-mail 2114 :group 'mh-sending-mail
2115 :package-version '(MH-E . "6.0")) 2115 :package-version '(MH-E . "6.0"))
2116 2116
2117(mh-defcustom mh-insert-x-mailer-flag t 2117(defcustom-mh mh-insert-x-mailer-flag t
2118 "*Non-nil means append an \"X-Mailer:\" header field to the header. 2118 "*Non-nil means append an \"X-Mailer:\" header field to the header.
2119 2119
2120This header field includes the version of MH-E and Emacs that you 2120This header field includes the version of MH-E and Emacs that you
@@ -2124,7 +2124,7 @@ can turn this option off."
2124 :group 'mh-sending-mail 2124 :group 'mh-sending-mail
2125 :package-version '(MH-E . "7.0")) 2125 :package-version '(MH-E . "7.0"))
2126 2126
2127(mh-defcustom mh-redist-full-contents-flag nil 2127(defcustom-mh mh-redist-full-contents-flag nil
2128 "*Non-nil means the \"dist\" command needs entire letter for redistribution. 2128 "*Non-nil means the \"dist\" command needs entire letter for redistribution.
2129 2129
2130This option must be turned on if \"dist\" requires the whole 2130This option must be turned on if \"dist\" requires the whole
@@ -2136,7 +2136,7 @@ has been redistributed before, turn off this option."
2136 :group 'mh-sending-mail 2136 :group 'mh-sending-mail
2137 :package-version '(MH-E . "8.0")) 2137 :package-version '(MH-E . "8.0"))
2138 2138
2139(mh-defcustom mh-reply-default-reply-to nil 2139(defcustom-mh mh-reply-default-reply-to nil
2140 "*Sets the person or persons to whom a reply will be sent. 2140 "*Sets the person or persons to whom a reply will be sent.
2141 2141
2142This option is set to \"Prompt\" by default so that you are 2142This option is set to \"Prompt\" by default so that you are
@@ -2152,7 +2152,7 @@ this option to \"cc\". Other choices include \"from\", \"to\", or
2152 :group 'mh-sending-mail 2152 :group 'mh-sending-mail
2153 :package-version '(MH-E . "6.0")) 2153 :package-version '(MH-E . "6.0"))
2154 2154
2155(mh-defcustom mh-reply-show-message-flag t 2155(defcustom-mh mh-reply-show-message-flag t
2156 "*Non-nil means the MH-Show buffer is displayed when replying. 2156 "*Non-nil means the MH-Show buffer is displayed when replying.
2157 2157
2158If you include the message automatically, you can hide the 2158If you include the message automatically, you can hide the
@@ -2169,7 +2169,7 @@ See also `mh-reply'."
2169;; the docstring: "Additional sequences that should not to be preserved can be 2169;; the docstring: "Additional sequences that should not to be preserved can be
2170;; specified by setting `mh-unpropagated-sequences' appropriately." XXX 2170;; specified by setting `mh-unpropagated-sequences' appropriately." XXX
2171 2171
2172(mh-defcustom mh-refile-preserves-sequences-flag t 2172(defcustom-mh mh-refile-preserves-sequences-flag t
2173 "*Non-nil means that sequences are preserved when messages are refiled. 2173 "*Non-nil means that sequences are preserved when messages are refiled.
2174 2174
2175If a message is in any sequence (except \"Previous-Sequence:\" 2175If a message is in any sequence (except \"Previous-Sequence:\"
@@ -2180,7 +2180,7 @@ desired, then turn off this option."
2180 :group 'mh-sequences 2180 :group 'mh-sequences
2181 :package-version '(MH-E . "7.4")) 2181 :package-version '(MH-E . "7.4"))
2182 2182
2183(mh-defcustom mh-tick-seq 'tick 2183(defcustom-mh mh-tick-seq 'tick
2184 "The name of the MH sequence for ticked messages. 2184 "The name of the MH sequence for ticked messages.
2185 2185
2186You can customize this option if you already use the \"tick\" 2186You can customize this option if you already use the \"tick\"
@@ -2192,7 +2192,7 @@ there isn't much advantage to that."
2192 :group 'mh-sequences 2192 :group 'mh-sequences
2193 :package-version '(MH-E . "7.3")) 2193 :package-version '(MH-E . "7.3"))
2194 2194
2195(mh-defcustom mh-update-sequences-after-mh-show-flag t 2195(defcustom-mh mh-update-sequences-after-mh-show-flag t
2196 "*Non-nil means flush MH sequences to disk after message is shown\\<mh-folder-mode-map>. 2196 "*Non-nil means flush MH sequences to disk after message is shown\\<mh-folder-mode-map>.
2197 2197
2198Three sequences are maintained internally by MH-E and pushed out 2198Three sequences are maintained internally by MH-E and pushed out
@@ -2209,7 +2209,7 @@ commands."
2209 2209
2210;;; Reading Your Mail (:group 'mh-show) 2210;;; Reading Your Mail (:group 'mh-show)
2211 2211
2212(mh-defcustom mh-bury-show-buffer-flag t 2212(defcustom-mh mh-bury-show-buffer-flag t
2213 "*Non-nil means show buffer is buried. 2213 "*Non-nil means show buffer is buried.
2214 2214
2215One advantage of not burying the show buffer is that one can 2215One advantage of not burying the show buffer is that one can
@@ -2220,7 +2220,7 @@ running \\[electric-buffer-list] to see what I mean."
2220 :group 'mh-show 2220 :group 'mh-show
2221 :package-version '(MH-E . "7.0")) 2221 :package-version '(MH-E . "7.0"))
2222 2222
2223(mh-defcustom mh-clean-message-header-flag t 2223(defcustom-mh mh-clean-message-header-flag t
2224 "*Non-nil means remove extraneous header fields. 2224 "*Non-nil means remove extraneous header fields.
2225 2225
2226See also `mh-invisible-header-fields-default' and 2226See also `mh-invisible-header-fields-default' and
@@ -2229,7 +2229,7 @@ See also `mh-invisible-header-fields-default' and
2229 :group 'mh-show 2229 :group 'mh-show
2230 :package-version '(MH-E . "7.0")) 2230 :package-version '(MH-E . "7.0"))
2231 2231
2232(mh-defcustom mh-decode-mime-flag (not (not (locate-library "mm-decode"))) 2232(defcustom-mh mh-decode-mime-flag (not (not (locate-library "mm-decode")))
2233 "*Non-nil means attachments are handled\\<mh-folder-mode-map>. 2233 "*Non-nil means attachments are handled\\<mh-folder-mode-map>.
2234 2234
2235MH-E can handle attachments as well if the Gnus `mm-decode' 2235MH-E can handle attachments as well if the Gnus `mm-decode'
@@ -2247,7 +2247,7 @@ messages and other graphical widgets. See the options
2247 :group 'mh-show 2247 :group 'mh-show
2248 :package-version '(MH-E . "7.0")) 2248 :package-version '(MH-E . "7.0"))
2249 2249
2250(mh-defcustom mh-display-buttons-for-alternatives-flag nil 2250(defcustom-mh mh-display-buttons-for-alternatives-flag nil
2251 "*Non-nil means display buttons for all alternative attachments. 2251 "*Non-nil means display buttons for all alternative attachments.
2252 2252
2253Sometimes, a mail program will produce multiple alternatives of 2253Sometimes, a mail program will produce multiple alternatives of
@@ -2259,7 +2259,7 @@ inline and buttons are shown for each of the other alternatives."
2259 :group 'mh-show 2259 :group 'mh-show
2260 :package-version '(MH-E . "7.4")) 2260 :package-version '(MH-E . "7.4"))
2261 2261
2262(mh-defcustom mh-display-buttons-for-inline-parts-flag nil 2262(defcustom-mh mh-display-buttons-for-inline-parts-flag nil
2263 "*Non-nil means display buttons for all inline attachments\\<mh-folder-mode-map>. 2263 "*Non-nil means display buttons for all inline attachments\\<mh-folder-mode-map>.
2264 2264
2265The sender can request that attachments should be viewed inline so 2265The sender can request that attachments should be viewed inline so
@@ -2282,7 +2282,7 @@ text (including HTML) and images."
2282 :group 'mh-show 2282 :group 'mh-show
2283 :package-version '(MH-E . "7.0")) 2283 :package-version '(MH-E . "7.0"))
2284 2284
2285(mh-defcustom mh-do-not-confirm-flag nil 2285(defcustom-mh mh-do-not-confirm-flag nil
2286 "*Non-nil means non-reversible commands do not prompt for confirmation. 2286 "*Non-nil means non-reversible commands do not prompt for confirmation.
2287 2287
2288Commands such as `mh-pack-folder' prompt to confirm whether to 2288Commands such as `mh-pack-folder' prompt to confirm whether to
@@ -2294,7 +2294,7 @@ retracted--without question."
2294 :group 'mh-show 2294 :group 'mh-show
2295 :package-version '(MH-E . "7.0")) 2295 :package-version '(MH-E . "7.0"))
2296 2296
2297(mh-defcustom mh-fetch-x-image-url nil 2297(defcustom-mh mh-fetch-x-image-url nil
2298 "*Control fetching of \"X-Image-URL:\" header field image. 2298 "*Control fetching of \"X-Image-URL:\" header field image.
2299 2299
2300Ths option controls the fetching of the \"X-Image-URL:\" header 2300Ths option controls the fetching of the \"X-Image-URL:\" header
@@ -2330,7 +2330,7 @@ turned on."
2330 :group 'mh-show 2330 :group 'mh-show
2331 :package-version '(MH-E . "7.3")) 2331 :package-version '(MH-E . "7.3"))
2332 2332
2333(mh-defcustom mh-graphical-smileys-flag t 2333(defcustom-mh mh-graphical-smileys-flag t
2334 "*Non-nil means graphical smileys are displayed. 2334 "*Non-nil means graphical smileys are displayed.
2335 2335
2336It is a long standing custom to inject body language using a 2336It is a long standing custom to inject body language using a
@@ -2345,7 +2345,7 @@ turned off."
2345 :group 'mh-show 2345 :group 'mh-show
2346 :package-version '(MH-E . "7.0")) 2346 :package-version '(MH-E . "7.0"))
2347 2347
2348(mh-defcustom mh-graphical-emphasis-flag t 2348(defcustom-mh mh-graphical-emphasis-flag t
2349 "*Non-nil means graphical emphasis is displayed. 2349 "*Non-nil means graphical emphasis is displayed.
2350 2350
2351A few typesetting features are indicated in ASCII text with 2351A few typesetting features are indicated in ASCII text with
@@ -2362,7 +2362,7 @@ turned off."
2362 :group 'mh-show 2362 :group 'mh-show
2363 :package-version '(MH-E . "7.0")) 2363 :package-version '(MH-E . "7.0"))
2364 2364
2365(mh-defcustom mh-highlight-citation-style 'gnus 2365(defcustom-mh mh-highlight-citation-style 'gnus
2366 "Style for highlighting citations. 2366 "Style for highlighting citations.
2367 2367
2368If the sender of the message has cited other messages in his 2368If the sender of the message has cited other messages in his
@@ -2589,7 +2589,7 @@ Because the function `mh-invisible-headers' uses both
2589`mh-invisible-header-fields' and `mh-invisible-header-fields', it 2589`mh-invisible-header-fields' and `mh-invisible-header-fields', it
2590cannot be run until both variables have been initialized.") 2590cannot be run until both variables have been initialized.")
2591 2591
2592(mh-defcustom mh-invisible-header-fields nil 2592(defcustom-mh mh-invisible-header-fields nil
2593 "*Additional header fields to hide. 2593 "*Additional header fields to hide.
2594 2594
2595Header fields that you would like to hide that aren't listed in 2595Header fields that you would like to hide that aren't listed in
@@ -2610,7 +2610,7 @@ See also `mh-clean-message-header-flag'."
2610 :group 'mh-show 2610 :group 'mh-show
2611 :package-version '(MH-E . "7.1")) 2611 :package-version '(MH-E . "7.1"))
2612 2612
2613(mh-defcustom mh-invisible-header-fields-default nil 2613(defcustom-mh mh-invisible-header-fields-default nil
2614 "*List of hidden header fields. 2614 "*List of hidden header fields.
2615 2615
2616The header fields listed in this option are hidden, although you 2616The header fields listed in this option are hidden, although you
@@ -2663,7 +2663,7 @@ removed and entries from `mh-invisible-header-fields' are added."
2663;; Compile invisible header fields. 2663;; Compile invisible header fields.
2664(mh-invisible-headers) 2664(mh-invisible-headers)
2665 2665
2666(mh-defcustom mh-lpr-command-format "lpr -J '%s'" 2666(defcustom-mh mh-lpr-command-format "lpr -J '%s'"
2667 "*Command used to print\\<mh-folder-mode-map>. 2667 "*Command used to print\\<mh-folder-mode-map>.
2668 2668
2669This option contains the Unix command line which performs the 2669This option contains the Unix command line which performs the
@@ -2680,7 +2680,7 @@ This options is not used by the commands \\[mh-ps-print-msg] or
2680 :group 'mh-show 2680 :group 'mh-show
2681 :package-version '(MH-E . "6.0")) 2681 :package-version '(MH-E . "6.0"))
2682 2682
2683(mh-defcustom mh-max-inline-image-height nil 2683(defcustom-mh mh-max-inline-image-height nil
2684 "*Maximum inline image height if \"Content-Disposition:\" is not present. 2684 "*Maximum inline image height if \"Content-Disposition:\" is not present.
2685 2685
2686Some older mail programs do not insert this needed plumbing to 2686Some older mail programs do not insert this needed plumbing to
@@ -2696,7 +2696,7 @@ these numbers."
2696 :group 'mh-show 2696 :group 'mh-show
2697 :package-version '(MH-E . "7.0")) 2697 :package-version '(MH-E . "7.0"))
2698 2698
2699(mh-defcustom mh-max-inline-image-width nil 2699(defcustom-mh mh-max-inline-image-width nil
2700 "*Maximum inline image width if \"Content-Disposition:\" is not present. 2700 "*Maximum inline image width if \"Content-Disposition:\" is not present.
2701 2701
2702Some older mail programs do not insert this needed plumbing to 2702Some older mail programs do not insert this needed plumbing to
@@ -2712,7 +2712,7 @@ these numbers."
2712 :group 'mh-show 2712 :group 'mh-show
2713 :package-version '(MH-E . "7.0")) 2713 :package-version '(MH-E . "7.0"))
2714 2714
2715(mh-defcustom mh-mhl-format-file nil 2715(defcustom-mh mh-mhl-format-file nil
2716 "*Specifies the format file to pass to the \"mhl\" program. 2716 "*Specifies the format file to pass to the \"mhl\" program.
2717 2717
2718Normally MH-E takes care of displaying messages itself (rather than 2718Normally MH-E takes care of displaying messages itself (rather than
@@ -2736,7 +2736,7 @@ file."
2736 :group 'mh-show 2736 :group 'mh-show
2737 :package-version '(MH-E . "8.0")) 2737 :package-version '(MH-E . "8.0"))
2738 2738
2739(mh-defcustom mh-mime-save-parts-default-directory t 2739(defcustom-mh mh-mime-save-parts-default-directory t
2740 "Default directory to use for \\<mh-folder-mode-map>\\[mh-mime-save-parts]. 2740 "Default directory to use for \\<mh-folder-mode-map>\\[mh-mime-save-parts].
2741 2741
2742The default value for this option is \"Prompt Always\" so that 2742The default value for this option is \"Prompt Always\" so that
@@ -2752,7 +2752,7 @@ directory's name."
2752 :group 'mh-show 2752 :group 'mh-show
2753 :package-version '(MH-E . "7.0")) 2753 :package-version '(MH-E . "7.0"))
2754 2754
2755(mh-defcustom mh-print-background-flag nil 2755(defcustom-mh mh-print-background-flag nil
2756 "*Non-nil means messages should be printed in the background\\<mh-folder-mode-map>. 2756 "*Non-nil means messages should be printed in the background\\<mh-folder-mode-map>.
2757 2757
2758Normally messages are printed in the foreground. If this is slow on 2758Normally messages are printed in the foreground. If this is slow on
@@ -2768,7 +2768,7 @@ This option is not used by the commands \\[mh-ps-print-msg] or
2768 :group 'mh-show 2768 :group 'mh-show
2769 :package-version '(MH-E . "7.0")) 2769 :package-version '(MH-E . "7.0"))
2770 2770
2771(mh-defcustom mh-show-maximum-size 0 2771(defcustom-mh mh-show-maximum-size 0
2772 "*Maximum size of message (in bytes) to display automatically. 2772 "*Maximum size of message (in bytes) to display automatically.
2773 2773
2774This option provides an opportunity to skip over large messages 2774This option provides an opportunity to skip over large messages
@@ -2778,7 +2778,7 @@ message are shown regardless of size."
2778 :group 'mh-show 2778 :group 'mh-show
2779 :package-version '(MH-E . "8.0")) 2779 :package-version '(MH-E . "8.0"))
2780 2780
2781(mh-defcustom mh-show-use-xface-flag (>= emacs-major-version 21) 2781(defcustom-mh mh-show-use-xface-flag (>= emacs-major-version 21)
2782 "*Non-nil means display face images in MH-show buffers. 2782 "*Non-nil means display face images in MH-show buffers.
2783 2783
2784MH-E can display the content of \"Face:\", \"X-Face:\", and 2784MH-E can display the content of \"Face:\", \"X-Face:\", and
@@ -2818,7 +2818,7 @@ The option `mh-fetch-x-image-url' controls the fetching of the
2818 :group 'mh-show 2818 :group 'mh-show
2819 :package-version '(MH-E . "7.0")) 2819 :package-version '(MH-E . "7.0"))
2820 2820
2821(mh-defcustom mh-store-default-directory nil 2821(defcustom-mh mh-store-default-directory nil
2822 "*Default directory for \\<mh-folder-mode-map>\\[mh-store-msg]. 2822 "*Default directory for \\<mh-folder-mode-map>\\[mh-store-msg].
2823 2823
2824If you would like to change the initial default directory, 2824If you would like to change the initial default directory,
@@ -2830,7 +2830,7 @@ the content of these messages."
2830 :group 'mh-show 2830 :group 'mh-show
2831 :package-version '(MH-E . "6.0")) 2831 :package-version '(MH-E . "6.0"))
2832 2832
2833(mh-defcustom mh-summary-height nil 2833(defcustom-mh mh-summary-height nil
2834 "*Number of lines in MH-Folder buffer (including the mode line). 2834 "*Number of lines in MH-Folder buffer (including the mode line).
2835 2835
2836The default value of this option is \"Automatic\" which means 2836The default value of this option is \"Automatic\" which means
@@ -2845,7 +2845,7 @@ lines you'd like to see."
2845 2845
2846;;; The Speedbar (:group 'mh-speedbar) 2846;;; The Speedbar (:group 'mh-speedbar)
2847 2847
2848(mh-defcustom mh-speed-update-interval 60 2848(defcustom-mh mh-speed-update-interval 60
2849 "Time between speedbar updates in seconds. 2849 "Time between speedbar updates in seconds.
2850Set to 0 to disable automatic update." 2850Set to 0 to disable automatic update."
2851 :type 'integer 2851 :type 'integer
@@ -2854,7 +2854,7 @@ Set to 0 to disable automatic update."
2854 2854
2855;;; Threading (:group 'mh-thread) 2855;;; Threading (:group 'mh-thread)
2856 2856
2857(mh-defcustom mh-show-threads-flag nil 2857(defcustom-mh mh-show-threads-flag nil
2858 "*Non-nil means new folders start in threaded mode. 2858 "*Non-nil means new folders start in threaded mode.
2859 2859
2860Threading large number of messages can be time consuming so this 2860Threading large number of messages can be time consuming so this
@@ -2870,7 +2870,7 @@ threaded is less than `mh-large-folder'."
2870;; mh-tool-bar-folder-buttons and mh-tool-bar-letter-buttons defined 2870;; mh-tool-bar-folder-buttons and mh-tool-bar-letter-buttons defined
2871;; dynamically in mh-tool-bar.el. 2871;; dynamically in mh-tool-bar.el.
2872 2872
2873(mh-defcustom mh-tool-bar-search-function 'mh-search 2873(defcustom-mh mh-tool-bar-search-function 'mh-search
2874 "*Function called by the tool bar search button. 2874 "*Function called by the tool bar search button.
2875 2875
2876By default, this is set to `mh-search'. You can also choose 2876By default, this is set to `mh-search'. You can also choose
@@ -2883,7 +2883,7 @@ of your own choosing."
2883 2883
2884;; XEmacs has a couple of extra customizations... 2884;; XEmacs has a couple of extra customizations...
2885(mh-do-in-xemacs 2885(mh-do-in-xemacs
2886 (mh-defcustom mh-xemacs-use-tool-bar-flag mh-xemacs-has-tool-bar-flag 2886 (defcustom-mh mh-xemacs-use-tool-bar-flag mh-xemacs-has-tool-bar-flag
2887 "*If non-nil, use tool bar. 2887 "*If non-nil, use tool bar.
2888 2888
2889This option controls whether to show the MH-E icons at all. By 2889This option controls whether to show the MH-E icons at all. By
@@ -2899,7 +2899,7 @@ won't be able to turn on this option."
2899 (set-default symbol value)) 2899 (set-default symbol value))
2900 :package-version '(MH-E . "7.3")) 2900 :package-version '(MH-E . "7.3"))
2901 2901
2902 (mh-defcustom mh-xemacs-tool-bar-position nil 2902 (defcustom-mh mh-xemacs-tool-bar-position nil
2903 "*Tool bar location. 2903 "*Tool bar location.
2904 2904
2905This option controls the placement of the tool bar along the four 2905This option controls the placement of the tool bar along the four
@@ -2921,7 +2921,7 @@ default tool bar."
2921 2921
2922;;; Hooks (:group 'mh-hooks + group where hook described) 2922;;; Hooks (:group 'mh-hooks + group where hook described)
2923 2923
2924(mh-defcustom mh-after-commands-processed-hook nil 2924(defcustom-mh mh-after-commands-processed-hook nil
2925 "Hook run by \\<mh-folder-mode-map>\\[mh-execute-commands] after performing outstanding refile and delete requests. 2925 "Hook run by \\<mh-folder-mode-map>\\[mh-execute-commands] after performing outstanding refile and delete requests.
2926 2926
2927Variables that are useful in this hook include 2927Variables that are useful in this hook include
@@ -2933,14 +2933,14 @@ folder, which is also available in `mh-current-folder'."
2933 :group 'mh-folder 2933 :group 'mh-folder
2934 :package-version '(MH-E . "8.0")) 2934 :package-version '(MH-E . "8.0"))
2935 2935
2936(mh-defcustom mh-alias-reloaded-hook nil 2936(defcustom-mh mh-alias-reloaded-hook nil
2937 "Hook run by `mh-alias-reload' after loading aliases." 2937 "Hook run by `mh-alias-reload' after loading aliases."
2938 :type 'hook 2938 :type 'hook
2939 :group 'mh-hooks 2939 :group 'mh-hooks
2940 :group 'mh-alias 2940 :group 'mh-alias
2941 :package-version '(MH-E . "8.0")) 2941 :package-version '(MH-E . "8.0"))
2942 2942
2943(mh-defcustom mh-before-commands-processed-hook nil 2943(defcustom-mh mh-before-commands-processed-hook nil
2944 "Hook run by \\<mh-folder-mode-map>\\[mh-execute-commands] before performing outstanding refile and delete requests. 2944 "Hook run by \\<mh-folder-mode-map>\\[mh-execute-commands] before performing outstanding refile and delete requests.
2945 2945
2946Variables that are useful in this hook include `mh-delete-list' 2946Variables that are useful in this hook include `mh-delete-list'
@@ -2951,7 +2951,7 @@ be made to the current folder, `mh-current-folder'."
2951 :group 'mh-folder 2951 :group 'mh-folder
2952 :package-version '(MH-E . "8.0")) 2952 :package-version '(MH-E . "8.0"))
2953 2953
2954(mh-defcustom mh-before-quit-hook nil 2954(defcustom-mh mh-before-quit-hook nil
2955 "Hook run by \\<mh-folder-mode-map>\\[mh-quit] before quitting MH-E. 2955 "Hook run by \\<mh-folder-mode-map>\\[mh-quit] before quitting MH-E.
2956 2956
2957This hook is called before the quit occurs, so you might use it 2957This hook is called before the quit occurs, so you might use it
@@ -2964,7 +2964,7 @@ See also `mh-quit-hook'."
2964 :group 'mh-folder 2964 :group 'mh-folder
2965 :package-version '(MH-E . "6.0")) 2965 :package-version '(MH-E . "6.0"))
2966 2966
2967(mh-defcustom mh-before-send-letter-hook nil 2967(defcustom-mh mh-before-send-letter-hook nil
2968 "Hook run at the beginning of the \\<mh-letter-mode-map>\\[mh-send-letter] command. 2968 "Hook run at the beginning of the \\<mh-letter-mode-map>\\[mh-send-letter] command.
2969 2969
2970For example, if you want to check your spelling in your message 2970For example, if you want to check your spelling in your message
@@ -2975,7 +2975,7 @@ before sending, add the `ispell-message' function."
2975 :group 'mh-letter 2975 :group 'mh-letter
2976 :package-version '(MH-E . "6.0")) 2976 :package-version '(MH-E . "6.0"))
2977 2977
2978(mh-defcustom mh-delete-msg-hook nil 2978(defcustom-mh mh-delete-msg-hook nil
2979 "Hook run by \\<mh-letter-mode-map>\\[mh-delete-msg] after marking each message for deletion. 2979 "Hook run by \\<mh-letter-mode-map>\\[mh-delete-msg] after marking each message for deletion.
2980 2980
2981For example, a past maintainer of MH-E used this once when he 2981For example, a past maintainer of MH-E used this once when he
@@ -2985,7 +2985,7 @@ kept statistics on his mail usage."
2985 :group 'mh-show 2985 :group 'mh-show
2986 :package-version '(MH-E . "6.0")) 2986 :package-version '(MH-E . "6.0"))
2987 2987
2988(mh-defcustom mh-find-path-hook nil 2988(defcustom-mh mh-find-path-hook nil
2989 "Hook run by `mh-find-path' after reading the user's MH profile. 2989 "Hook run by `mh-find-path' after reading the user's MH profile.
2990 2990
2991This hook can be used the change the value of the variables that 2991This hook can be used the change the value of the variables that
@@ -2996,28 +2996,28 @@ between MH and MH-E."
2996 :group 'mh-e 2996 :group 'mh-e
2997 :package-version '(MH-E . "7.0")) 2997 :package-version '(MH-E . "7.0"))
2998 2998
2999(mh-defcustom mh-folder-mode-hook nil 2999(defcustom-mh mh-folder-mode-hook nil
3000 "Hook run by `mh-folder-mode' when visiting a new folder." 3000 "Hook run by `mh-folder-mode' when visiting a new folder."
3001 :type 'hook 3001 :type 'hook
3002 :group 'mh-hooks 3002 :group 'mh-hooks
3003 :group 'mh-folder 3003 :group 'mh-folder
3004 :package-version '(MH-E . "6.0")) 3004 :package-version '(MH-E . "6.0"))
3005 3005
3006(mh-defcustom mh-forward-hook nil 3006(defcustom-mh mh-forward-hook nil
3007 "Hook run by `mh-forward' on a forwarded letter." 3007 "Hook run by `mh-forward' on a forwarded letter."
3008 :type 'hook 3008 :type 'hook
3009 :group 'mh-hooks 3009 :group 'mh-hooks
3010 :group 'mh-sending-mail 3010 :group 'mh-sending-mail
3011 :package-version '(MH-E . "8.0")) 3011 :package-version '(MH-E . "8.0"))
3012 3012
3013(mh-defcustom mh-inc-folder-hook nil 3013(defcustom-mh mh-inc-folder-hook nil
3014 "Hook run by \\<mh-folder-mode-map>\\[mh-inc-folder] after incorporating mail into a folder." 3014 "Hook run by \\<mh-folder-mode-map>\\[mh-inc-folder] after incorporating mail into a folder."
3015 :type 'hook 3015 :type 'hook
3016 :group 'mh-hooks 3016 :group 'mh-hooks
3017 :group 'mh-inc 3017 :group 'mh-inc
3018 :package-version '(MH-E . "6.0")) 3018 :package-version '(MH-E . "6.0"))
3019 3019
3020(mh-defcustom mh-insert-signature-hook nil 3020(defcustom-mh mh-insert-signature-hook nil
3021 "Hook run by \\<mh-letter-mode-map>\\[mh-insert-signature] after signature has been inserted. 3021 "Hook run by \\<mh-letter-mode-map>\\[mh-insert-signature] after signature has been inserted.
3022 3022
3023Hook functions may access the actual name of the file or the 3023Hook functions may access the actual name of the file or the
@@ -3028,7 +3028,7 @@ function used to insert the signature with
3028 :group 'mh-letter 3028 :group 'mh-letter
3029 :package-version '(MH-E . "8.0")) 3029 :package-version '(MH-E . "8.0"))
3030 3030
3031(mh-defcustom mh-kill-folder-suppress-prompt-hooks '(mh-search-p) 3031(defcustom-mh mh-kill-folder-suppress-prompt-hooks '(mh-search-p)
3032 "Abnormal hook run at the beginning of \\<mh-folder-mode-map>\\[mh-kill-folder]. 3032 "Abnormal hook run at the beginning of \\<mh-folder-mode-map>\\[mh-kill-folder].
3033 3033
3034The hook functions are called with no arguments and should return 3034The hook functions are called with no arguments and should return
@@ -3046,7 +3046,7 @@ accident in the \"+inbox\" folder, you will not be happy."
3046 :group 'mh-folder 3046 :group 'mh-folder
3047 :package-version '(MH-E . "7.4")) 3047 :package-version '(MH-E . "7.4"))
3048 3048
3049(mh-defcustom mh-letter-mode-hook nil 3049(defcustom-mh mh-letter-mode-hook nil
3050 "Hook run by `mh-letter-mode' on a new letter. 3050 "Hook run by `mh-letter-mode' on a new letter.
3051 3051
3052This hook allows you to do some processing before editing a 3052This hook allows you to do some processing before editing a
@@ -3059,14 +3059,14 @@ go."
3059 :group 'mh-sending-mail 3059 :group 'mh-sending-mail
3060 :package-version '(MH-E . "6.0")) 3060 :package-version '(MH-E . "6.0"))
3061 3061
3062(mh-defcustom mh-mh-to-mime-hook nil 3062(defcustom-mh mh-mh-to-mime-hook nil
3063 "Hook run on the formatted letter by \\<mh-letter-mode-map>\\[mh-mh-to-mime]." 3063 "Hook run on the formatted letter by \\<mh-letter-mode-map>\\[mh-mh-to-mime]."
3064 :type 'hook 3064 :type 'hook
3065 :group 'mh-hooks 3065 :group 'mh-hooks
3066 :group 'mh-letter 3066 :group 'mh-letter
3067 :package-version '(MH-E . "8.0")) 3067 :package-version '(MH-E . "8.0"))
3068 3068
3069(mh-defcustom mh-search-mode-hook nil 3069(defcustom-mh mh-search-mode-hook nil
3070 "Hook run upon entry to `mh-search-mode'\\<mh-folder-mode-map>. 3070 "Hook run upon entry to `mh-search-mode'\\<mh-folder-mode-map>.
3071 3071
3072If you find that you do the same thing over and over when editing 3072If you find that you do the same thing over and over when editing
@@ -3078,7 +3078,7 @@ This can be done with this hook which is called when
3078 :group 'mh-search 3078 :group 'mh-search
3079 :package-version '(MH-E . "8.0")) 3079 :package-version '(MH-E . "8.0"))
3080 3080
3081(mh-defcustom mh-quit-hook nil 3081(defcustom-mh mh-quit-hook nil
3082 "Hook run by \\<mh-folder-mode-map>\\[mh-quit] after quitting MH-E. 3082 "Hook run by \\<mh-folder-mode-map>\\[mh-quit] after quitting MH-E.
3083 3083
3084This hook is not run in an MH-E context, so you might use it to 3084This hook is not run in an MH-E context, so you might use it to
@@ -3090,14 +3090,14 @@ See also `mh-before-quit-hook'."
3090 :group 'mh-folder 3090 :group 'mh-folder
3091 :package-version '(MH-E . "6.0")) 3091 :package-version '(MH-E . "6.0"))
3092 3092
3093(mh-defcustom mh-refile-msg-hook nil 3093(defcustom-mh mh-refile-msg-hook nil
3094 "Hook run by \\<mh-folder-mode-map>\\[mh-refile-msg] after marking each message for refiling." 3094 "Hook run by \\<mh-folder-mode-map>\\[mh-refile-msg] after marking each message for refiling."
3095 :type 'hook 3095 :type 'hook
3096 :group 'mh-hooks 3096 :group 'mh-hooks
3097 :group 'mh-folder 3097 :group 'mh-folder
3098 :package-version '(MH-E . "6.0")) 3098 :package-version '(MH-E . "6.0"))
3099 3099
3100(mh-defcustom mh-show-hook nil 3100(defcustom-mh mh-show-hook nil
3101 "Hook run after \\<mh-folder-mode-map>\\[mh-show] shows a message. 3101 "Hook run after \\<mh-folder-mode-map>\\[mh-show] shows a message.
3102 3102
3103It is the last thing called after messages are displayed. It's 3103It is the last thing called after messages are displayed. It's
@@ -3108,7 +3108,7 @@ used to affect the behavior of MH-E in general or when
3108 :group 'mh-show 3108 :group 'mh-show
3109 :package-version '(MH-E . "6.0")) 3109 :package-version '(MH-E . "6.0"))
3110 3110
3111(mh-defcustom mh-show-mode-hook nil 3111(defcustom-mh mh-show-mode-hook nil
3112 "Hook run upon entry to `mh-show-mode'. 3112 "Hook run upon entry to `mh-show-mode'.
3113 3113
3114This hook is called early on in the process of the message 3114This hook is called early on in the process of the message
@@ -3119,7 +3119,7 @@ message's content. See `mh-show-hook'."
3119 :group 'mh-show 3119 :group 'mh-show
3120 :package-version '(MH-E . "6.0")) 3120 :package-version '(MH-E . "6.0"))
3121 3121
3122(mh-defcustom mh-unseen-updated-hook nil 3122(defcustom-mh mh-unseen-updated-hook nil
3123 "Hook run after the unseen sequence has been updated. 3123 "Hook run after the unseen sequence has been updated.
3124 3124
3125The variable `mh-seen-list' can be used by this hook to obtain 3125The variable `mh-seen-list' can be used by this hook to obtain
@@ -3139,7 +3139,7 @@ sequence."
3139 3139
3140;; To add a new face: 3140;; To add a new face:
3141;; 1. Add entry to variable mh-face-data. 3141;; 1. Add entry to variable mh-face-data.
3142;; 2. Create face using mh-defface (which removes min-color spec and 3142;; 2. Create face using defface-mh (which removes min-color spec and
3143;; :package-version keyword where these are not supported), 3143;; :package-version keyword where these are not supported),
3144;; accessing face data with function mh-face-data. 3144;; accessing face data with function mh-face-data.
3145;; 3. Add inherit argument to function mh-face-data if applicable. 3145;; 3. Add inherit argument to function mh-face-data if applicable.
@@ -3288,7 +3288,7 @@ sequence."
3288 (:underline t))))) 3288 (:underline t)))))
3289 "MH-E face data. 3289 "MH-E face data.
3290Used by function `mh-face-data' which returns spec that is 3290Used by function `mh-face-data' which returns spec that is
3291consumed by `mh-defface'.") 3291consumed by `defface-mh'.")
3292 3292
3293(require 'cus-face) 3293(require 'cus-face)
3294 3294
@@ -3341,14 +3341,14 @@ specified colors."
3341 (setq new-spec (cons entry new-spec))))) 3341 (setq new-spec (cons entry new-spec)))))
3342 new-spec)))) 3342 new-spec))))
3343 3343
3344(mh-defface mh-folder-address 3344(defface-mh mh-folder-address
3345 (mh-face-data 'mh-folder-subject '((t (:inherit mh-folder-subject)))) 3345 (mh-face-data 'mh-folder-subject '((t (:inherit mh-folder-subject))))
3346 "Recipient face." 3346 "Recipient face."
3347 :group 'mh-faces 3347 :group 'mh-faces
3348 :group 'mh-folder 3348 :group 'mh-folder
3349 :package-version '(MH-E . "8.0")) 3349 :package-version '(MH-E . "8.0"))
3350 3350
3351(mh-defface mh-folder-body 3351(defface-mh mh-folder-body
3352 (mh-face-data 'mh-folder-msg-number 3352 (mh-face-data 'mh-folder-msg-number
3353 '((((class color)) 3353 '((((class color))
3354 (:inherit mh-folder-msg-number)) 3354 (:inherit mh-folder-msg-number))
@@ -3359,7 +3359,7 @@ specified colors."
3359 :group 'mh-folder 3359 :group 'mh-folder
3360 :package-version '(MH-E . "8.0")) 3360 :package-version '(MH-E . "8.0"))
3361 3361
3362(mh-defface mh-folder-cur-msg-number 3362(defface-mh mh-folder-cur-msg-number
3363 (mh-face-data 'mh-folder-msg-number 3363 (mh-face-data 'mh-folder-msg-number
3364 '((t (:inherit mh-folder-msg-number :bold t)))) 3364 '((t (:inherit mh-folder-msg-number :bold t))))
3365 "Current message number face." 3365 "Current message number face."
@@ -3367,39 +3367,39 @@ specified colors."
3367 :group 'mh-folder 3367 :group 'mh-folder
3368 :package-version '(MH-E . "8.0")) 3368 :package-version '(MH-E . "8.0"))
3369 3369
3370(mh-defface mh-folder-date 3370(defface-mh mh-folder-date
3371 (mh-face-data 'mh-folder-msg-number '((t (:inherit mh-folder-msg-number)))) 3371 (mh-face-data 'mh-folder-msg-number '((t (:inherit mh-folder-msg-number))))
3372 "Date face." 3372 "Date face."
3373 :group 'mh-faces 3373 :group 'mh-faces
3374 :group 'mh-folder 3374 :group 'mh-folder
3375 :package-version '(MH-E . "8.0")) 3375 :package-version '(MH-E . "8.0"))
3376 3376
3377(mh-defface mh-folder-deleted 3377(defface-mh mh-folder-deleted
3378 (mh-face-data 'mh-folder-msg-number '((t (:inherit mh-folder-msg-number)))) 3378 (mh-face-data 'mh-folder-msg-number '((t (:inherit mh-folder-msg-number))))
3379 "Deleted message face." 3379 "Deleted message face."
3380 :group 'mh-faces 3380 :group 'mh-faces
3381 :group 'mh-folder 3381 :group 'mh-folder
3382 :package-version '(MH-E . "8.0")) 3382 :package-version '(MH-E . "8.0"))
3383 3383
3384(mh-defface mh-folder-followup (mh-face-data 'mh-folder-followup) 3384(defface-mh mh-folder-followup (mh-face-data 'mh-folder-followup)
3385 "\"Re:\" face." 3385 "\"Re:\" face."
3386 :group 'mh-faces 3386 :group 'mh-faces
3387 :group 'mh-folder 3387 :group 'mh-folder
3388 :package-version '(MH-E . "8.0")) 3388 :package-version '(MH-E . "8.0"))
3389 3389
3390(mh-defface mh-folder-msg-number (mh-face-data 'mh-folder-msg-number) 3390(defface-mh mh-folder-msg-number (mh-face-data 'mh-folder-msg-number)
3391 "Message number face." 3391 "Message number face."
3392 :group 'mh-faces 3392 :group 'mh-faces
3393 :group 'mh-folder 3393 :group 'mh-folder
3394 :package-version '(MH-E . "8.0")) 3394 :package-version '(MH-E . "8.0"))
3395 3395
3396(mh-defface mh-folder-refiled (mh-face-data 'mh-folder-refiled) 3396(defface-mh mh-folder-refiled (mh-face-data 'mh-folder-refiled)
3397 "Refiled message face." 3397 "Refiled message face."
3398 :group 'mh-faces 3398 :group 'mh-faces
3399 :group 'mh-folder 3399 :group 'mh-folder
3400 :package-version '(MH-E . "8.0")) 3400 :package-version '(MH-E . "8.0"))
3401 3401
3402(mh-defface mh-folder-sent-to-me-hint 3402(defface-mh mh-folder-sent-to-me-hint
3403 (mh-face-data 'mh-folder-msg-number '((t (:inherit mh-folder-date)))) 3403 (mh-face-data 'mh-folder-msg-number '((t (:inherit mh-folder-date))))
3404 "Fontification hint face in messages sent directly to us. 3404 "Fontification hint face in messages sent directly to us.
3405The detection of messages sent to us is governed by the scan 3405The detection of messages sent to us is governed by the scan
@@ -3409,7 +3409,7 @@ format `mh-scan-format-nmh' and the regular expression
3409 :group 'mh-folder 3409 :group 'mh-folder
3410 :package-version '(MH-E . "8.0")) 3410 :package-version '(MH-E . "8.0"))
3411 3411
3412(mh-defface mh-folder-sent-to-me-sender 3412(defface-mh mh-folder-sent-to-me-sender
3413 (mh-face-data 'mh-folder-followup '((t (:inherit mh-folder-followup)))) 3413 (mh-face-data 'mh-folder-followup '((t (:inherit mh-folder-followup))))
3414 "Sender face in messages sent directly to us. 3414 "Sender face in messages sent directly to us.
3415The detection of messages sent to us is governed by the scan 3415The detection of messages sent to us is governed by the scan
@@ -3419,98 +3419,98 @@ format `mh-scan-format-nmh' and the regular expression
3419 :group 'mh-folder 3419 :group 'mh-folder
3420 :package-version '(MH-E . "8.0")) 3420 :package-version '(MH-E . "8.0"))
3421 3421
3422(mh-defface mh-folder-subject (mh-face-data 'mh-folder-subject) 3422(defface-mh mh-folder-subject (mh-face-data 'mh-folder-subject)
3423 "Subject face." 3423 "Subject face."
3424 :group 'mh-faces 3424 :group 'mh-faces
3425 :group 'mh-folder 3425 :group 'mh-folder
3426 :package-version '(MH-E . "8.0")) 3426 :package-version '(MH-E . "8.0"))
3427 3427
3428(mh-defface mh-folder-tick (mh-face-data 'mh-folder-tick) 3428(defface-mh mh-folder-tick (mh-face-data 'mh-folder-tick)
3429 "Ticked message face." 3429 "Ticked message face."
3430 :group 'mh-faces 3430 :group 'mh-faces
3431 :group 'mh-folder 3431 :group 'mh-folder
3432 :package-version '(MH-E . "8.0")) 3432 :package-version '(MH-E . "8.0"))
3433 3433
3434(mh-defface mh-folder-to (mh-face-data 'mh-folder-to) 3434(defface-mh mh-folder-to (mh-face-data 'mh-folder-to)
3435 "\"To:\" face." 3435 "\"To:\" face."
3436 :group 'mh-faces 3436 :group 'mh-faces
3437 :group 'mh-folder 3437 :group 'mh-folder
3438 :package-version '(MH-E . "8.0")) 3438 :package-version '(MH-E . "8.0"))
3439 3439
3440(mh-defface mh-letter-header-field (mh-face-data 'mh-letter-header-field) 3440(defface-mh mh-letter-header-field (mh-face-data 'mh-letter-header-field)
3441 "Editable header field value face in draft buffers." 3441 "Editable header field value face in draft buffers."
3442 :group 'mh-faces 3442 :group 'mh-faces
3443 :group 'mh-letter 3443 :group 'mh-letter
3444 :package-version '(MH-E . "8.0")) 3444 :package-version '(MH-E . "8.0"))
3445 3445
3446(mh-defface mh-search-folder (mh-face-data 'mh-search-folder) 3446(defface-mh mh-search-folder (mh-face-data 'mh-search-folder)
3447 "Folder heading face in MH-Folder buffers created by searches." 3447 "Folder heading face in MH-Folder buffers created by searches."
3448 :group 'mh-faces 3448 :group 'mh-faces
3449 :group 'mh-search 3449 :group 'mh-search
3450 :package-version '(MH-E . "8.0")) 3450 :package-version '(MH-E . "8.0"))
3451 3451
3452(mh-defface mh-show-cc (mh-face-data 'mh-show-cc) 3452(defface-mh mh-show-cc (mh-face-data 'mh-show-cc)
3453 "Face used to highlight \"cc:\" header fields." 3453 "Face used to highlight \"cc:\" header fields."
3454 :group 'mh-faces 3454 :group 'mh-faces
3455 :group 'mh-show 3455 :group 'mh-show
3456 :package-version '(MH-E . "8.0")) 3456 :package-version '(MH-E . "8.0"))
3457 3457
3458(mh-defface mh-show-date (mh-face-data 'mh-show-date) 3458(defface-mh mh-show-date (mh-face-data 'mh-show-date)
3459 "Face used to highlight \"Date:\" header fields." 3459 "Face used to highlight \"Date:\" header fields."
3460 :group 'mh-faces 3460 :group 'mh-faces
3461 :group 'mh-show 3461 :group 'mh-show
3462 :package-version '(MH-E . "8.0")) 3462 :package-version '(MH-E . "8.0"))
3463 3463
3464(mh-defface mh-show-from (mh-face-data 'mh-show-from) 3464(defface-mh mh-show-from (mh-face-data 'mh-show-from)
3465 "Face used to highlight \"From:\" header fields." 3465 "Face used to highlight \"From:\" header fields."
3466 :group 'mh-faces 3466 :group 'mh-faces
3467 :group 'mh-show 3467 :group 'mh-show
3468 :package-version '(MH-E . "8.0")) 3468 :package-version '(MH-E . "8.0"))
3469 3469
3470(mh-defface mh-show-header (mh-face-data 'mh-show-header) 3470(defface-mh mh-show-header (mh-face-data 'mh-show-header)
3471 "Face used to deemphasize less interesting header fields." 3471 "Face used to deemphasize less interesting header fields."
3472 :group 'mh-faces 3472 :group 'mh-faces
3473 :group 'mh-show 3473 :group 'mh-show
3474 :package-version '(MH-E . "8.0")) 3474 :package-version '(MH-E . "8.0"))
3475 3475
3476(mh-defface mh-show-pgg-bad (mh-face-data 'mh-show-pgg-bad) 3476(defface-mh mh-show-pgg-bad (mh-face-data 'mh-show-pgg-bad)
3477 "Bad PGG signature face." 3477 "Bad PGG signature face."
3478 :group 'mh-faces 3478 :group 'mh-faces
3479 :group 'mh-show 3479 :group 'mh-show
3480 :package-version '(MH-E . "8.0")) 3480 :package-version '(MH-E . "8.0"))
3481 3481
3482(mh-defface mh-show-pgg-good (mh-face-data 'mh-show-pgg-good) 3482(defface-mh mh-show-pgg-good (mh-face-data 'mh-show-pgg-good)
3483 "Good PGG signature face." 3483 "Good PGG signature face."
3484 :group 'mh-faces 3484 :group 'mh-faces
3485 :group 'mh-show 3485 :group 'mh-show
3486 :package-version '(MH-E . "8.0")) 3486 :package-version '(MH-E . "8.0"))
3487 3487
3488(mh-defface mh-show-pgg-unknown (mh-face-data 'mh-show-pgg-unknown) 3488(defface-mh mh-show-pgg-unknown (mh-face-data 'mh-show-pgg-unknown)
3489 "Unknown or untrusted PGG signature face." 3489 "Unknown or untrusted PGG signature face."
3490 :group 'mh-faces 3490 :group 'mh-faces
3491 :group 'mh-show 3491 :group 'mh-show
3492 :package-version '(MH-E . "8.0")) 3492 :package-version '(MH-E . "8.0"))
3493 3493
3494(mh-defface mh-show-signature (mh-face-data 'mh-show-signature) 3494(defface-mh mh-show-signature (mh-face-data 'mh-show-signature)
3495 "Signature face." 3495 "Signature face."
3496 :group 'mh-faces 3496 :group 'mh-faces
3497 :group 'mh-show 3497 :group 'mh-show
3498 :package-version '(MH-E . "8.0")) 3498 :package-version '(MH-E . "8.0"))
3499 3499
3500(mh-defface mh-show-subject 3500(defface-mh mh-show-subject
3501 (mh-face-data 'mh-folder-subject '((t (:inherit mh-folder-subject)))) 3501 (mh-face-data 'mh-folder-subject '((t (:inherit mh-folder-subject))))
3502 "Face used to highlight \"Subject:\" header fields." 3502 "Face used to highlight \"Subject:\" header fields."
3503 :group 'mh-faces 3503 :group 'mh-faces
3504 :group 'mh-show 3504 :group 'mh-show
3505 :package-version '(MH-E . "8.0")) 3505 :package-version '(MH-E . "8.0"))
3506 3506
3507(mh-defface mh-show-to (mh-face-data 'mh-show-to) 3507(defface-mh mh-show-to (mh-face-data 'mh-show-to)
3508 "Face used to highlight \"To:\" header fields." 3508 "Face used to highlight \"To:\" header fields."
3509 :group 'mh-faces 3509 :group 'mh-faces
3510 :group 'mh-show 3510 :group 'mh-show
3511 :package-version '(MH-E . "8.0")) 3511 :package-version '(MH-E . "8.0"))
3512 3512
3513(mh-defface mh-show-xface 3513(defface-mh mh-show-xface
3514 (mh-face-data 'mh-show-from '((t (:inherit (mh-show-from highlight))))) 3514 (mh-face-data 'mh-show-from '((t (:inherit (mh-show-from highlight)))))
3515"X-Face image face. 3515"X-Face image face.
3516The background and foreground are used in the image." 3516The background and foreground are used in the image."
@@ -3518,13 +3518,13 @@ The background and foreground are used in the image."
3518 :group 'mh-show 3518 :group 'mh-show
3519 :package-version '(MH-E . "8.0")) 3519 :package-version '(MH-E . "8.0"))
3520 3520
3521(mh-defface mh-speedbar-folder (mh-face-data 'mh-speedbar-folder) 3521(defface-mh mh-speedbar-folder (mh-face-data 'mh-speedbar-folder)
3522 "Basic folder face." 3522 "Basic folder face."
3523 :group 'mh-faces 3523 :group 'mh-faces
3524 :group 'mh-speedbar 3524 :group 'mh-speedbar
3525 :package-version '(MH-E . "8.0")) 3525 :package-version '(MH-E . "8.0"))
3526 3526
3527(mh-defface mh-speedbar-folder-with-unseen-messages 3527(defface-mh mh-speedbar-folder-with-unseen-messages
3528 (mh-face-data 'mh-speedbar-folder 3528 (mh-face-data 'mh-speedbar-folder
3529 '((t (:inherit mh-speedbar-folder :bold t)))) 3529 '((t (:inherit mh-speedbar-folder :bold t))))
3530 "Folder face when folder contains unread messages." 3530 "Folder face when folder contains unread messages."
@@ -3532,14 +3532,14 @@ The background and foreground are used in the image."
3532 :group 'mh-speedbar 3532 :group 'mh-speedbar
3533 :package-version '(MH-E . "8.0")) 3533 :package-version '(MH-E . "8.0"))
3534 3534
3535(mh-defface mh-speedbar-selected-folder 3535(defface-mh mh-speedbar-selected-folder
3536 (mh-face-data 'mh-speedbar-selected-folder) 3536 (mh-face-data 'mh-speedbar-selected-folder)
3537 "Selected folder face." 3537 "Selected folder face."
3538 :group 'mh-faces 3538 :group 'mh-faces
3539 :group 'mh-speedbar 3539 :group 'mh-speedbar
3540 :package-version '(MH-E . "8.0")) 3540 :package-version '(MH-E . "8.0"))
3541 3541
3542(mh-defface mh-speedbar-selected-folder-with-unseen-messages 3542(defface-mh mh-speedbar-selected-folder-with-unseen-messages
3543 (mh-face-data 'mh-speedbar-selected-folder 3543 (mh-face-data 'mh-speedbar-selected-folder
3544 '((t (:inherit mh-speedbar-selected-folder :bold t)))) 3544 '((t (:inherit mh-speedbar-selected-folder :bold t))))
3545 "Selected folder face when folder contains unread messages." 3545 "Selected folder face when folder contains unread messages."
@@ -3548,9 +3548,9 @@ The background and foreground are used in the image."
3548 :package-version '(MH-E . "8.0")) 3548 :package-version '(MH-E . "8.0"))
3549 3549
3550;; Get rid of temporary functions and data structures. 3550;; Get rid of temporary functions and data structures.
3551(fmakunbound 'mh-defcustom) 3551(fmakunbound 'defcustom-mh)
3552(fmakunbound 'mh-defface) 3552(fmakunbound 'defface-mh)
3553(fmakunbound 'mh-defgroup) 3553(fmakunbound 'defgroup-mh)
3554(fmakunbound 'mh-face-data) 3554(fmakunbound 'mh-face-data)
3555(fmakunbound 'mh-strip-package-version) 3555(fmakunbound 'mh-strip-package-version)
3556(makunbound 'mh-face-data) 3556(makunbound 'mh-face-data)
diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el
index 970f98556e2..1e3b385eda7 100644
--- a/lisp/mh-e/mh-gnus.el
+++ b/lisp/mh-e/mh-gnus.el
@@ -39,19 +39,19 @@
39(mh-require 'mml nil t) 39(mh-require 'mml nil t)
40 40
41;; Copy of function from gnus-util.el. 41;; Copy of function from gnus-util.el.
42(mh-defun-compat mh-gnus-local-map-property gnus-local-map-property (map) 42(defun-mh mh-gnus-local-map-property gnus-local-map-property (map)
43 "Return a list suitable for a text property list specifying keymap MAP." 43 "Return a list suitable for a text property list specifying keymap MAP."
44 (cond (mh-xemacs-flag (list 'keymap map)) 44 (cond (mh-xemacs-flag (list 'keymap map))
45 ((>= emacs-major-version 21) (list 'keymap map)) 45 ((>= emacs-major-version 21) (list 'keymap map))
46 (t (list 'local-map map)))) 46 (t (list 'local-map map))))
47 47
48;; Copy of function from mm-decode.el. 48;; Copy of function from mm-decode.el.
49(mh-defun-compat mh-mm-merge-handles mm-merge-handles (handles1 handles2) 49(defun-mh mh-mm-merge-handles mm-merge-handles (handles1 handles2)
50 (append (if (listp (car handles1)) handles1 (list handles1)) 50 (append (if (listp (car handles1)) handles1 (list handles1))
51 (if (listp (car handles2)) handles2 (list handles2)))) 51 (if (listp (car handles2)) handles2 (list handles2))))
52 52
53;; Copy of function from mm-decode.el. 53;; Copy of function from mm-decode.el.
54(mh-defun-compat mh-mm-set-handle-multipart-parameter 54(defun-mh mh-mm-set-handle-multipart-parameter
55 mm-set-handle-multipart-parameter (handle parameter value) 55 mm-set-handle-multipart-parameter (handle parameter value)
56 ;; HANDLE could be a CTL. 56 ;; HANDLE could be a CTL.
57 (if handle 57 (if handle
@@ -59,7 +59,7 @@
59 (car handle)))) 59 (car handle))))
60 60
61;; Copy of function from mm-view.el. 61;; Copy of function from mm-view.el.
62(mh-defun-compat mh-mm-inline-text-vcard mm-inline-text-vcard (handle) 62(defun-mh mh-mm-inline-text-vcard mm-inline-text-vcard (handle)
63 (let (buffer-read-only) 63 (let (buffer-read-only)
64 (mm-insert-inline 64 (mm-insert-inline
65 handle 65 handle
@@ -73,17 +73,17 @@
73 73
74;; Function from mm-decode.el used in PGP messages. Just define it with older 74;; Function from mm-decode.el used in PGP messages. Just define it with older
75;; Gnus to avoid compiler warning. 75;; Gnus to avoid compiler warning.
76(mh-defun-compat mh-mm-possibly-verify-or-decrypt 76(defun-mh mh-mm-possibly-verify-or-decrypt
77 mm-possibly-verify-or-decrypt (parts ctl) 77 mm-possibly-verify-or-decrypt (parts ctl)
78 nil) 78 nil)
79 79
80;; Copy of macro in mm-decode.el. 80;; Copy of macro in mm-decode.el.
81(mh-defmacro-compat mh-mm-handle-multipart-ctl-parameter 81(defmacro-mh mh-mm-handle-multipart-ctl-parameter
82 mm-handle-multipart-ctl-parameter (handle parameter) 82 mm-handle-multipart-ctl-parameter (handle parameter)
83 `(get-text-property 0 ,parameter (car ,handle))) 83 `(get-text-property 0 ,parameter (car ,handle)))
84 84
85;; Copy of function in mm-decode.el. 85;; Copy of function in mm-decode.el.
86(mh-defun-compat mh-mm-readable-p mm-readable-p (handle) 86(defun-mh mh-mm-readable-p mm-readable-p (handle)
87 "Say whether the content of HANDLE is readable." 87 "Say whether the content of HANDLE is readable."
88 (and (< (with-current-buffer (mm-handle-buffer handle) 88 (and (< (with-current-buffer (mm-handle-buffer handle)
89 (buffer-size)) 10000) 89 (buffer-size)) 10000)
@@ -93,7 +93,7 @@
93 (not (mh-mm-long-lines-p 76)))))) 93 (not (mh-mm-long-lines-p 76))))))
94 94
95;; Copy of function in mm-bodies.el. 95;; Copy of function in mm-bodies.el.
96(mh-defun-compat mh-mm-long-lines-p mm-long-lines-p (length) 96(defun-mh mh-mm-long-lines-p mm-long-lines-p (length)
97 "Say whether any of the lines in the buffer is longer than LENGTH." 97 "Say whether any of the lines in the buffer is longer than LENGTH."
98 (save-excursion 98 (save-excursion
99 (goto-char (point-min)) 99 (goto-char (point-min))
@@ -105,21 +105,21 @@
105 (and (> (current-column) length) 105 (and (> (current-column) length)
106 (current-column)))) 106 (current-column))))
107 107
108(mh-defun-compat mh-mm-keep-viewer-alive-p mm-keep-viewer-alive-p (handle) 108(defun-mh mh-mm-keep-viewer-alive-p mm-keep-viewer-alive-p (handle)
109 ;; Released Gnus doesn't keep handles associated with externally displayed 109 ;; Released Gnus doesn't keep handles associated with externally displayed
110 ;; MIME parts. So this will always return nil. 110 ;; MIME parts. So this will always return nil.
111 nil) 111 nil)
112 112
113(mh-defun-compat mh-mm-destroy-parts mm-destroy-parts (list) 113(defun-mh mh-mm-destroy-parts mm-destroy-parts (list)
114 "Older versions of Emacs don't have this function." 114 "Older versions of Emacs don't have this function."
115 nil) 115 nil)
116 116
117(mh-defun-compat mh-mm-uu-dissect-text-parts mm-uu-dissect-text-parts (handles) 117(defun-mh mh-mm-uu-dissect-text-parts mm-uu-dissect-text-parts (handles)
118 "Emacs 21 and XEmacs don't have this function." 118 "Emacs 21 and XEmacs don't have this function."
119 nil) 119 nil)
120 120
121;; Copy of function in mml.el. 121;; Copy of function in mml.el.
122(mh-defun-compat mh-mml-minibuffer-read-disposition 122(defun-mh mh-mml-minibuffer-read-disposition
123 mml-minibuffer-read-disposition (type &optional default) 123 mml-minibuffer-read-disposition (type &optional default)
124 (unless default (setq default 124 (unless default (setq default
125 (if (and (string-match "\\`text/" type) 125 (if (and (string-match "\\`text/" type)
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-26 03:25:49 +0000