Commit a4d7cec3 authored by Bill Wohler's avatar Bill Wohler
Browse files

* mh-customize.el (mh-index): Rename group to mh-search and sort group

definition and options accordingly.
(mh-index-program): Rename to mh-search-program.
(mh-kill-folder-suppress-prompt-hooks): Rename mh-index-p to
mh-search-p.
(mh-search-mode-hook): Change group from mh-index to mh-search.
(mh-index-folder): Rename to mh-search-folder. Change group from
mh-index to mh-search.

* mh-e.el (mh-folder-font-lock-keywords): Rename mh-index-folder to
mh-search-folder.

* mh-search.el (mh-indexer) Rename to mh-searcher. The commands pick
and grep are searchers too but aren't indexed.
(mh-index-execute-search-function): Rename to mh-search-function.
(mh-index-next-result-function): Rename to
mh-search-next-result-function.
(mh-index-regexp-builder): Rename to mh-search-regexp-builder.
(mh-search): Since redo-search-flag defaults to nil and is of lesser
importance, make it an optional argument and place it after the folder
and search-regexp arguments. Sync docstring with manual.
(mh-search-mode-map): Autoload so that keys are shown in help even
before mh-search is loaded.
(mh-search-mode): Sync docstring with manual.
(mh-index-do-search): Rename argument indexer to searcher. Sync
docstring with manual.
(mh-pick-do-search): Sync docstring with manual.
(mh-index-p): Rename to mh-search-p.
(mh-indexer-choices): Rename to mh-search-choices.
(mh-index-choose): Rename to mh-search-choose. Rename argument indexer
to searcher.
(mh-swish++-execute-search, mh-swish-execute-search)
(mh-mairix-execute-search, mh-namazu-execute-search): Drop "and read
the results" from docstring since these functions don't.
(mh-pick-execute-search, mh-grep-execute-search): Sync docstring with
manual.
(mh-index-generate-pretty-name): Prune -search from string so that
folder names for pick searches are the same as those of other
searches.
parent 852ae42a
2006-01-14 Bill Wohler <wohler@newt.com>
* mh-customize.el (mh-index): Rename group to mh-search and sort
group definition and options accordingly.
(mh-index-program): Rename to mh-search-program.
(mh-kill-folder-suppress-prompt-hooks): Rename mh-index-p to
mh-search-p.
(mh-search-mode-hook): Change group from mh-index to mh-search.
(mh-index-folder): Rename to mh-search-folder. Change group from
mh-index to mh-search.
* mh-e.el (mh-folder-font-lock-keywords): Rename mh-index-folder
to mh-search-folder.
* mh-search.el (mh-indexer) Rename to mh-searcher. The commands
pick and grep are searchers too but aren't indexed.
(mh-index-execute-search-function): Rename to mh-search-function.
(mh-index-next-result-function): Rename to
mh-search-next-result-function.
(mh-index-regexp-builder): Rename to mh-search-regexp-builder.
(mh-search): Since redo-search-flag defaults to nil and is of
lesser importance, make it an optional argument and place it after
the folder and search-regexp arguments. Sync docstring with
manual.
(mh-search-mode-map): Autoload so that keys are shown in help even
before mh-search is loaded.
(mh-search-mode): Sync docstring with manual.
(mh-index-do-search): Rename argument indexer to searcher. Sync
docstring with manual.
(mh-pick-do-search): Sync docstring with manual.
(mh-index-p): Rename to mh-search-p.
(mh-indexer-choices): Rename to mh-search-choices.
(mh-index-choose): Rename to mh-search-choose. Rename argument
indexer to searcher.
(mh-swish++-execute-search, mh-swish-execute-search)
(mh-mairix-execute-search, mh-namazu-execute-search): Drop "and
read the results" from docstring since these functions don't.
(mh-pick-execute-search, mh-grep-execute-search): Sync docstring
with manual.
(mh-index-generate-pretty-name): Prune -search from string so that
folder names for pick searches are the same as those of other
searches.
2006-01-13 Bill Wohler <wohler@newt.com>
* mh-acros.el (require): Added Satyaki's comment regarding what
......
......@@ -134,12 +134,6 @@ and GNU mailutils."
:link '(custom-manual "(mh-e)Incorporating Mail")
:group 'mh-e)
(defgroup mh-index nil
"Searching."
:link '(custom-manual "(mh-e)Searching")
:prefix "mh-index-"
:group 'mh-e)
(defgroup mh-junk nil
"Dealing with junk mail."
:link '(custom-manual "(mh-e)Junk")
......@@ -164,6 +158,12 @@ and GNU mailutils."
:prefix "mh-"
:group 'mh-e)
(defgroup mh-search nil
"Searching."
:link '(custom-manual "(mh-e)Searching")
:prefix "mh-search-"
:group 'mh-e)
(defgroup mh-sending-mail nil
"Sending mail."
:prefix "mh-"
......@@ -713,30 +713,6 @@ using the \"gnudoit\" command in the \"gnuserv\" package as follows:
;;; Searching (:group 'mh-index)
(defcustom mh-index-program nil
"Indexing program that MH-E shall use.
The default setting of this option is \"Auto-detect\" which means
that MH-E will automatically choose one of swish++, swish-e,
mairix, namazu, pick and grep in that order. If, for example, you
have both swish++ and mairix installed and you want to use
mairix, then you can set this option to \"mairix\".
More information about setting up an indexing program to use with
MH-E can be found in the documentation of `mh-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 "pick" pick)
(const :tag "grep" grep))
:group 'mh-index)
;;; Dealing with Junk Mail (:group 'mh-junk)
;; Spam fighting program chosen
......@@ -1114,6 +1090,30 @@ directory. You may link another program to `scan' (see
;;; Searching (:group 'mh-search)
(defcustom mh-search-program nil
"Search program that MH-E shall use.
The default setting of this option is \"Auto-detect\" which means
that MH-E will automatically choose one of swish++, swish-e,
mairix, namazu, pick and grep in that order. If, for example, you
have both swish++ and mairix installed and you want to use
mairix, then you can set this option to \"mairix\".
More information about setting up an indexing program to use with
MH-E can be found in the documentation of `mh-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 "pick" pick)
(const :tag "grep" grep))
:group 'mh-search)
;;; Sending Mail (:group 'mh-sending-mail)
(defcustom mh-compose-forward-as-mime-flag t
......@@ -2400,15 +2400,15 @@ function used to insert the signature with
:group 'mh-hooks
:group 'mh-letter)
(defcustom mh-kill-folder-suppress-prompt-hooks '(mh-index-p)
(defcustom mh-kill-folder-suppress-prompt-hooks '(mh-search-p)
"Abnormal hook run at the beginning of \\<mh-folder-mode-map>\\[mh-kill-folder].
The hook functions are called with no arguments and should return
a non-nil value to suppress the normal prompt when you remove a
folder. This is useful for folders that are easily regenerated.
The default value of `mh-index-p' suppresses the prompt on
folders generated by an index search.
The default value of `mh-search-p' suppresses the prompt on
folders generated by searching.
WARNING: Use this hook with care. If there is a bug in your hook
which returns t on \"+inbox\" and you hit \\[mh-kill-folder] by
......@@ -2444,7 +2444,7 @@ This can be done with this hook which is called when
\\[mh-search] is run on a new pattern."
:type 'hook
:group 'mh-hooks
:group 'mh-index)
:group 'mh-search)
(defcustom mh-quit-hook nil
"Hook run by \\<mh-folder-mode-map>\\[mh-quit] after quitting MH-E.
......@@ -2629,7 +2629,7 @@ format `mh-scan-format-nmh' and the regular expression
:group 'mh-faces
:group 'mh-folder)
(defface mh-index-folder
(defface mh-search-folder
'((((class color) (background light))
(:foreground "dark green" :bold t))
(((class color) (background dark))
......@@ -2638,7 +2638,7 @@ format `mh-scan-format-nmh' and the regular expression
(:bold t)))
"Folder heading face in MH-Folder buffers created by searches."
:group 'mh-faces
:group 'mh-index)
:group 'mh-search)
(defface mh-letter-header-field
'((((class color) (background light))
......
......@@ -331,7 +331,7 @@ highlighted with the face `mh-folder-sent-to-me-sender'.")
(list
;; Folders when displaying index buffer
(list "^\\+.*"
'(0 'mh-index-folder))
'(0 'mh-search-folder))
;; Marked for deletion
(list (concat mh-scan-deleted-msg-regexp ".*")
'(0 'mh-folder-deleted))
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment