(mh-variant, mh-default-folder-for-message-function): Sync docstring

with manual.
(cus-face): Require as it is needed by mh-inherit-face-flag.

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 94e96e66d83f39d47013f2918355123cd0f2666e..bf45042ecf29d7ec98d6f0ed2ce2b779b604724b 100644 (file)
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,5 +1,8 @@
 2006-02-27  Bill Wohler  <wohler@newt.com>
 
+       * mh-e.el (mh-default-folder-for-message-function): Sync docstring
+       with manual.
+
        * mh-mime.el (mh-minibuffer-read-type): Deleted comment in
        docstring about obsolete variable mh-mime-content-types.
 

diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index bfcc2b316567141daa338740159c8c74a81b6f5d..fa4df0873b138dd3f7411f0de99913dd301a63b4 100644 (file)
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -864,14 +864,18 @@ The default setting of this option is \"Auto-detect\" which means
 that MH-E will automatically choose the first of nmh, MH, or GNU
 mailutils that it finds in the directories listed in
 `mh-path' (which you can customize), `mh-sys-path', and
-`exec-path'. If, for example, you have both nmh and mailutils
-installed and `mh-variant-in-use' was initialized to nmh but you
-want to use mailutils, then you can set this option to
-\"mailutils\".
+`exec-path'. If MH-E can't find MH at all, you may have to
+customize `mh-path' and add the directory in which the command
+\"mhparam\" is located. If, on the other hand, you have both nmh
+and mailutils installed (for example) and `mh-variant-in-use' was
+initialized to nmh but you want to use mailutils, then you can
+set this option to \"mailutils\".
 
 When this variable is changed, MH-E resets `mh-progs', `mh-lib',
 `mh-lib-progs', `mh-flists-present-flag', and `mh-variant-in-use'
-accordingly."
+accordingly. Prior to version 8, it was often necessary to set
+some of these variables in \"~/.emacs\"; now it is no longer
+necessary and can actually cause problems."
   :type `(radio
           (const :tag "Auto-detect" autodetect)
           ,@(mapcar (lambda (x) `(const ,(car x))) (mh-variants)))
@@ -1236,11 +1240,11 @@ an alternate view. For example, \"'(\"-nolimit\" \"-textfield\"
 (defcustom mh-default-folder-for-message-function nil
   "Function to select a default folder for refiling or \"Fcc:\".
 
-The current buffer is set to the message being refiled with point
-at the start of the message. This function should return the
-default folder as a string with a leading \"+\" sign. It can also
-return nil so that the last folder name is used as the default,
-or an empty string to suppress the default entirely."
+When this function is called, the current buffer contains the message
+being refiled and point is at the start of the message. This function
+should return the default folder as a string with a leading \"+\"
+sign. It can also return nil so that the last folder name is used as
+the default, or an empty string to suppress the default entirely."
   :type 'function
   :group 'mh-folder-selection)
 
@@ -2989,6 +2993,8 @@ colors."
                 (setq new-spec (cons entry new-spec)))))
       new-spec)))
 
+(require 'cus-face)
+
 (defvar mh-inherit-face-flag (assq :inherit custom-face-attributes)
   "Non-nil means that the `defface' :inherit keyword is available.
 The :inherit keyword is available on all supported versions of