Merge branch 'master' into fix/bug-20871

1 files changed, 2 insertions, 15 deletions

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 12d69aa23c3..cd802115276 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -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.