emacs: lisp/mh-e/mh-customize.el comparison

comparison lisp/mh-e/mh-customize.el @ 50702:7dd3d5eae9c7

Upgraded to MH-E version 7.3. See etc/MH-E-NEWS and lisp/mh-e/ChangeLog for details.

author	Bill Wohler <wohler@newt.com>
date	Fri, 25 Apr 2003 05:52:00 +0000
parents	0d8b17d428b5
children	695cf19ef79e

comparison

equal deleted inserted replaced

-:cb5f0a5d5b36
+:7dd3d5eae9c7
 ;;; mh-customize.el --- MH-E customization
-;; Copyright (C) 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 ;;; Commentary:
-;; All of the defgroups, defcustoms, and deffaces in MH-E are found here. This
+;; All of the defgroups, defcustoms, and deffaces in MH-E are found
-;; makes it possible to customize modules that aren't loaded yet. It also
+;; here. This makes it possible to customize modules that aren't loaded
-;; makes it easier to organize the customization groups.
+;; yet. It also makes it easier to organize the customization groups.
 ;; This file contains the following sections:
 ;;
 ;; 1. MH-E Customization Groups
 ;;
 ;;
 ;; 3. Faces
 ;;; Change Log:
-;; $Id: mh-customize.el,v 1.2 2003/02/03 20:55:30 wohler Exp $
 ;;; Code:
 (provide 'mh-customize)
 (require 'mh-e)
 ;;;###mh-autoload
 "Options for controlling scan listing."
 :prefix "mh-"
 :link '(custom-manual "(mh-e)Customizing Moving Mail")
 :group 'mh)
-(defgroup mh-show nil
-"Message display."
-:prefix "mh-"
-:link '(custom-manual "(mh-e)Customizing Reading")
-:group 'mh)
-(defgroup mh-letter nil
-"Composing messages."
-:prefix "mh-"
-:link '(custom-manual "(mh-e)Customizing Sending")
-:group 'mh)
-(defgroup mh-alias nil
-"Alias handling."
-:link '(custom-manual "(mh-e)Customizing mh-e")
-:prefix "mh-alias-"
-:group 'mh)
 (defgroup mh-index nil
 "Indexed searching."
 :link '(custom-manual "(mh-e)Customizing mh-e")
 :prefix "mh-"
 :group 'mh)
-(defgroup mh-identity nil
+(defgroup mh-junk nil
-"Multiple personalities."
+"Spam handling."
 :link '(custom-manual "(mh-e)Customizing mh-e")
+:prefix "mh-junk-"
+:group 'mh)
+(defgroup mh-show nil
+"Message display."
 :prefix "mh-"
+:link '(custom-manual "(mh-e)Customizing Reading")
 :group 'mh)
 (defgroup mh-faces nil
 "Faces used in MH-E."
 :link '(custom-manual "(mh-e)Customizing mh-e")
 :prefix "mh-"
 :group 'faces
 :group 'mh)
+(defgroup mh-letter nil
+"Composing messages."
+:prefix "mh-"
+:link '(custom-manual "(mh-e)Customizing Sending")
+:group 'mh)
+(defgroup mh-alias nil
+"Alias handling."
+:link '(custom-manual "(mh-e)Customizing mh-e")
+:prefix "mh-alias-"
+:group 'mh)
+(defgroup mh-identity nil
+"Multiple personalities."
+:link '(custom-manual "(mh-e)Customizing mh-e")
+:prefix "mh-"
+:group 'mh)
 (defgroup mh-hooks nil
 "MH-E hooks."
 :link '(custom-manual "(mh-e)Customizing mh-e")
 :prefix "mh-"
 :group 'mh)
 ;;; MH-E Customization (:group mh)
 ;;; Toolbar configuration (:group 'mh-toolbar)
-(defconst mh-tool-bar-item-inc         "Incorporate new mail in Inbox")
-(defconst mh-tool-bar-item-save-mime   "Save MIME parts")
-(defconst mh-tool-bar-item-prev-msg    "Previous message")
-(defconst mh-tool-bar-item-page-msg    "Page this message")
-(defconst mh-tool-bar-item-next-msg    "Next message")
-(defconst mh-tool-bar-item-delete      "Mark for deletion")
-(defconst mh-tool-bar-item-refile      "Refile this message")
-(defconst mh-tool-bar-item-undo        "Undo this mark")
-(defconst mh-tool-bar-item-perform     "Perform moves and deletes")
-(defconst mh-tool-bar-item-toggle-show "Toggle showing message")
-(defconst mh-tool-bar-item-reply-from  "Reply to \"from\"")
-(defconst mh-tool-bar-item-reply-to    "Reply to \"to\"")
-(defconst mh-tool-bar-item-reply-all   "Reply to \"all\"")
-(defconst mh-tool-bar-item-reply       "Reply to this message")
-(defconst mh-tool-bar-item-alias       "Grab From alias")
-(defconst mh-tool-bar-item-compose     "Compose new message")
-(defconst mh-tool-bar-item-rescan      "Rescan this folder")
-(defconst mh-tool-bar-item-repack      "Repack this folder")
-(defconst mh-tool-bar-item-search      "Search")
-(defconst mh-tool-bar-item-visit       "Visit other folder")
-(defconst mh-tool-bar-item-prefs       "MH-E preferences")
-(defconst mh-tool-bar-item-help        "Help")
-(defconst mh-tool-bar-item-widen       "Widen from this sequence")
-(defconst mh-tool-bar-item-send        "Send this letter")
-(defconst mh-tool-bar-item-attach      "Insert attachment")
-(defconst mh-tool-bar-item-spell       "Check spelling")
-(defconst mh-tool-bar-item-save        "Save current buffer to its file")
-(defconst mh-tool-bar-item-undo-op     "Undo last operation")
-(defconst mh-tool-bar-item-kill
-"Cut (kill) text in region between mark and current position")
-(defconst mh-tool-bar-item-copy
-"Copy text in region between mark and current position")
-(defconst mh-tool-bar-item-paste
-"Paste (yank) text cut or copied earlier")
-(defconst mh-tool-bar-item-kill-draft  "Kill this draft")
-(defconst mh-tool-bar-item-comp-prefs  "MH-E composition preferences")
-(defcustom mh-tool-bar-reply-3-buttons-flag nil
-"*Non-nil means use three buttons for reply commands in tool-bar.
-If you have room on your tool-bar because you are using a large font, you
-may set this variable to expand the single reply button into three buttons
-that won't lead to minibuffer prompt about who to reply to."
-:type 'boolean
-:group 'mh-toolbar)
 (defcustom mh-tool-bar-search-function 'mh-search-folder
 "*Function called by the tool-bar search button.
 See `mh-search-folder' and `mh-index-search' for details."
 :type '(choice (const mh-search-folder)
 (const mh-index-search)
 (function :tag "Other function"))
 :group 'mh-toolbar)
-(eval-when-compile (defvar tool-bar-map))
+;; Functions called from the tool bar
-(defvar mh-show-tool-bar-map nil)
+(defun mh-tool-bar-search (&optional arg)
-(defun mh-tool-bar-show-set ()
+"Interactively call `mh-tool-bar-search-function'.
-"Construct toolbar for `mh-show-mode'."
+Optional argument ARG is not used."
-(when (fboundp 'tool-bar-add-item)
+(interactive "P")
-(setq
+(call-interactively mh-tool-bar-search-function))
-mh-show-tool-bar-map
-(let ((tool-bar-map (make-sparse-keymap)))
+(defun mh-tool-bar-customize ()
-(if (member mh-tool-bar-item-inc mh-tool-bar-folder-buttons)
+"Call `mh-customize' from the toolbar."
-(tool-bar-add-item "mail" 'mh-inc-folder 'mh-showtoolbar-inc-folder
+(interactive)
-:help mh-tool-bar-item-inc))
+(mh-customize t))
-(if (member mh-tool-bar-item-save-mime mh-tool-bar-folder-buttons)
-(tool-bar-add-item "attach" 'mh-mime-save-parts
+(defun mh-tool-bar-folder-help ()
-'mh-showtoolbar-mime-save-parts
+"Visit \"(mh-e)Top\"."
-:help mh-tool-bar-item-save-mime))
+(interactive)
-(if (member mh-tool-bar-item-prev-msg mh-tool-bar-folder-buttons)
+(Info-goto-node "(mh-e)Top")
-(tool-bar-add-item "left_arrow" 'mh-show-previous-undeleted-msg
+(delete-other-windows))
-'mh-showtoolbar-prev
-:help mh-tool-bar-item-prev-msg))
+(defun mh-tool-bar-letter-help ()
-(if (member mh-tool-bar-item-page-msg mh-tool-bar-folder-buttons)
+"Visit \"(mh-e)Draft Editing\"."
-(tool-bar-add-item "page-down" 'mh-show-page-msg 'mh-showtoolbar-page
+(interactive)
-:help mh-tool-bar-item-page-msg))
+(Info-goto-node "(mh-e)Draft Editing")
-(if (member mh-tool-bar-item-next-msg mh-tool-bar-folder-buttons)
+(delete-other-windows))
-(tool-bar-add-item "right_arrow" 'mh-show-next-undeleted-msg
-'mh-showtoolbar-next
+(defmacro mh-tool-bar-reply-generator (function recipient folder-buffer-flag)
-:help mh-tool-bar-item-next-msg))
+"Generate FUNCTION that replies to RECIPIENT.
-(if (member mh-tool-bar-item-delete mh-tool-bar-folder-buttons)
+If FOLDER-BUFFER-FLAG is nil then the function generated
-(tool-bar-add-item "close" 'mh-show-delete-msg
+When INCLUDE-FLAG is non-nil, include message body being replied to."
-'mh-showtoolbar-delete
+`(defun ,function (&optional arg)
-:help mh-tool-bar-item-delete))
+,(format "Reply to \"%s\".\nWhen ARG is non-nil include message in reply."
-(if (member mh-tool-bar-item-refile mh-tool-bar-folder-buttons)
+recipient)
-(tool-bar-add-item "refile" 'mh-show-refile-msg
+(interactive "P")
-'mh-showtoolbar-refile
+,(if folder-buffer-flag nil '(set-buffer mh-show-folder-buffer))
-:help mh-tool-bar-item-refile))
+(mh-reply (mh-get-msg-num nil) ,recipient arg)))
-(if (member mh-tool-bar-item-undo mh-tool-bar-folder-buttons)
-(tool-bar-add-item "undo" 'mh-show-undo  'mh-showtoolbar-undo
+(mh-tool-bar-reply-generator mh-tool-bar-reply-from "from" t)
-:help mh-tool-bar-item-undo))
+(mh-tool-bar-reply-generator mh-show-tool-bar-reply-from "from" nil)
-(if (member mh-tool-bar-item-perform mh-tool-bar-folder-buttons)
+(mh-tool-bar-reply-generator mh-tool-bar-reply-to "to" t)
-(tool-bar-add-item "execute" 'mh-show-execute-commands
+(mh-tool-bar-reply-generator mh-show-tool-bar-reply-to "to" nil)
-'mh-showtoolbar-exec
+(mh-tool-bar-reply-generator mh-tool-bar-reply-all "all" t)
-:help mh-tool-bar-item-perform))
+(mh-tool-bar-reply-generator mh-show-tool-bar-reply-all "all" nil)
-(if (member mh-tool-bar-item-toggle-show  mh-tool-bar-folder-buttons)
-(tool-bar-add-item "show" 'mh-show-toggle-showing
+;; XEmacs has a couple of extra customizations...
-'mh-showtoolbar-toggle-show
+(mh-do-in-xemacs
-:help mh-tool-bar-item-toggle-show))
+(require 'mh-xemacs-icons)
-(if (member mh-tool-bar-item-reply-from mh-tool-bar-folder-buttons)
+(defcustom mh-xemacs-use-toolbar-flag (if (and (featurep 'toolbar)
-(tool-bar-add-item "reply-from"
+(featurep 'xpm)
-(lambda (&optional arg)
+(device-on-window-system-p))
-(interactive "P")
+t
-(set-buffer mh-show-folder-buffer)
+nil)
-(mh-reply (mh-get-msg-num nil) "from" arg))
+"*If non-nil, use toolbar.
-'mh-showtoolbar-reply-from
-:help mh-tool-bar-item-reply-from))
+This will default to t if you are in an environment that supports
-(if (member mh-tool-bar-item-reply-to mh-tool-bar-folder-buttons)
+toolbars and xpm."
-(tool-bar-add-item "reply-to"
+:type 'boolean
-(lambda (&optional arg)
+:group 'mh-toolbar)
-(interactive "P")
-(set-buffer mh-show-folder-buffer)
+(defcustom mh-xemacs-toolbar-position (if mh-xemacs-use-toolbar-flag
-(mh-reply (mh-get-msg-num nil) "to" arg))
+'default
-'mh-showtoolbar-reply-to
+nil)
-:help mh-tool-bar-item-reply-to))
+"*Where to put the toolbar.
-(if (member mh-tool-bar-item-reply-all mh-tool-bar-folder-buttons)
-(tool-bar-add-item "reply-all"
+Valid non-nil values are \"default\", \"top\", \"bottom\", \"left\",
-(lambda (&optional arg)
+\"right\".  These match the four edges of the frame, with \"default\"
-(interactive "P")
+meaning \"use the same position as the default-toolbar\".
-(set-buffer mh-show-folder-buffer)
-(mh-reply (mh-get-msg-num nil) "all" arg))
+A nil value means do not use a toolbar.
-'mh-showtoolbar-reply-all
-:help mh-tool-bar-item-reply-all))
+If this variable is set to anything other than \"default\" and the
-(if (member mh-tool-bar-item-reply mh-tool-bar-folder-buttons)
+default-toolbar has a different positional setting from the value of
-(tool-bar-add-item "mail/reply2" 'mh-show-reply
+this variable, then two toolbars will be displayed.  The MH-E toolbar
-'mh-showtoolbar-reply
+and the default-toolbar."
-:help mh-tool-bar-item-reply))
+:type '(radio (const :tag "Same position as the \"default-toolbar\""
-(if (member mh-tool-bar-item-alias mh-tool-bar-folder-buttons)
+:value default)
-(tool-bar-add-item "alias" 'mh-alias-grab-from-field
+(const :tag "Along the top edge of the frame"
-'mh-showtoolbar-alias
+:value top)
-:help mh-tool-bar-item-alias
+(const :tag "Along the bottom edge of the frame"
-:enable '(mh-alias-from-has-no-alias-p)))
+:value bottom)
-(if (member mh-tool-bar-item-compose mh-tool-bar-folder-buttons)
+(const :tag "Along the left edge of the frame"
-(tool-bar-add-item "mail_compose" 'mh-send 'mh-showtoolbar-compose
+:value left)
-:help mh-tool-bar-item-compose))
+(const :tag "Along the right edge of the frame"
-(if (member mh-tool-bar-item-rescan mh-tool-bar-folder-buttons)
+:value right)
-(tool-bar-add-item "rescan" 'mh-show-rescan-folder
+(const :tag "Don't use a toolbar" nil))
-'mh-showtoolbar-rescan
+:group 'mh-toolbar))
-:help mh-tool-bar-item-rescan))
-(if (member mh-tool-bar-item-repack mh-tool-bar-folder-buttons)
+(defmacro mh-tool-bar-define (defaults &rest buttons)
-(tool-bar-add-item "repack" 'mh-show-pack-folder
+"Define a tool bar for MH-E.
-'mh-showtoolbar-pack
+DEFAULTS is the list of buttons that are present by default. It is a list of
-:help mh-tool-bar-item-repack))
+lists where the sublists are of the following form:
-(if (member mh-tool-bar-item-search mh-tool-bar-folder-buttons)
-(tool-bar-add-item "search"
+(:KEYWORD FUNC1 FUNC2 FUNC3 ...)
-(lambda (&optional arg)
-(interactive "P")
+Here :KEYWORD is one of :folder or :letter. If it is :folder then the default
-(call-interactively
+buttons in the folder and show mode buffers are being specified. If it is
-mh-tool-bar-search-function))
+:letter then the default buttons in the letter mode are listed. FUNC1, FUNC2,
-'mh-showtoolbar-search
+FUNC3, ... are the names of the functions that the buttons would execute.
-:help mh-tool-bar-item-search))
-(if (member mh-tool-bar-item-visit mh-tool-bar-folder-buttons)
+Each element of BUTTONS is a list of four things:
-(tool-bar-add-item "fld_open" 'mh-visit-folder
-'mh-showtoolbar-visit
+(FUNCTION MODES ICON DOC)
-:help mh-tool-bar-item-visit))
-(if (member mh-tool-bar-item-prefs mh-tool-bar-folder-buttons)
+where,
-(tool-bar-add-item "preferences" (lambda ()
-(interactive)
+FUNCTION is the name of the function that will be executed when the button
-(mh-customize t))
+is clicked.
-'mh-showtoolbar-customize
-:help mh-tool-bar-item-prefs))
+MODES is a list of symbols. List elements must be from `folder', `letter' and
-(if (member mh-tool-bar-item-help mh-tool-bar-folder-buttons)
+`sequence'. If `folder' is present then the button is available in the
-(tool-bar-add-item "help" (lambda ()
+folder and show buffer. If the name of FUNCTION is of the form \"mh-foo\",
-(interactive)
+where foo is some arbitrary string, then we check if the function
-(Info-goto-node "(mh-e)Top")
+`mh-show-foo' exists. If it exists then that function is used in the show
-(delete-other-windows))
+buffer. Otherwise the original function `mh-foo' is used in the show buffer
-'mh-showtoolbar-help
+as well. Presence of `sequence' is handled similar to the above. The only
-:help mh-tool-bar-item-help))
+difference is that the button is shown only when the folder is narrowed to a
-tool-bar-map))))
+sequence. If `letter' is present in MODES, then the button is available
+during draft editing and runs FUNCTION when clicked.
-(defvar mh-letter-tool-bar-map nil)
-;;;###mh-autoload
+ICON is the icon that is drawn in the button.
-(defun mh-tool-bar-letter-set ()
-"Construct toolbar for `mh-letter-mode'."
+DOC is the documentation for the button. It is used in tool-tips and in
-(when (fboundp 'tool-bar-add-item)
+providing other help to the user. GNU Emacs uses only the first line of the
-(setq
+string. So the DOC should be formatted such that the first line is useful and
-mh-letter-tool-bar-map
+complete without the rest of the string."
-(let ((tool-bar-map (make-sparse-keymap)))
+;; The following variable names have been carefully chosen to make code
-(if (member mh-tool-bar-item-send mh-tool-bar-letter-buttons)
+;; generation easier. Modifying the names should be done carefully.
-(tool-bar-add-item "mail_send" 'mh-send-letter
+(let (folder-buttons folder-docs folder-button-setter sequence-button-setter
-'mh-lettertoolbar-send
+show-buttons show-button-setter show-seq-button-setter
-:help mh-tool-bar-item-send))
+letter-buttons letter-docs letter-button-setter
-(if (member mh-tool-bar-item-attach mh-tool-bar-letter-buttons)
+folder-defaults letter-defaults
-(tool-bar-add-item "attach" 'mh-compose-insertion
+folder-vectors show-vectors letter-vectors)
-'mh-lettertoolbar-compose
+(dolist (x defaults)
-:help mh-tool-bar-item-attach))
+(cond ((eq (car x) :folder) (setq folder-defaults (cdr x)))
-(if (member mh-tool-bar-item-spell mh-tool-bar-letter-buttons)
+((eq (car x) :letter) (setq letter-defaults (cdr x)))))
-(tool-bar-add-item "spell" 'ispell-message 'mh-lettertoolbar-ispell
+(dolist (button buttons)
-:help mh-tool-bar-item-spell))
+(unless (and (listp button) (equal (length button) 4))
-(if (member mh-tool-bar-item-save mh-tool-bar-letter-buttons)
+(error "Incorrect MH-E tool-bar button specification: %s" button))
-(tool-bar-add-item-from-menu 'save-buffer "save"))
+(let* ((name (nth 0 button))
-(if (member mh-tool-bar-item-undo-op mh-tool-bar-letter-buttons)
+(name-str (symbol-name name))
-(tool-bar-add-item-from-menu 'undo "undo"))
+(icon (nth 2 button))
-(if (member mh-tool-bar-item-kill mh-tool-bar-letter-buttons)
+(xemacs-icon (mh-do-in-xemacs
-(tool-bar-add-item-from-menu 'kill-region "cut"))
+(cdr (assoc (intern icon) mh-xemacs-icon-map))))
-(if (member mh-tool-bar-item-copy mh-tool-bar-letter-buttons)
+(full-doc (nth 3 button))
-(tool-bar-add-item-from-menu 'menu-bar-kill-ring-save "copy"))
+(doc (if (string-match "\\(.*\\)\n" full-doc)
-(if (member mh-tool-bar-item-paste mh-tool-bar-letter-buttons)
+(match-string 1 full-doc)
-(tool-bar-add-item-from-menu 'yank "paste"))
+full-doc))
-(if (member mh-tool-bar-item-kill-draft mh-tool-bar-letter-buttons)
+(modes (nth 1 button))
-(tool-bar-add-item "close" 'mh-fully-kill-draft
+functions show-sym)
-'mh-lettertoolbar-kill
+(when (memq 'letter modes) (setq functions `(:letter ,name)))
-:help mh-tool-bar-item-kill-draft))
+(when (or (memq 'folder modes) (memq 'sequence modes))
-(if (member mh-tool-bar-item-comp-prefs mh-tool-bar-letter-buttons)
+(setq functions
-(tool-bar-add-item "preferences" (lambda ()
+(append `(,(if (memq 'folder modes) :folder :sequence) ,name)
-(interactive)
+functions))
-(mh-customize t))
+(setq show-sym
-'mh-lettertoolbar-customize
+(if (string-match "^mh-\\(.*\\)$" name-str)
-:help mh-tool-bar-item-comp-prefs))
+(intern (concat "mh-show-" (match-string 1 name-str)))
-(if (member mh-tool-bar-item-help mh-tool-bar-letter-buttons)
+name))
-(tool-bar-add-item "help" (lambda ()
+(setq functions
-(interactive)
+(append `(,(if (memq 'folder modes) :show :show-seq)
-(Info-goto-node "(mh-e)Draft Editing")
+,(if (fboundp show-sym) show-sym name))
-(delete-other-windows))
+functions)))
-'mh-lettertoolbar-help
+(do ((functions functions (cddr functions)))
-:help mh-tool-bar-item-help))
+((null functions))
-tool-bar-map))))
+(let* ((type (car functions))
+(function (cadr functions))
-(defvar mh-folder-tool-bar-map nil)
+(type1 (substring (symbol-name type) 1))
-(defvar mh-folder-seq-tool-bar-map nil
+(vector-list (cond ((eq type :show) 'show-vectors)
-"Tool-bar to use when narrowed to a sequence in MH-Folder buffers.")
+((eq type :show-seq) 'show-vectors)
-;;;###mh-autoload
+((eq type :letter) 'letter-vectors)
-(defun mh-tool-bar-folder-set ()
+(t 'folder-vectors)))
-"Construct toolbar for `mh-folder-mode'."
+(list (cond ((eq type :letter) 'mh-tool-bar-letter-buttons)
-(when (fboundp 'tool-bar-add-item)
+(t 'mh-tool-bar-folder-buttons)))
-(setq
+(key (intern (concat "mh-" type1 "toolbar-" name-str)))
-mh-folder-tool-bar-map
+(setter (intern (concat type1 "-button-setter")))
-(let ((tool-bar-map (make-sparse-keymap)))
+(mbuttons (cond ((eq type :letter) 'letter-buttons)
-(if (member mh-tool-bar-item-inc mh-tool-bar-folder-buttons)
+((eq type :show) 'show-buttons)
-(tool-bar-add-item "mail" 'mh-inc-folder
+((eq type :show-seq) 'show-buttons)
-'mh-foldertoolbar-inc-folder
+(t 'folder-buttons)))
-:help mh-tool-bar-item-inc))
+(docs (cond ((eq mbuttons 'letter-buttons) 'letter-docs)
-(if (member mh-tool-bar-item-save-mime mh-tool-bar-folder-buttons)
+((eq mbuttons 'folder-buttons) 'folder-docs))))
-(tool-bar-add-item "attach" 'mh-mime-save-parts
+(add-to-list vector-list `[,xemacs-icon ,function t ,full-doc])
-'mh-foldertoolbar-mime-save-parts
+(add-to-list
-:help mh-tool-bar-item-save-mime))
+setter `(when (member ',name ,list)
-(if (member mh-tool-bar-item-prev-msg mh-tool-bar-folder-buttons)
+(mh-funcall-if-exists
-(tool-bar-add-item "left_arrow" 'mh-previous-undeleted-msg
+tool-bar-add-item ,icon ',function ',key :help ,doc)))
-'mh-foldertoolbar-prev
+(add-to-list mbuttons name)
-:help mh-tool-bar-item-prev-msg))
+(if docs (add-to-list docs doc))))))
-(if (member mh-tool-bar-item-page-msg mh-tool-bar-folder-buttons)
+(setq folder-buttons (nreverse folder-buttons)
-(tool-bar-add-item "page-down" 'mh-page-msg 'mh-foldertoolbar-page
+letter-buttons (nreverse letter-buttons)
-:help mh-tool-bar-item-page-msg))
+show-buttons (nreverse show-buttons)
-(if (member mh-tool-bar-item-next-msg mh-tool-bar-folder-buttons)
+letter-docs (nreverse letter-docs)
-(tool-bar-add-item "right_arrow" 'mh-next-undeleted-msg
+folder-docs (nreverse folder-docs)
-'mh-foldertoolbar-next
+folder-vectors (nreverse folder-vectors)
-:help mh-tool-bar-item-next-msg))
+show-vectors (nreverse show-vectors)
-(if (member mh-tool-bar-item-delete mh-tool-bar-folder-buttons)
+letter-vectors (nreverse letter-vectors))
-(tool-bar-add-item "close" 'mh-delete-msg 'mh-foldertoolbar-delete
+(dolist (x folder-defaults)
-:help mh-tool-bar-item-delete))
+(unless (memq x folder-buttons)
-(if (member mh-tool-bar-item-refile mh-tool-bar-folder-buttons)
+(error "Folder defaults contains unknown button '%s'" x)))
-(tool-bar-add-item "refile" 'mh-refile-msg 'mh-foldertoolbar-refile
+(dolist (x letter-defaults)
-:help mh-tool-bar-item-refile))
+(unless (memq x letter-buttons)
-(if (member mh-tool-bar-item-undo mh-tool-bar-folder-buttons)
+(error "Letter defaults contains unknown button '%s'" x)))
-(tool-bar-add-item "undo" 'mh-undo  'mh-foldertoolbar-undo
+`(eval-when (compile load eval)
-:help mh-tool-bar-item-undo))
+(defvar mh-folder-tool-bar-map nil)
-(if (member mh-tool-bar-item-perform mh-tool-bar-folder-buttons)
+(defvar mh-folder-seq-tool-bar-map nil)
-(tool-bar-add-item "execute" 'mh-execute-commands
+(defvar mh-show-tool-bar-map nil)
-'mh-foldertoolbar-exec
+(defvar mh-show-seq-tool-bar-map nil)
-:help mh-tool-bar-item-perform))
+(defvar mh-letter-tool-bar-map nil)
-(if (member mh-tool-bar-item-toggle-show  mh-tool-bar-folder-buttons)
+;; GNU Emacs tool bar specific code
-(tool-bar-add-item "show" 'mh-toggle-showing
+(mh-do-in-gnu-emacs
-'mh-foldertoolbar-toggle-show
+;; Custom setter functions
-:help mh-tool-bar-item-toggle-show))
+(defun mh-tool-bar-folder-buttons-set (symbol value)
-(if (member mh-tool-bar-item-reply-from mh-tool-bar-folder-buttons)
+"Construct toolbar for `mh-folder-mode' and `mh-show-mode'."
-(tool-bar-add-item "reply-from"
+(set-default symbol value)
-(lambda (&optional arg)
+(setq mh-folder-tool-bar-map
-(interactive "P")
+(let ((tool-bar-map (make-sparse-keymap)))
-(mh-reply (mh-get-msg-num nil) "from" arg))
+,@(nreverse folder-button-setter)
-'mh-foldertoolbar-reply-from
+tool-bar-map))
-:help mh-tool-bar-item-reply-from))
+(setq mh-show-tool-bar-map
-(if (member mh-tool-bar-item-reply-to mh-tool-bar-folder-buttons)
+(let ((tool-bar-map (make-sparse-keymap)))
-(tool-bar-add-item "reply-to"
+,@(nreverse show-button-setter)
-(lambda (&optional arg)
+tool-bar-map))
-(interactive "P")
+(setq mh-show-seq-tool-bar-map
-(mh-reply (mh-get-msg-num nil) "to" arg))
+(let ((tool-bar-map (copy-keymap mh-show-tool-bar-map)))
-'mh-foldertoolbar-reply-to
+,@(nreverse show-seq-button-setter)
-:help mh-tool-bar-item-reply-to))
+tool-bar-map))
-(if (member mh-tool-bar-item-reply-all mh-tool-bar-folder-buttons)
+(setq mh-folder-seq-tool-bar-map
-(tool-bar-add-item "reply-all"
+(let ((tool-bar-map (copy-keymap mh-folder-tool-bar-map)))
-(lambda (&optional arg)
+,@(nreverse sequence-button-setter)
-(interactive "P")
+tool-bar-map)))
-(mh-reply (mh-get-msg-num nil) "all" arg))
+(defun mh-tool-bar-letter-buttons-set (symbol value)
-'mh-foldertoolbar-reply-all
+"Construct toolbar for `mh-letter-mode'."
-:help mh-tool-bar-item-reply-all))
+(set-default symbol value)
-(if (member mh-tool-bar-item-reply mh-tool-bar-folder-buttons)
+(setq mh-letter-tool-bar-map
-(tool-bar-add-item "mail/reply2" 'mh-reply
+(let ((tool-bar-map (make-sparse-keymap)))
-'mh-foldertoolbar-reply
+,@(nreverse letter-button-setter)
-:help mh-tool-bar-item-reply))
+tool-bar-map))))
-(if (member mh-tool-bar-item-alias mh-tool-bar-folder-buttons)
+;; XEmacs specific code
-(tool-bar-add-item "alias" 'mh-alias-grab-from-field
+(mh-do-in-xemacs
-'mh-foldertoolbar-alias
+(defvar mh-toolbar-folder-vector-map
-:help mh-tool-bar-item-alias
+',(loop for button in folder-buttons
-:enable '(mh-alias-from-has-no-alias-p)))
+for vector in folder-vectors
-(if (member mh-tool-bar-item-compose mh-tool-bar-folder-buttons)
+collect (cons button vector)))
-(tool-bar-add-item "mail_compose" 'mh-send 'mh-foldertoolbar-compose
+(defvar mh-toolbar-show-vector-map
-:help mh-tool-bar-item-compose))
+',(loop for button in show-buttons
-(if (member mh-tool-bar-item-rescan mh-tool-bar-folder-buttons)
+for vector in show-vectors
-(tool-bar-add-item "rescan" 'mh-rescan-folder
+collect (cons button vector)))
-'mh-foldertoolbar-rescan
+(defvar mh-toolbar-letter-vector-map
-:help mh-tool-bar-item-rescan))
+',(loop for button in letter-buttons
-(if (member mh-tool-bar-item-repack mh-tool-bar-folder-buttons)
+for vector in letter-vectors
-(tool-bar-add-item "repack" 'mh-pack-folder 'mh-foldertoolbar-pack
+collect (cons button vector)))
-:help mh-tool-bar-item-repack))
+(defvar mh-toolbar-folder-buttons nil)
-(if (member mh-tool-bar-item-search mh-tool-bar-folder-buttons)
+(defvar mh-toolbar-show-buttons nil)
-(tool-bar-add-item "search"
+(defvar mh-toolbar-letter-buttons nil)
-(lambda (&optional arg)
+;; Custom setter functions
-(interactive "P")
+(defun mh-tool-bar-letter-buttons-set (symbol value)
-(call-interactively
+(set-default symbol value)
-mh-tool-bar-search-function))
+(setq mh-toolbar-letter-buttons
-'mh-foldertoolbar-search
+(loop for b in value
-:help mh-tool-bar-item-search))
+collect (cdr (assoc b mh-toolbar-letter-vector-map)))))
-(if (member mh-tool-bar-item-visit mh-tool-bar-folder-buttons)
+(defun mh-tool-bar-folder-buttons-set (symbol value)
-(tool-bar-add-item "fld_open" 'mh-visit-folder
+(set-default symbol value)
-'mh-foldertoolbar-visit
+(setq mh-toolbar-folder-buttons
-:help mh-tool-bar-item-visit))
+(loop for b in value
-(if (member mh-tool-bar-item-prefs mh-tool-bar-folder-buttons)
+collect (cdr (assoc b mh-toolbar-folder-vector-map))))
-(tool-bar-add-item "preferences" (lambda ()
+(setq mh-toolbar-show-buttons
-(interactive)
+(loop for b in value
-(mh-customize t))
+collect (cdr (assoc b mh-toolbar-show-vector-map)))))
-'mh-foldertoolbar-customize
+;; Initialize toolbar
-:help mh-tool-bar-item-prefs))
+(defun mh-toolbar-init (mode)
-(if (member mh-tool-bar-item-help mh-tool-bar-folder-buttons)
+"Install toolbar in MODE."
-(tool-bar-add-item "help" (lambda ()
+(let ((toolbar (cond ((eq mode :folder) mh-toolbar-folder-buttons)
-(interactive)
+((eq mode :letter) mh-toolbar-letter-buttons)
-(Info-goto-node "(mh-e)Top")
+((eq mode :show) mh-toolbar-show-buttons)))
-(delete-other-windows))
+(height 37)
-'mh-foldertoolbar-help
+(width 40)
-:help mh-tool-bar-item-help))
+(buffer (current-buffer)))
-tool-bar-map))
+(when (and mh-xemacs-toolbar-position mh-xemacs-use-toolbar-flag)
+(cond
-(setq mh-folder-seq-tool-bar-map
+((eq mh-xemacs-toolbar-position 'top)
-(let ((tool-bar-map (copy-keymap mh-folder-tool-bar-map)))
+(set-specifier top-toolbar (cons buffer toolbar))
-(if (member mh-tool-bar-item-widen mh-tool-bar-folder-buttons)
+(set-specifier top-toolbar-visible-p t)
-(tool-bar-add-item "widen" 'mh-widen 'mh-foldertoolbar-widen
+(set-specifier top-toolbar-height height))
-:help mh-tool-bar-item-widen))
+((eq mh-xemacs-toolbar-position 'bottom)
-tool-bar-map))))
+(set-specifier bottom-toolbar (cons buffer toolbar))
+(set-specifier bottom-toolbar-visible-p t)
-(defun mh-tool-bar-folder-buttons-set (symbol value)
+(set-specifier bottom-toolbar-height height))
-"Update the `mh-tool-bar-folder-buttons' variable, and rebuild the tool-bar.
+((eq mh-xemacs-toolbar-position 'left)
-Sets the default for SYMBOL (e.g. `mh-tool-bar-folder-buttons') to VALUE (as
+(set-specifier left-toolbar (cons buffer toolbar))
-set in customization).  This is called after 'customize is used to alter
+(set-specifier left-toolbar-visible-p t)
-`mh-tool-bar-folder-buttons'."
+(set-specifier left-toolbar-width width))
-(set-default symbol value)
+((eq mh-xemacs-toolbar-position 'right)
-(mh-tool-bar-show-set)
+(set-specifier right-toolbar (cons buffer toolbar))
-(mh-tool-bar-folder-set))
+(set-specifier right-toolbar-visible-p t)
+(set-specifier right-toolbar-width width))
-(custom-declare-variable
+(t (set-specifier default-toolbar (cons buffer toolbar))))))))
-'mh-tool-bar-folder-buttons
+;; Declare customizable toolbars
-'(append
+(custom-declare-variable
-(list mh-tool-bar-item-inc
+'mh-tool-bar-folder-buttons
-mh-tool-bar-item-save-mime
+'(list ,@(mapcar (lambda (x) `(quote ,x)) folder-defaults))
-mh-tool-bar-item-prev-msg
+"Choose buttons to include in MH-E folder/show toolbar."
-mh-tool-bar-item-page-msg
+:group 'mh-toolbar :set 'mh-tool-bar-folder-buttons-set
-mh-tool-bar-item-next-msg
+:type '(set ,@(loop for x in folder-buttons
-mh-tool-bar-item-delete
+for y in folder-docs
-mh-tool-bar-item-refile
+collect `(const :tag ,y ,x))))
-mh-tool-bar-item-undo
+(custom-declare-variable
-mh-tool-bar-item-perform
+'mh-tool-bar-letter-buttons
-;;;      mh-tool-bar-item-toggle-show
+'(list ,@(mapcar (lambda (x) `(quote ,x)) letter-defaults))
-)
+"Choose buttons to include in MH-E letter toolbar."
-(if mh-tool-bar-reply-3-buttons-flag
+:group 'mh-toolbar :set 'mh-tool-bar-letter-buttons-set
-(list mh-tool-bar-item-reply-from
+:type '(set ,@(loop for x in letter-buttons
-mh-tool-bar-item-reply-to
+for y in letter-docs
-mh-tool-bar-item-reply-all)
+collect `(const :tag ,y ,x)))))))
-(list mh-tool-bar-item-reply))
-(list mh-tool-bar-item-alias
+(mh-tool-bar-define
-mh-tool-bar-item-compose
+((:folder mh-inc-folder mh-mime-save-parts mh-previous-undeleted-msg
-mh-tool-bar-item-rescan
+mh-page-msg  mh-next-undeleted-msg mh-delete-msg mh-refile-msg
-;;;      mh-tool-bar-item-repack
+mh-undo mh-execute-commands mh-toggle-tick mh-reply
-mh-tool-bar-item-search
+mh-alias-grab-from-field mh-send mh-rescan-folder
-mh-tool-bar-item-visit
+mh-tool-bar-search mh-visit-folder
-mh-tool-bar-item-prefs
+mh-tool-bar-customize mh-tool-bar-folder-help mh-widen)
-mh-tool-bar-item-help
+(:letter mh-send-letter mh-compose-insertion ispell-message save-buffer
-mh-tool-bar-item-widen))
+undo kill-region menu-bar-kill-ring-save yank mh-fully-kill-draft
-"Buttons to include in MH-E folder/show toolbar."
+mh-tool-bar-customize mh-tool-bar-letter-help))
-:group 'mh-toolbar
+;; Folder/Show buffer buttons
-:set 'mh-tool-bar-folder-buttons-set
+(mh-inc-folder (folder) "mail"
-:type `(set (const ,mh-tool-bar-item-inc)
+"Incorporate new mail in Inbox
-(const ,mh-tool-bar-item-save-mime)
+This button runs `mh-inc-folder' which drags any
-(const ,mh-tool-bar-item-prev-msg)
+new mail into your Inbox folder.")
-(const ,mh-tool-bar-item-page-msg)
+(mh-mime-save-parts (folder) "attach"
-(const ,mh-tool-bar-item-next-msg)
+"Save MIME parts from this message
-(const ,mh-tool-bar-item-delete)
+This button runs `mh-mime-save-parts' which saves a message's
-(const ,mh-tool-bar-item-refile)
+different parts into separate files.")
-(const ,mh-tool-bar-item-undo)
+(mh-previous-undeleted-msg (folder) "left_arrow"
-(const ,mh-tool-bar-item-perform)
+"Go to the previous undeleted message
-(const ,mh-tool-bar-item-toggle-show)
+This button runs `mh-previous-undeleted-msg'")
-(const ,mh-tool-bar-item-reply-from)
+(mh-page-msg (folder) "page-down"
-(const ,mh-tool-bar-item-reply-to)
+"Page the current message forwards\nThis button runs `mh-page-msg'")
-(const ,mh-tool-bar-item-reply-all)
+(mh-next-undeleted-msg (folder) "right_arrow"
-(const ,mh-tool-bar-item-reply)
+"Go to the next undeleted message\nThe button runs `mh-next-undeleted-msg'")
-(const ,mh-tool-bar-item-alias)
+(mh-delete-msg (folder) "close"
-(const ,mh-tool-bar-item-compose)
+"Mark this message for deletion\nThis button runs `mh-delete-msg'")
-(const ,mh-tool-bar-item-rescan)
+(mh-refile-msg (folder) "refile"
-(const ,mh-tool-bar-item-repack)
+"Refile this message\nThis button runs `mh-refile-msg'")
-(const ,mh-tool-bar-item-search)
+(mh-undo (folder) "undo" "Undo last operation\nThis button runs `undo'")
-(const ,mh-tool-bar-item-visit)
+(mh-execute-commands (folder) "execute"
-(const ,mh-tool-bar-item-prefs)
+"Perform moves and deletes\nThis button runs `mh-execute-commands'")
-(const ,mh-tool-bar-item-help)
+(mh-toggle-tick (folder) "highlight"
-(const ,mh-tool-bar-item-widen)))
+"Toggle tick mark\nThis button runs `mh-toggle-tick'")
+(mh-toggle-showing (folder) "show"
-(defun mh-tool-bar-letter-buttons-set (symbol value)
+"Toggle showing message\nThis button runs `mh-toggle-showing'")
-"Update the `mh-tool-bar-letter-buttons' variable, and rebuild the tool-bar.
+(mh-tool-bar-reply-from (folder) "reply-from" "Reply to \"from\"")
-Sets the default for SYMBOL (e.g. `mh-tool-bar-letter-buttons') to VALUE (as
+(mh-tool-bar-reply-to (folder) "reply-to" "Reply to \"to\"")
-set in customization).  This is called after 'customize is used to alter
+(mh-tool-bar-reply-all (folder) "reply-all" "Reply to \"all\"")
-`mh-tool-bar-letter-buttons'."
+(mh-reply (folder) "mail/reply2"
-(set-default symbol value)
+"Reply to this message\nThis button runs `mh-reply'")
-(mh-tool-bar-letter-set))
+(mh-alias-grab-from-field (folder) "alias"
+"Grab From alias\nThis button runs `mh-alias-grab-from-field'")
-(custom-declare-variable
+(mh-send (folder) "mail_compose"
-'mh-tool-bar-letter-buttons
+"Compose new message\nThis button runs `mh-send'")
-'(list mh-tool-bar-item-send
+(mh-rescan-folder (folder) "rescan"
-mh-tool-bar-item-attach
+"Rescan this folder\nThis button runs `mh-rescan-folder'")
-mh-tool-bar-item-spell
+(mh-pack-folder (folder) "repack"
-mh-tool-bar-item-save
+"Repack this folder\nThis button runs `mh-pack-folder'")
-mh-tool-bar-item-undo-op
+(mh-tool-bar-search (folder) "search"
-mh-tool-bar-item-kill
+"Search\nThis button runs `mh-tool-bar-search-function'")
-mh-tool-bar-item-copy
+(mh-visit-folder (folder) "fld_open"
-mh-tool-bar-item-paste
+"Visit other folder\nThis button runs `mh-visit-folder'")
-mh-tool-bar-item-kill-draft
+;; Letter buffer buttons
-mh-tool-bar-item-comp-prefs
+(mh-send-letter (letter) "mail_send" "Send this letter")
-mh-tool-bar-item-help)
+(mh-compose-insertion (letter) "attach" "Insert attachment")
-"Buttons to include in MH-E letter toolbar."
+(ispell-message (letter) "spell" "Check spelling")
-:group 'mh-toolbar
+(save-buffer (letter) "save" "Save current buffer to its file")
-:set 'mh-tool-bar-letter-buttons-set
+(undo (letter) "undo" "Undo last operation")
-:type `(set (const ,mh-tool-bar-item-send)
+(kill-region (letter) "cut"
-(const ,mh-tool-bar-item-attach)
+"Cut (kill) text in region between mark and current position")
-(const ,mh-tool-bar-item-spell)
+(menu-bar-kill-ring-save (letter) "copy"
-(const ,mh-tool-bar-item-save)
+"Copy text in region between mark and current position")
-(const ,mh-tool-bar-item-undo-op)
+(yank (letter) "paste" "Paste (yank) text cut or copied earlier")
-(const ,mh-tool-bar-item-kill)
+(mh-fully-kill-draft (letter) "close" "Kill this draft")
-(const ,mh-tool-bar-item-copy)
+;; Common buttons
-(const ,mh-tool-bar-item-paste)
+(mh-tool-bar-customize (folder letter) "preferences" "MH-E Preferences")
-(const ,mh-tool-bar-item-kill-draft)
+(mh-tool-bar-folder-help (folder) "help"
-(const ,mh-tool-bar-item-comp-prefs)
+"Help! (general help)\nThis button runs `Info-goto-node'")
-(const ,mh-tool-bar-item-help)))
+(mh-tool-bar-letter-help (letter) "help"
+"Help! (general help)\nThis button runs `Info-goto-node'")
+;; Folder narrowed to sequence buttons
+(mh-widen (sequence) "widen"
+"Widen from the sequence\nThis button runs `mh-widen'"))
 ;;; Speedbar and folder configuration (:group 'mh-speed)
 :group 'mh-folder)
 (defcustom mh-default-folder-list nil
 "*Alist of addresses and folders.
 When refiling messages, these folders are the default that is provided if the
-sender has the associated address. You do not need to list your aliases here
+sender (or recipient if the Check Recipient checkbox has been selected) has
-as that lookup is already performed.
+the associated address, a regexp. The first entry to match will be used, so
+order them according to the wanted priority. You do not need to list your
+aliases here as that lookup is already performed.
 See `mh-prompt-for-refile-folder' and `mh-folder-from-address' for more
 information."
-:type '(repeat (list (string :tag "Address")
+:type '(repeat (list (regexp :tag "Address")
-(string :tag "Folder")))
+(string :tag "Folder")
+(boolean :tag "Check Recipient")))
 :group 'mh-folder)
 (defcustom mh-default-folder-must-exist-flag t
 "*Non-nil means guessed folder name must exist to be used.
 If this variable is t, then the guessed name is only used if the folder
 Normally \"inc\".  This file is searched for relative to
 the `mh-progs' directory unless it is an absolute pathname."
 :type 'string
 :group 'mh-folder)
+(defcustom mh-inc-spool-list nil
+"*Alist of alternate spool files, corresponding folders and keybindings.
+Here's an example. Suppose you have subscribed to the MH-E devel mailing
+list. You could filter its mail into a separate spool file named
+~/mail/mh-e using Procmail and a .procmailrc entry like:
+MAILDIR=$HOME/mail      #you'd better make sure it exists
+:0:
+* ^From mh-e-devel-admin@lists.sourceforge.net
+mh-e
+If you wanted to incorporate that spool file into an MH folder called
+mh-e by pressing \"I m\" in folder-mode or by `M-x mh-inc-spool-mh-e',
+you would setup  `mh-inc-spool-list' with an entry:
+Spool file:  ~/mail/mh-e
+Folder:      mh-e
+Key binding: m
+Then, you could also install `xbuffy' and configure an extra mailbox like so:
+box ~/mail/mh-e
+title mh-e
+origMode
+polltime 10
+headertime 0
+command gnudoit -q '(mh-inc-spool-mh-e)'
+Note that the entry above uses the gnuserv package to communicate the
+command `mh-inc-spool-mh-e' to Emacs. It will incorporate the spool file
+when clicking the xbuffy box with the middle mouse button."
+:type '(repeat (list (file :tag "Spool file")
+(string :tag "Folder")
+(character :tag "Key binding")))
+:set 'mh-inc-spool-list-set
+:group 'mh-folder)
 (defcustom mh-lpr-command-format "lpr -J '%s'"
 "*Format for Unix command that prints a message.
 The string should be a Unix command line, with the string '%s' where
 the job's name (folder and message number) should appear.  The formatted
 message text is piped to this command when you type \\<mh-folder-mode-map>`\\[mh-print-msg]'."
 :type '(choice (const :tag "Prompt the first time" nil)
 (const :tag "Prompt always" t)
 directory)
 :group 'mh-folder)
-(defcustom mh-recenter-summary-flag nil
-"*Non-nil means to recenter the summary window.
-Recenter the summary window when the show window is toggled off if non-nil."
-:type 'boolean
-:group 'mh-folder)
 (defcustom mh-print-background-flag nil
 "*Non-nil means messages should be printed in the background.
 WARNING: do not delete the messages until printing is finished;
 otherwise, your output may be truncated."
+:type 'boolean
+:group 'mh-folder)
+(defcustom mh-recenter-summary-flag nil
+"*Non-nil means to recenter the summary window.
+Recenter the summary window when the show window is toggled off if non-nil."
 :type 'boolean
 :group 'mh-folder)
 (defcustom mh-recursive-folders-flag nil
 "*Non-nil means that commands which operate on folders do so recursively."
 A directory name string, or nil to use current directory."
 :type '(choice (const :tag "Current" nil)
 directory)
 :group 'mh-folder)
+(defcustom mh-tick-seq 'tick
+"The name of the MH tick sequence."
+:type '(choice (const :tag "Disable ticking" nil)
+symbol)
+:group 'mh-folder)
 (defcustom mh-update-sequences-after-mh-show-flag t
 "*Non-nil means `mh-update-sequence' is called from `mh-show-mode'.
 If set, `mh-update-sequence' is run every time a message is shown, telling
 MH or nmh that this is your current message.  It's useful, for example, to
 display MIME content using \"M-! mhshow RET\""
 :type 'boolean
 :group 'mh-folder)
+;;; Indexed searching (:group 'mh-index)
+(defcustom mh-index-new-messages-folders t
+"Folders searched for `mh-unseen-seq'.
+If t, then `mh-inbox' is searched. If nil, all the top level folders are
+searched. Otherwise the list of folders specified as strings are searched.
+See also `mh-recursive-folders-flag'."
+:group 'mh-index
+:type '(choice (const :tag "Inbox" t)
+(const :tag "All" nil)
+(repeat :tag "Choose folders" (string :tag "Folder"))))
+(defcustom mh-index-program nil
+"Indexing program that MH-E shall use.
+The possible choices are swish++, swish-e, mairix, namazu, glimpse, pick and
+grep. By default this variable is nil which means that the programs are tried
+in order and the first one found is used.
+More information about setting up an indexing program to use with MH-E can be
+found in the documentation of `mh-index-search'."
+:type '(choice (const :tag "Auto-detect" nil)
+(const :tag "swish++" swish++)
+(const :tag "swish-e" swish)
+(const :tag "mairix" mairix)
+(const :tag "namazu" namazu)
+(const :tag "glimpse" glimpse)
+(const :tag "pick" pick)
+(const :tag "grep" grep))
+:group 'mh-index)
+;;; Spam Handling (:group 'mh-junk)
+;; Spam fighting program chosen
+(defvar mh-junk-choice nil)
+;; Available spam filter interfaces
+(defvar mh-junk-function-alist
+'((bogofilter mh-bogofilter-blacklist mh-bogofilter-whitelist)
+(spamprobe mh-spamprobe-blacklist mh-spamprobe-whitelist)
+(spamassassin mh-spamassassin-blacklist mh-spamassassin-whitelist))
+"Available choices of spam programs to use.
+This is an alist. For each element there are functions that blacklist a message
+as spam and whitelist a message incorrectly classified as spam.")
+(defun mh-junk-choose (symbol value)
+"Choose spam program to use.
+The function is always called with SYMBOL bound to `mh-junk-program' and VALUE
+bound to the new value of `mh-junk-program'. The function sets the variable
+`mh-junk-choice' in addition to `mh-junk-program'."
+(set symbol value)
+(setq mh-junk-choice
+(or value
+(loop for element in mh-junk-function-alist
+until (executable-find (symbol-name (car element)))
+finally return (car element)))))
+;; User customizable variables
+(defcustom mh-junk-mail-folder nil
+"Folder to put spam mail in.
+If nil then the spam is deleted."
+:type '(choice (const :tag "Delete spam" nil)
+(string :tag "Spam folder"))
+:group 'mh-junk)
+(defcustom mh-junk-program nil
+"Spam program that MH-E shall use.
+The possible choices are bogofilter, spamprobe, and spamassassin. By default
+this variable is nil which means that the programs are tried in order and the
+first one found is used."
+:type '(choice (const :tag "auto-detect" nil)
+(const :tag "bogofilter" bogofilter)
+(const :tag "spamprobe" spamprobe)
+(const :tag "spamassassin" spamassassin))
+:set 'mh-junk-choose
+:group 'mh-junk)
 ;;; Message display (:group 'mh-show)
 (defcustom mh-bury-show-buffer-flag t
 "*Non-nil means that the displayed show buffer for a folder is buried."
 :type 'boolean
 :type 'boolean
 :group 'mh-show)
 (defcustom mh-decode-mime-flag (not (not (locate-library "mm-decode")))
 "*Non-nil means that Gnus is used to show MIME attachments with Gnus."
-:type 'boolean
-:group 'mh-show)
-(defcustom mh-decode-content-transfer-encoded-message-flag
-(and (fboundp 'executable-find) (executable-find "mimencode") t)
-"Non-nil means decode messages with `mimencode', if necessary.
-Messages which are encoded as quoted-printable or base64 are translated into
-8-bit characters by the `mimencode' command.
-This variable is initialized to t if `mimencode' is available.
-The `mimencode' program is part of the metamail package. The source can be
-obtained from
-ftp://thumper.bellcore.com/pub/nsb/"
 :type 'boolean
 :group 'mh-show)
 (defcustom mh-display-buttons-for-inline-parts-flag nil
 "*Non-nil means display buttons for all inline MIME parts.
 perform the action--which is usually desired but cannot be retracted--without
 question."
 :type 'boolean
 :group 'mh-show)
+(defcustom mh-fetch-x-image-url nil
+"Control fetching of X-Image-URL header field image.
+This setting only has effect if `mh-show-use-xface-flag' is non-nil.
+If set to t, the image is fetched.
+If set to 'ask, the user is prompted before the image is fetched. MH-E will
+remember your reply and will either use the already fetched image the next time
+the same URL is encountered or silently skip it if you didn't fetch it the
+first time.
+If set to nil, the default, images are not fetched and only displayed if they
+are already present in the cache."
+:type '(choice (const :tag "Always fetch" t)
+(const :tag "Ask before fetching" ask)
+(const :tag "Never fetch" nil))
+:group 'mh-show)
 (defcustom mh-graphical-smileys-flag t
 "*Non-nil means graphical smileys are displayed.
 Non-nil means that small graphics will be used in the show buffer instead of
 patterns like :-), ;-) etc. The setting only has effect if
 `mh-decode-mime-flag' is non-nil."
 :type '(choice (const :tag "Use Gnus" gnus)
 (const :tag "Use font-lock" font-lock)
 (const :tag "Don't fontify" nil))
 :group 'mh-show)
+(defvar mh-invisible-headers nil
+"*Regexp matching lines in a message header that are not to be shown.
+Use the function `mh-invisible-headers' to generate this variable.
+If `mh-visible-headers' is non-nil, it is used instead to specify what
+to keep.")
+(defun mh-invisible-headers ()
+"Make or remake the variable `mh-invisible-headers'.
+Done using `mh-invisible-header-fields' as input."
+(setq mh-invisible-headers
+(concat
+"^"
+(let ((max-specpdl-size 1000) ;workaround for insufficient default
+(fields mh-invisible-header-fields))
+(regexp-opt fields t)))))
+(defun mh-invisible-header-fields-set (symbol value)
+"Update `mh-invisible-header-fields'.
+The function is called with SYMBOL bound to `mh-invisible-header-fields' and
+VALUE is the the list of headers that are invisible. As a side effect, the
+variable `mh-invisible-fields' is set."
+(set-default symbol value)
+(mh-invisible-headers))
+;; Keep fields alphabetized. Mention source, if known.
+(defcustom mh-invisible-header-fields
+'("Approved:"
+"Autoforwarded:"
+"Bestservhost:"
+"Cancel-Lock:"                      ; NNTP posts
+"Content-"                          ; RFC 2045
+"Delivered-To:"              ; Egroups/yahoogroups mailing list manager
+"Delivery-Date:"                    ; MH
+"Delivery:"
+"Encoding:"
+"Errors-To:"
+"Face:"                             ; Gnus Face header
+"Forwarded:"                        ; MH
+"From "                             ; sendmail
+"Importance:"                       ; MS Outlook
+"In-Reply-To:"                      ; MH
+"Lines:"
+"List-"                             ; Mailman mailing list manager
+"List-"                             ; Unknown mailing list managers
+"List-Subscribe:"                   ; Unknown mailing list managers
+"List-Unsubscribe:"                 ; Unknown mailing list managers
+"Mail-from:"                        ; MH
+"Mailing-List:"              ; Egroups/yahoogroups mailing list manager
+"Message-Id:"                       ; RFC 822
+"Mime-Version"                      ; RFC 2045
+"NNTP-"                             ; News
+"Old-Return-Path:"
+"Original-Encoded-Information-Types:"  ; X400
+"Original-Lines:"                   ; mail to news
+"Original-Newsgroups:"              ; mail to news
+"Original-NNTP-"                    ; mail to news
+"Original-Path:"                    ; mail to news
+"Original-Received:"                ; mail to news
+"Original-To:"                      ; mail to news
+"Original-X-"                       ; mail to news
+"P1-Content-Type:"                  ; X400
+"P1-Message-Id:"                    ; X400
+"P1-Recipient:"                     ; X400
+"Path:"
+"Precedence:"
+"Prev-Resent"                       ; MH
+"Priority:"
+"Received:"                         ; RFC 822
+"References:"
+"Remailed-"                         ; MH
+"Replied:"                          ; MH
+"Resent"                            ; MH
+"Return-Path:"                      ; RFC 822
+"Sensitivity:"                      ; MS Outlook
+"Status:"                           ; sendmail
+"Ua-Content-Id:"                    ; X400
+"User-Agent:"
+"Via:"                              ; MH
+"X-Abuse-Info:"
+"X-Accept-Language:"
+"X-Accept-Language:"                ; Netscape/Mozilla
+"X-Ack:"
+"X-Apparently-From:"                ; MS Outlook
+"X-Apparently-To:"           ; Egroups/yahoogroups mailing list manager
+"X-Authentication-Warning:"         ; sendmail
+"X-Beenthere:"                      ; Mailman mailing list manager
+"X-Bogosity:"                       ; bogofilter
+"X-Complaints-To:"
+"X-Cron-Env:"
+"X-Delivered"
+"X-Envelope-Sender:"
+"X-Envelope-To:"
+"X-Face:"
+"X-Folder:"                         ; Spam
+"X-From-Line"
+"X-Gnus-Mail-Source:"               ; gnus
+"X-Habeas-SWE-1:"                   ; Spam
+"X-Habeas-SWE-2:"                   ; Spam
+"X-Habeas-SWE-3:"                   ; Spam
+"X-Habeas-SWE-4:"                   ; Spam
+"X-Habeas-SWE-5:"                   ; Spam
+"X-Habeas-SWE-6:"                   ; Spam
+"X-Habeas-SWE-7:"                   ; Spam
+"X-Habeas-SWE-8:"                   ; Spam
+"X-Habeas-SWE-9:"                   ; Spam
+"X-Info:"                           ; NTMail
+"X-Juno-"                           ; Juno
+"X-List-Host:"                      ; Unknown mailing list managers
+"X-List-Subscribe:"                 ; Unknown mailing list managers
+"X-List-Unsubscribe:"               ; Unknown mailing list managers
+"X-Listserver:"                     ; Unknown mailing list managers
+"X-Loop:"                           ; Unknown mailing list managers
+"X-MIME-Autoconverted:"             ; sendmail
+"X-MIMETrack:"
+"X-MS-TNEF-Correlator:"             ; MS Outlook
+"X-Mailing-List:"                   ; Unknown mailing list managers
+"X-Mailman-Version:"                ; Mailman mailing list manager
+"X-Majordomo:"                      ; Majordomo mailing list manager
+"X-Message-Id"
+"X-MHE-Checksum"                    ; Checksum added during index search
+"X-MimeOLE:"                        ; MS Outlook
+"X-Mozilla-Status:"                 ; Netscape/Mozilla
+"X-Msmail-"                         ; MS Outlook
+"X-News:"                           ; News
+"X-No-Archive:"
+"X-Notes-Item:"                     ; Lotus Notes Domino structured header
+"X-Orcl-Content-Type:"
+"X-Original-Complaints-To:"
+"X-Original-Date:"                  ; SourceForge mailing list manager
+"X-Original-Trace:"
+"X-OriginalArrivalTime:"            ; Hotmail
+"X-Originating-IP:"                 ; Hotmail
+"X-Priority:"                       ; MS Outlook
+"X-Qotd-"                           ; User added
+"X-Received-Date:"
+"X-Received:"
+"X-Request-"
+"X-SBClass:"                        ; Spam
+"X-SBNote:"                         ; Spam
+"X-SBPass:"                         ; Spam
+"X-SBRule:"                         ; Spam
+"X-Scanned-By"
+"X-Sender:"
+"X-Server-Date:"
+"X-Server-Uuid:"
+"X-Sieve:"                          ; Sieve filtering
+"X-Spam-Checker-Version:"           ; Spamassassin
+"X-Spam-Level:"                     ; Spamassassin
+"X-Spam-Score:"                     ; Spamassassin
+"X-Spam-Status:"                    ; Spamassassin
+"X-SpamBouncer:"                    ; Spam
+"X-Trace:"
+"X-UIDL:"
+"X-UserInfo1:"
+"X-VSMLoop:"                        ; NTMail
+"X-Vms-To:"
+"X-Wss-Id:"                         ; Worldtalk gateways
+"X-eGroups-"                 ; Egroups/yahoogroups mailing list manager
+"X-pgp:"
+"X-submission-address:"
+"X400-"                             ; X400
+"Xref:")
+"*List of header fields that are not to be shown.
+Regexps are not allowed. Unique fields should have a \":\" suffix; otherwise,
+the element can be used to render invisible an entire class of fields that
+start with the same prefix.
+This variable is ignored if `mh-visible-headers' is set."
+:type '(repeat (string :tag "Header field"))
+:set 'mh-invisible-header-fields-set
+:group 'mh-show)
 (defcustom mh-max-inline-image-height nil
 "*Maximum inline image height if Content-Disposition is not present.
 If nil, image will be displayed if its height is smaller than the height of
 the window."
 :type '(choice (const nil) integer)
 "*Non-nil means highlight URLs and email addresses.
 The `goto-addr' module is used."
 :type 'boolean
 :group 'mh-show)
-(defcustom mh-show-use-xface-flag
+(defcustom mh-show-use-xface-flag (>= emacs-major-version 21)
-(and window-system
+"*Non-nil means display face images in `mh-show-mode'.
-(not (null (cond
+This flag controls the display of three kinds of faces.
-(mh-xemacs-flag
-(locate-library "x-face"))
+The first is the traditional X-Face header field. For GNU Emacs 21
-((>= emacs-major-version 21)
+and above, the `uncompface' binary is required to be in the execute
-(locate-library "x-face-e21"))
+PATH for the display of X-Face images. It can be obtained from
-(t                   ;Emacs20
+ftp://ftp.cs.indiana.edu/pub/faces/compface/compface.tar.Z.
-nil))))
-(not (null (and (fboundp 'executable-find)
+If the XEmacs you are using has internal support for X-Face images, then MH-E
-(executable-find
+will display X-Face images in XEmacs \"out of the box\". Even if you don't have
-"uncompface")))))
+X-Face support compiled into your XEmacs, you can still see the X-Face images
-"*Non-nil means display faces in `mh-show-mode' with external x-face package.
+in MH-E with the aid of an external x-face package and `uncompface'. It is
-It is available from ftp://ftp.jpl.org/pub/elisp/. Download it and put its
+available from ftp://ftp.jpl.org/pub/elisp/. Download it, put its files in the
-files in the Emacs `load-path' and MH-E will invoke it automatically for you if
+`load-path' and MH-E will invoke it automatically.
-this variable is non-nil.
+Second, MH-E supports the display of the Gnus-specific Face
-The `uncompface' binary is also required to be in the execute PATH. It can
+header field in GNU Emacs >= 21 and XEmacs. No external packages
-be obtained from: ftp://ftp.cs.indiana.edu/pub/faces/compface/compface.tar.Z"
+are required. More information about the Face header can be found
+at: http://quimby.gnus.org/circus/face/.
+Finally, MH-E can also display images from the X-Image-URL header field. The
+display of the images requires the `wget' program, available from
+http://www.gnu.org/software/wget/wget.html, to fetch the image and the
+`convert' program from the ImageMagick suite, available from
+http://www.imagemagick.org/. Of the three header fields this is the most
+efficient in terms of network usage since the image doesn't need to be
+transmitted with every single mail. However its display needs the recipient to
+fetch a URL and this can be misused. So it is disabled by default. It can be
+enabled by customizing `mh-fetch-x-image-url'. Setting that to ask for
+confirmation before fetching seems like a good choice.
+Versions of GNU Emacs prior to 21.1 don't support the display of
+inline images. So face images are not displayed in these versions."
 :type 'boolean
 :group 'mh-show)
 (defcustom mh-summary-height (or (and (fboundp 'frame-height)
 (> (frame-height) 24)
 the message continues to conform to RFC 822 and MH-E can parse the headers."
 :type '(choice (const nil) (const t) string)
 :group 'mh-show)
 (put 'mhl-formfile 'info-file "mh-e")
-(defvar mh-invisible-headers nil
-"*Regexp matching lines in a message header that are not to be shown.
-If `mh-visible-headers' is non-nil, it is used instead to specify what
-to keep.")
-(defun mh-invisible-headers ()
-"Make or remake the variable `mh-invisible-headers'.
-Done using `mh-invisible-header-fields' as input."
-(setq mh-invisible-headers
-(concat
-"^"
-(let ((max-specpdl-size 1000) ;workaround for insufficient default
-(fields (append (if (not mh-show-use-xface-flag)
-'("X-Face: "))
-mh-invisible-header-fields)))
-(regexp-opt fields t)))))
-(defun mh-invisible-header-fields-set (symbol value)
-"Update `mh-invisible-header-fields'.
-The function is called with SYMBOL bound to `mh-invisible-header-fields' and
-VALUE is the the list of headers that are invisible. As a side effect, the
-variable `mh-invisible-fields' is set."
-(set-default symbol value)
-(mh-invisible-headers))
-;; Keep fields alphabetized. Mention source, if known.
-(defcustom mh-invisible-header-fields
-'("Autoforwarded: "
-"Bestservhost: "
-"Content-"                          ; RFC 2045
-"Delivered-To: "             ; Egroups/yahoogroups mailing list manager
-"Delivery-Date: "                   ; MH
-"Delivery: "
-"Encoding: "
-"Errors-To: "
-"Forwarded: "                       ; MH
-"From "                             ; sendmail
-"Importance: "                      ; MS Outlook
-"In-Reply-To: "                     ; MH
-"Lines: "
-"List-"                             ; Mailman mailing list manager
-"List-"                             ; Unknown mailing list managers
-"List-Subscribe: "                  ; Unknown mailing list managers
-"List-Unsubscribe: "                ; Unknown mailing list managers
-"Mail-from: "                       ; MH
-"Mailing-List: "             ; Egroups/yahoogroups mailing list manager
-"Message-Id: "                      ; RFC 822
-"Mime-Version"                      ; RFC 2045
-"NNTP-"                             ; News
-"Old-Return-Path: "
-"Original-Encoded-Information-Types: " ; X400
-"P1-Content-Type: "                 ; X400
-"P1-Message-Id: "                   ; X400
-"P1-Recipient: "                    ; X400
-"Path: "
-"Precedence: "
-"Prev-Resent"                       ; MH
-"Priority: "
-"Received: "                        ; RFC 822
-"References: "
-"Remailed-"                         ; MH
-"Replied: "                         ; MH
-"Resent"                            ; MH
-"Return-Path: "                     ; RFC 822
-"Sensitivity: "                     ; MS Outlook
-"Status: "                          ; sendmail
-"Ua-Content-Id: "                   ; X400
-"User-Agent: "
-"Via: "                             ; MH
-"X-Abuse-Info: "
-"X-Accept-Language: "
-"X-Accept-Language: "               ; Netscape/Mozilla
-"X-Ack: "
-"X-Apparently-From: "               ; MS Outlook
-"X-Apparently-To: "          ; Egroups/yahoogroups mailing list manager
-"X-Authentication-Warning: "        ; sendmail
-"X-Beenthere: "                     ; Mailman mailing list manager
-"X-Complaints-To: "
-"X-Cron-Env: "
-"X-Delivered"
-"X-Envelope-Sender: "
-"X-Envelope-To: "
-"X-Folder: "                        ; Spam
-"X-From-Line"
-"X-Gnus-Mail-Source: "              ; gnus
-"X-Habeas-SWE-1: "                  ; Spam
-"X-Habeas-SWE-2: "                  ; Spam
-"X-Habeas-SWE-3: "                  ; Spam
-"X-Habeas-SWE-4: "                  ; Spam
-"X-Habeas-SWE-5: "                  ; Spam
-"X-Habeas-SWE-6: "                  ; Spam
-"X-Habeas-SWE-7: "                  ; Spam
-"X-Habeas-SWE-8: "                  ; Spam
-"X-Habeas-SWE-9: "                  ; Spam
-"X-Info: "                          ; NTMail
-"X-Juno-"                           ; Juno
-"X-List-Host: "                     ; Unknown mailing list managers
-"X-List-Subscribe: "                ; Unknown mailing list managers
-"X-List-Unsubscribe: "              ; Unknown mailing list managers
-"X-Listserver: "                    ; Unknown mailing list managers
-"X-Loop: "                          ; Unknown mailing list managers
-"X-MIME-Autoconverted: "            ; sendmail
-"X-MIMETrack: "
-"X-MS-TNEF-Correlator: "            ; MS Outlook
-"X-Mailing-List: "                  ; Unknown mailing list managers
-"X-Mailman-Version: "               ; Mailman mailing list manager
-"X-Message-Id"
-"X-MHE-Checksum"                    ; Checksum added during index search
-"X-MimeOLE: "                       ; MS Outlook
-"X-Mozilla-Status: "                ; Netscape/Mozilla
-"X-Msmail-"                         ; MS Outlook
-"X-News: "                          ; News
-"X-No-Archive: "
-"X-Orcl-Content-Type: "
-"X-Original-Complaints-To: "
-"X-Original-Date: "                 ; SourceForge mailing list manager
-"X-Original-Trace: "
-"X-OriginalArrivalTime: "           ; Hotmail
-"X-Originating-IP: "                ; Hotmail
-"X-Priority: "                      ; MS Outlook
-"X-Qotd-"                           ; User added
-"X-Received-Date: "
-"X-Received: "
-"X-Request-"
-"X-SBClass: "                       ; Spam
-"X-SBNote: "                        ; Spam
-"X-SBPass: "                        ; Spam
-"X-SBRule: "                        ; Spam
-"X-Scanned-By"
-"X-Sender: "
-"X-Server-Date: "
-"X-Server-Uuid: "
-"X-Sieve: "                         ; Sieve filtering
-"X-Spam-Level: "                    ; Spam
-"X-Spam-Score: "                    ; Spam
-"X-Spam-Status: "                   ; Spam
-"X-SpamBouncer: "                   ; Spam
-"X-Trace: "
-"X-UIDL: "
-"X-UserInfo1: "
-"X-VSMLoop: "                       ; NTMail
-"X-Vms-To: "
-"X-Wss-Id: "                        ; Worldtalk gateways
-"X-eGroups-"                 ; Egroups/yahoogroups mailing list manager
-"X-pgp: "
-"X-submission-address: "
-"X400-"                             ; X400
-"Xref: ")
-"*List of header fields that are not to be shown.
-Regexps are not allowed. Unique fields should have a \": \" suffix; otherwise,
-the element can be used to render invisible an entire class of fields that
-start with the same prefix.
-This variable is ignored if `mh-visible-headers' is set."
-:type '(repeat (string :tag "Header field"))
-:set 'mh-invisible-header-fields-set
-:group 'mh-show)
 ;;; Composing messages (:group 'mh-letter)
 (defcustom mh-compose-insertion (if (locate-library "mml") 'gnus 'mhn)
 \\<mh-letter-mode-map>Used when the message is inserted into an outgoing letter
 by \\[mh-insert-letter] or \\[mh-yank-cur-msg]."
 :type 'string
 :group 'mh-letter)
-(defcustom mh-insert-mail-followup-to-flag t
-"Non-nil means maybe append a Mail-Followup-To field to the header.
-The insertion is done if the To: or Cc: fields matches an entry in
-`mh-insert-mail-followup-to-list'."
-:type 'boolean
-:group 'mh-letter)
-(defcustom mh-insert-mail-followup-to-list nil
-"Alist of addresses for which a Mail-Followup-To field is inserted.
-Each element has the form (REGEXP ADDRESS).
-When the REGEXP appears in the To or cc fields of a message, the corresponding
-ADDRESS is inserted in a Mail-Followup-To field.
-Here's a customization example:
-regexp: mh-e-users@lists.s\\\\(ourceforge\\\\|f\\\\).net
-address: mh-e-users@lists.sourceforge.net
-This corresponds to:
-(setq mh-insert-mail-followup-to-list
-'((\"mh-e-users@lists.s\\\\(ourceforge\\\\|f\\\\).net\"
-\"mh-e-users@lists.sourceforge.net\")))
-While it might be tempting to add a descriptive name to the mailing list
-address, consider that this field will appear in other people's outgoing
-mail in their To: field.  It might be best to keep it simple."
-:type '(repeat (list (string :tag "Regexp")
-(string :tag "Address")))
-:group 'mh-letter)
 (defcustom mh-insert-x-mailer-flag t
 "*Non-nil means append an X-Mailer field to the header."
 :type 'boolean
+:group 'mh-letter)
+(defcustom mh-letter-complete-function 'ispell-complete-word
+"*Function to call when completing outside of fields specific to aliases."
+:type '(choice function (const nil))
 :group 'mh-letter)
 (defcustom mh-letter-fill-column 72
 "*Fill column to use in `mh-letter-mode'.
 This is usually less than in other text modes because email messages get
 Inserted into message by \\<mh-letter-mode-map>\\[mh-insert-signature]."
 :type 'file
 :group 'mh-letter)
 (defcustom mh-x-face-file "~/.face"
-"*File name containing the encoded X-Face string to insert in outgoing mail.
+"*File containing X-Face or Face header field to insert in outgoing mail.
-If nil, or the file does not exist, nothing is added to message headers."
+If the file starts with either of the strings \"X-Face: \", \"Face: \" or
+\"X-Image-URL: \" then it is assumed to contain the whole field and is added to
+the message header verbatim. Otherwise it is assumed that the file contains the
+value of the X-Face header field.
+X-Face header fields can be generated using `compface', which can be obtained
+from ftp://ftp.cs.indiana.edu/pub/faces/compface/compface.tar.Z. The \"Online
+X-Face Convertor\" at http://www.dairiki.org/xface/ is a useful resource for
+quick conversion of images into X-Face header fields.
+There is a `make-face' script that converts a jpeg image to a Face header
+field at http://quimby.gnus.org/circus/face/make-face.
+The URL of any image can be used for the X-Image-URL field and no processing
+of the image is required.
+If nil, or the file does not exist, nothing is added to the message header."
 :type 'file
 :group 'mh-letter)
-(defvar mh-x-mailer-string nil
-"*String containing the contents of the X-Mailer header field.
-If nil, this variable is initialized to show the version of MH-E, Emacs, and
-MH the first time a message is composed.")
 (defcustom mh-yank-from-start-of-msg 'attribution
 "*Controls which part of a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg].
 If t, include the entire message, with full headers.  This is historically
 here for use with supercite, but is now deprecated in favor of the setting
 (const :tag "Without header, with attribution, automatically"
 autoattrib)
 (const :tag "Entire message with headers" t))
 :group 'mh-letter)
-(defcustom mh-letter-complete-function 'ispell-complete-word
-"*Function to call when completing outside of fields specific to aliases."
-:type '(choice function (const nil))
-:group 'mh-letter)
 ;;; Alias handling (:group 'mh-alias)
+(defcustom mh-alias-completion-ignore-case-flag t
+"*Non-nil means don't consider case significant in MH alias completion.
+This is the default in plain MH, so it is the default here as well. It
+can be useful to set this to t if, for example, you use lowercase
+aliases for people and uppercase for mailing lists."
+:type 'boolean
+:group 'mh-alias)
+(defcustom mh-alias-expand-aliases-flag nil
+"*Non-nil means to expand aliases entered in the minibuffer.
+In other words, aliases entered in the minibuffer will be expanded to the full
+address in the message draft. By default, this expansion is not performed."
+:type 'boolean
+:group 'mh-alias)
+(defcustom mh-alias-flash-on-comma t
+"*Specify whether to flash or warn on translation.
+When a [comma] is pressed while entering aliases or addresses, setting this
+variable to the following values has the listed effects:
+t   Flash alias translation but don't warn if there is no translation.
+1   Flash alias translation and warn if there is no translation.
+nil Do not flash alias translation nor warn if there is no translation."
+:type '(choice (const :tag "Flash but don't warn if no translation" t)
+		 (const :tag "Flash and warn if no translation" 1)
+		 (const :tag "Don't flash nor warn if no translation" nil))
+:group 'mh-alias)
+(defcustom mh-alias-insert-file nil
+"*Filename to use to store new MH-E aliases.
+This variable can also be a list of filenames, in which case MH-E will prompt
+for one of them. If nil, the default, then MH-E will use the first file found
+in the \"AliasFile\" component of the MH profile."
+:type '(choice (const :tag "Use AliasFile MH profile component" nil)
+(file :tag "Alias file")
+(repeat :tag "List of alias files" file))
+:group 'mh-alias)
+(defcustom mh-alias-insertion-location 'sorted
+"Specifies where new aliases are entered in alias files.
+Options are sorted alphabetically, at the top of the file or at the bottom."
+:type '(choice (const :tag "Sorted alphabetically" sorted)
+(const :tag "At the top of file" top)
+(const :tag "At the bottom of file" bottom))
+:group 'mh-alias)
+(defcustom mh-alias-local-users t
+"*If t, local users are completed in MH-E To: and Cc: prompts.
+Users with a userid greater than some magic number (usually 200) are available
+for completion.
+If you set this variable to a string, it will be executed to generate a
+password file. A value of \"ypcat passwd\" is helpful if NIS is in use."
+:type '(choice (boolean) (string))
+:group 'mh-alias)
 (defcustom mh-alias-system-aliases
 '("/etc/nmh/MailAliases" "/usr/lib/mh/MailAliases" "/etc/passwd")
 "*A list of system files from which to cull aliases.
 If these files are modified, they are automatically reread. This list need
 include only system aliases and the passwd file, since personal alias files
 listed in your \"AliasFile\" MH profile component are automatically included.
 You can update the alias list manually using \\[mh-alias-reload]."
-:group 'mh-alias
+:type '(choice (file) (repeat file))
-:type '(choice (file) (repeat file)))
-(defcustom mh-alias-expand-aliases-flag nil
-"*Non-nil means to expand aliases entered in the minibuffer.
-In other words, aliases entered in the minibuffer will be expanded to the full
-address in the message draft. By default, this expansion is not performed."
-:group 'mh-alias
-:type 'boolean)
-(defcustom mh-alias-completion-ignore-case-flag t
-"*Non-nil means don't consider case significant in MH alias completion.
-This is the default in plain MH, so it is the default here as well. It
-can be useful to set this to t if, for example, you use lowercase
-aliases for people and uppercase for mailing lists."
-:group 'mh-alias
-:type 'boolean)
-(defcustom mh-alias-flash-on-comma t
-"*Specify whether to flash or warn on translation.
-When a [comma] is pressed while entering aliases or addresses, setting this
-variable to the following values has the listed effects:
-t   Flash alias translation but don't warn if there is no translation.
-1   Flash alias translation and warn if there is no translation.
-nil Do not flash alias translation nor warn if there is no translation."
-:group 'mh-alias
-:type '(choice (const :tag "Flash but don't warn if no translation" t)
-		 (const :tag "Flash and warn if no translation" 1)
-		 (const :tag "Don't flash nor warn if no translation" nil)))
-(defcustom mh-alias-local-users t
-"*If t, local users are completed in MH-E To: and Cc: prompts.
-Users with a userid greater than some magic number (usually 200) are available
-for completion.
-If you set this variable to a string, it will be executed to generate a
-password file. A value of \"ypcat passwd\" is helpful if NIS is in use."
-:group 'mh-alias
-:type '(choice (boolean) (string)))
-(defcustom mh-alias-insert-file nil
-"*Filename to use to store new MH-E aliases.
-This variable can also be a list of filenames, in which case MH-E will prompt
-for one of them. If nil, the default, then MH-E will use the first file found
-in the \"AliasFile\" component of the MH profile."
-:group 'mh-alias
-:type '(choice (const :tag "Use AliasFile MH profile component" nil)
-(file :tag "Alias file")
-(repeat :tag "List of alias files" file)))
-(defcustom mh-alias-insertion-location 'sorted
-"Specifies where new aliases are entered in alias files.
-Options are sorted alphabetically, at the top of the file or at the bottom."
-:type '(choice (const :tag "Sorted alphabetically" sorted)
-(const :tag "At the top of file" top)
-(const :tag "At the bottom of file" bottom))
 :group 'mh-alias)
-;;; Indexed searching (:group 'mh-index)
-(defcustom mh-index-program nil
-"Indexing program that MH-E shall use.
-The possible choices are swish++, swish-e, mairix, namazu, glimpse, pick and
-grep. By default this variable is nil which means that the programs are tried
-in order and the first one found is used.
-More information about setting up an indexing program to use with MH-E can be
-found in the documentation of `mh-index-search'."
-:type '(choice (const :tag "Auto-detect" nil)
-(const :tag "swish++" swish++)
-(const :tag "swish-e" swish)
-(const :tag "mairix" mairix)
-(const :tag "namazu" namazu)
-(const :tag "glimpse" glimpse)
-(const :tag "pick" pick)
-(const :tag "grep" grep))
-:group 'mh-index)
 ;;; Multiple personalities (:group 'mh-identity)
+(defvar mh-identity-list ())
+(defcustom mh-auto-fields-list nil
+"Alist of addresses for which header lines are automatically inserted.
+Each element has the form (REGEXP ((KEYWORD VALUE) (KEYWORD VALUE)).
+When the REGEXP appears in the To or cc fields of a message, the corresponding
+KEYWORD header field is insert with its VALUE in the message header.
+There is one special case for KEYWORD, that of \"identity\", which means to
+insert that identity using `mh-insert-identity'.
+The common KEYWORD cases of \"Mail-Followup-To\" and \"fcc\" are also
+prompted for in the customization interface."
+:type `(repeat
+(list :tag ""
+(string :tag "Regular expression to match")
+(repeat :tag "At least one pair from below"
+(choice
+(cons :tag "Identity entry"
+(const "identity")
+,(append
+'(radio)
+(mapcar (function (lambda (arg) `(const ,arg)))
+(mapcar 'car mh-identity-list))))
+(cons :tag "fcc field"
+(const "fcc")
+(string :tag "Value"))
+(cons :tag "Mail-Followup-To field"
+(const "Mail-Followup-To")
+(string :tag "Value"))
+(cons :tag "Other field and value pair"
+(string :tag "Field")
+(string :tag "Value"))))))
+:group 'mh-identity)
+(defcustom mh-identity-default nil
+"Default identity to use when `mh-letter-mode' is called."
+;; Dynamically render :type corresponding to `mh-identity-list' entries,
+;; e.g.:
+;;  :type '(radio (const :tag "none" nil)
+;;                (const "home")
+;;                (const "work"))
+:type (append
+'(radio)
+(cons '(const :tag "None" nil)
+(mapcar (function (lambda (arg) `(const ,arg)))
+(mapcar 'car mh-identity-list))))
+:group 'mh-identity)
 (defcustom mh-identity-list nil
 "*List holding MH-E identity.
 Omit the colon and trailing space from the field names.
 The keyword name \"none\" is reversed for internal use.
 (string :tag "Field")
 (string :tag "Value"))))))
 :set 'mh-identity-list-set
 :group 'mh-identity)
-(defcustom mh-identity-default nil
-"Default identity to use when `mh-letter-mode' is called."
-;; Dynamically render :type corresponding to `mh-identity-list' entries,
-;; e.g.:
-;;  :type '(radio (const :tag "none" nil)
-;;                (const "home")
-;;                (const "work"))
-:type (append
-'(radio)
-(cons '(const :tag "None" nil)
-(mapcar (function (lambda (arg) `(const ,arg)))
-(mapcar 'car mh-identity-list))))
-:group 'mh-identity)
 ;;; Hooks (:group 'mh-hooks + group where hook defined)
 ;;; These are alphabetized. All hooks should be placed in the 'mh-hook group;
 (defcustom mh-inc-folder-hook nil
 "Invoked by \\<mh-folder-mode-map>`\\[mh-inc-folder]' after incorporating mail into a folder."
 :type 'hook
 :group 'mh-hooks
 :group 'mh-folder)
-(defcustom mh-index-show-hook nil
-"Invoked after the message has been displayed."
-:type 'hook
-:group 'mh-hooks
-:group 'mh-index)
 (defcustom mh-letter-insert-signature-hook nil
 "Invoked at the beginning of the \\<mh-letter-mode-map>\\[mh-insert-signature] command.
 Can be used to determine which signature file to use based on message content.
 On return, if `mh-signature-file-name' is non-nil that file will be inserted at
 (t
 (:bold t)))
 "Face for highlighting subject text in MH-Folder buffers."
 :group 'mh-folder-faces)
+(defface mh-folder-tick-face
+'((((class color) (background dark)) (:background "#dddf7e"))
+(((class color) (background light)) (:background "#dddf7e"))
+(t (:underline t)))
+"Face used to show ticked messages."
+:group 'mh-folder-faces)
 (defvar mh-folder-address-face 'mh-folder-address-face
 "Face for highlighting the address in MH-Folder buffers.")
 (copy-face 'mh-folder-subject-face 'mh-folder-address-face)
 (defvar mh-folder-scan-format-face 'mh-folder-scan-format-face
 (t
 (:bold t)))
 "Face for highlighting the From: header field."
 :group 'mh-show-faces)
+(defface mh-show-xface-face
+'((t (:foreground "black" :background "white")))
+"Face for displaying the X-Face image.
+The background and foreground is used in the image."
+:group 'mh-show-faces)
 (defvar mh-show-subject-face 'mh-show-subject-face
 "Face for highlighting the Subject header field.")
 (copy-face 'mh-folder-subject-face 'mh-show-subject-face)

Mercurial > emacs

comparison lisp/mh-e/mh-customize.el @ 50702:7dd3d5eae9c7