3 files changed, 30 insertions, 14 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 780b5cd067e..c2c05376cc2 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,5 +1,13 @@
 2005-12-04  Bill Wohler  <wohler@newt.com>
 
+        * mh-customize.el (mh-new-messages-folders): Rename from
+        mh-index-new-messages-folders.
+        (mh-ticked-messages-folders): Rename from
+        mh-index-ticked-messages-folders.
+
+        * mh-index.el (mh-index-sequenced-messages)
+        (mh-index-new-messages): Ditto.
+
         * mh-comp.el (mh-forward): Went over all uses of the word "RANGE"
         in the docstrings and made usage consistent. Generally speaking,
         "messages in range" and "range of messages" is redundant and just
diff --git a/lisp/mh-e/mh-customize.el b/lisp/mh-e/mh-customize.el
index 0937b7a5843..fc721febfae 100644
--- a/lisp/mh-e/mh-customize.el
+++ b/lisp/mh-e/mh-customize.el
@@ -384,8 +384,9 @@ this option off."
 
 ;;; Organizing Your Mail with Folders (:group 'mh-folder)
 
-(defcustom mh-index-new-messages-folders t
+(defcustom mh-new-messages-folders t
   "Folders searched for the \"unseen\" sequence.
+
 Set this option to \"Inbox\" to search the \"+inbox\" folder or \"All\" to
 search all of the top level folders. Otherwise, list the folders that should
 be searched with the \"Choose Folders\" menu item.
@@ -396,8 +397,9 @@ See also `mh-recursive-folders-flag'."
                  (repeat :tag "Choose Folders" (string :tag "Folder")))
   :group 'mh-folder)
 
-(defcustom mh-index-ticked-messages-folders t
+(defcustom mh-ticked-messages-folders t
   "Folders searched for `mh-tick-seq'.
+
 Set this option to \"Inbox\" to search the \"+inbox\" folder or \"All\" to
 search all of the top level folders. Otherwise, list the folders that should
 be searched with the \"Choose Folders\" menu item.
diff --git a/lisp/mh-e/mh-index.el b/lisp/mh-e/mh-index.el
index 3fef04418f5..6b429773945 100644
--- a/lisp/mh-e/mh-index.el
+++ b/lisp/mh-e/mh-index.el
@@ -1287,12 +1287,12 @@ then the folders are searched recursively. All parameters ARGS are ignored."
 (defun mh-index-sequenced-messages (folders sequence)
   "Display messages from FOLDERS in SEQUENCE.
 All messages in the sequence you provide from the folders in
-`mh-index-new-messages-folders' are listed. With a prefix argument, enter a
+`mh-new-messages-folders' are listed. With a prefix argument, enter a
 space-separated list of folders, or nothing to search all folders."
   (interactive
    (list (if current-prefix-arg
-             (split-string (read-string "Search folder(s): [all] "))
-           mh-index-new-messages-folders)
+             (split-string (read-string "Search folder(s) (default all): "))
+           mh-new-messages-folders)
          (mh-read-seq-default "Search" nil)))
   (unless sequence (setq sequence mh-unseen-seq))
   (let* ((mh-flists-search-folders folders)
@@ -1330,27 +1330,33 @@ space-separated list of folders, or nothing to search all folders."
 ;;;###mh-autoload
 (defun mh-index-new-messages (folders)
   "Display unseen messages.
+
 If you use a program such as `procmail' to use `rcvstore' to file your
 incoming mail automatically, you can display new, unseen, messages using this
 command. All messages in the `unseen' sequence from the folders in
-`mh-index-new-messages-folders' are listed. With a prefix argument, enter a
-space-separated list of FOLDERS, or nothing to search all folders."
+`mh-new-messages-folders' are listed.
+
+With a prefix argument, enter a space-separated list of FOLDERS, or nothing to
+search all folders."
   (interactive
    (list (if current-prefix-arg
-             (split-string (read-string "Search folder(s): [all] "))
-           mh-index-new-messages-folders)))
+             (split-string (read-string "Search folder(s) (default all): "))
+           mh-new-messages-folders)))
   (mh-index-sequenced-messages folders mh-unseen-seq))
 
 ;;;###mh-autoload
 (defun mh-index-ticked-messages (folders)
   "Display ticked messages.
-All messages in `mh-tick-seq' from the folders in
-`mh-index-ticked-messages-folders' are listed. With a prefix argument, enter a
-space-separated list of FOLDERS, or nothing to search all folders."
+
+All messages in `mh-tick-seq' from the folders in `mh-ticked-messages-folders'
+are listed.
+
+With a prefix argument, enter a space-separated list of FOLDERS, or nothing to
+search all folders."
   (interactive
    (list (if current-prefix-arg
-             (split-string (read-string "Search folder(s): [all] "))
-           mh-index-ticked-messages-folders)))
+             (split-string (read-string "Search folder(s) (default all): "))
+           mh-ticked-messages-folders)))
   (mh-index-sequenced-messages folders mh-tick-seq))