Remove *-yank-hooks aliases for -citation-hook, obsolete since 19.34.

* lisp/simple.el (compose-mail): Use `mail-citation-hook'
instead of `mail-yank-hooks'.
* lisp/mail/sendmail.el (mail-yank-hooks): Remove.
(mail-yank-original, mail-yank-region): Drop `mail-yank-hooks'.
* lisp/mh-e/mh-letter.el (mh-yank-hooks): Remove.
(mh-insert-prefix-string): Drop `mh-yank-hooks'.

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 3e22fd84117ffba7581984de07f64ed337a7a0fa..cd8021152760a543abd14749433bbf55fe72ab43 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -243,15 +243,6 @@ Used by `mail-yank-original' via `mail-indent-citation'."
   :type 'integer
   :group 'sendmail)
 
-(defvar mail-yank-hooks nil
-  "Obsolete hook for modifying a citation just inserted in the mail buffer.
-Each hook function can find the citation between (point) and (mark t).
-And each hook function should leave point and mark around the citation
-text as modified.
-This is a normal hook, misnamed for historical reasons.
-It is obsolete and mail agents should no longer use it.")
-(make-obsolete-variable 'mail-yank-hooks 'mail-citation-hook "19.34")
-
 ;;;###autoload
 (defcustom mail-citation-hook nil
   "Hook for modifying a citation just inserted in the mail buffer.
@@ -1718,8 +1709,6 @@ and don't delete any header fields."
                               (rfc822-goto-eoh)
                               (point))))))
                     (run-hooks 'mail-citation-hook)))
-                 (mail-yank-hooks
-                  (run-hooks 'mail-yank-hooks))
                  (t
                   (mail-indent-citation)))))
        ;; This is like exchange-point-and-mark, but doesn't activate the mark.
@@ -1788,9 +1777,7 @@ and don't delete any header fields."
                             (rfc822-goto-eoh)
                             (point))))))
                   (run-hooks 'mail-citation-hook))
-              (if mail-yank-hooks
-                  (run-hooks 'mail-yank-hooks)
-                (mail-indent-citation))))))))
+              (mail-indent-citation)))))))
 
 (defun mail-split-line ()
   "Split current line, moving portion beyond point vertically down.

diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index 28c18e4dd2f487a92394c81cab1a48733cee4037..871ba49522acc4935fe0b6456d6e914e70769e81 100644 (file)
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -60,17 +60,6 @@
     (to . mh-alias-letter-expand-alias))
   "Alist of header fields and completion functions to use.")
 
-(defvar mh-yank-hooks nil
-  "Obsolete hook for modifying a citation just inserted in the mail buffer.
-
-Each hook function can find the citation between point and mark.
-And each hook function should leave point and mark around the
-citation text as modified.
-
-This is a normal hook, misnamed for historical reasons.
-It is obsolete and is only used if `mail-citation-hook' is nil.")
-(mh-make-obsolete-variable 'mh-yank-hooks 'mail-citation-hook "19.34")
-
 \f
 
 ;;; Letter Menu
@@ -972,8 +961,6 @@ Otherwise, simply insert MH-INS-STRING before each line."
          (sc-cite-original))
         (mail-citation-hook
          (run-hooks 'mail-citation-hook))
-        (mh-yank-hooks                  ;old hook name
-         (run-hooks 'mh-yank-hooks))
         (t
          (or (bolp) (forward-line 1))
          (while (< (point) (point-max))

diff --git a/lisp/simple.el b/lisp/simple.el
index 22a8e25bc79b47979ff2d59fbe882bfb3c20704d..fde6669df1020e641c792b5e66e0843d5499f8ae 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -7855,7 +7855,7 @@ buffer buried."
        (eq mail-user-agent 'message-user-agent)
        (let (warn-vars)
         (dolist (var '(mail-mode-hook mail-send-hook mail-setup-hook
-                       mail-yank-hooks mail-archive-file-name
+                       mail-citation-hook mail-archive-file-name
                        mail-default-reply-to mail-mailing-lists
                        mail-self-blind))
           (and (boundp var)