* mh-customize.el (mh-insert-signature-hook): Rename

mh-letter-insert-signature-hook to mh-insert-signature-hook.

* mh-comp.el (mh-insert-signature): Ditto.

3 files changed, 23 insertions, 16 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 0311198f033..e88a64f3dc7 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,15 +1,20 @@
 2005-12-04  Bill Wohler  <wohler@newt.com>
 
+        * mh-customize.el (mh-sortm-args): Sync docstrings with manual.
+        (mh-invisible-header-fields-internal): Add X-Bugzilla-* and
+        X-Virus-Scanned.
+        
+        * mh-customize.el (mh-insert-signature-hook): Rename
+        mh-letter-insert-signature-hook to mh-insert-signature-hook.
+
+        * mh-comp.el (mh-insert-signature): Ditto.
+
         * mh-customize.el (mh-fetch-x-image-url): Change default from 'ask
         to nil. Remove t option. Sync docstring with manual (closes SF
         #831278).
         (mh-invisible-header-fields-internal): Remove X-Image-URL so that
         users can see it, look it up in the manual's index, and discover
         mh-fetch-x-image-url (closes SF #831278).
-        (mh-sortm-args): Sync docstrings with manual.
-
-        * mh-customize.el (mh-invisible-header-fields-internal): Add
-        X-Bugzilla-* and X-Virus-Scanned.
 
         * mh-customize.el (mh-new-messages-folders): Rename from
         mh-index-new-messages-folders.
@@ -24,8 +29,8 @@
         "messages in range" and "range of messages" is redundant and just
         "range" can be used in most circumstances. Also ensured that
         mh-interactive-range was mentioned in all interactive functions
-        that use a range which describes the range argument for both
-        users and programmers.
+        that use a range which describes the range argument for both users
+        and programmers.
 
         * mh-e.el (mh-delete-msg-no-motion, mh-refile-msg)
         (mh-refile-or-write-again, mh-rescan-folder, mh-undo)
@@ -44,6 +49,7 @@
         * mh-seq.el (mh-put-msg-in-seq, mh-range-to-msg-list)
         (mh-narrow-to-range, mh-toggle-tick): Ditto.
 
+
 2005-12-01  Bill Wohler  <wohler@newt.com>
 
         Rewrote Reading Mail chapter in manual which affected mh-show
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 4a812d6822c..5cac13d265b 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -1143,7 +1143,7 @@ By default, the text of your signature is taken from the file
 A signature separator (\"-- \") will be added if the signature block does not
 contain one and `mh-signature-separator-flag' is on.
 
-The value of `mh-letter-insert-signature-hook' is a list of functions to be
+The value of `mh-insert-signature-hook' is a list of functions to be
 called, with no arguments, after the signature is inserted. These functions
 may access the actual name of the file or the function used to insert the
 signature with `mh-signature-file-name'.
@@ -1181,7 +1181,7 @@ The signature can also be inserted using Identities (see `mh-identity-list')"
                  (funcall mh-signature-file-name)))))
         (save-restriction
           (widen)
-          (run-hooks 'mh-letter-insert-signature-hook))
+          (run-hooks 'mh-insert-signature-hook))
         (goto-char (point-min))
         (when (and (not (mh-file-is-vcard-p mh-signature-file-name))
                    mh-signature-separator-flag
diff --git a/lisp/mh-e/mh-customize.el b/lisp/mh-e/mh-customize.el
index 780318d9766..2b834c5913e 100644
--- a/lisp/mh-e/mh-customize.el
+++ b/lisp/mh-e/mh-customize.el
@@ -2322,6 +2322,15 @@ current folder, `mh-current-folder'."
   :group 'mh-hooks
   :group 'mh-inc)
 
+(defcustom mh-insert-signature-hook nil
+  "Invoked after signature has been inserted.
+
+These functions may access the actual name of the file or the function used to
+insert the signature with `mh-signature-file-name'."
+  :type 'hook
+  :group 'mh-hooks
+  :group 'mh-letter)
+
 (defcustom mh-kill-folder-suppress-prompt-hook '(mh-index-p)
   "Invoked at the beginning of the  \\<mh-folder-mode-map>`\\[mh-kill-folder]' command.
 This hook is a list of functions to be called, with no arguments, which should
@@ -2339,14 +2348,6 @@ in the +inbox buffer, you will not be happy."
   :group 'mh-hooks
   :group 'mh-folder)
 
-(defcustom mh-letter-insert-signature-hook nil
-  "Invoked after signature has been inserted.
-This hook may access the actual name of the file or the function used to
-insert the signature with `mh-signature-file-name'."
-  :type 'hook
-  :group 'mh-hooks
-  :group 'mh-letter)
-
 (defcustom mh-letter-mode-hook nil
   "Invoked by `mh-letter-mode' on a new letter."
   :type 'hook