Merge from trunk.

[gnu-emacs] / lisp / mh-e / mh-letter.el

diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index 4f3c6fc0d58c8b776dc1cb297544be137032c5de..47554ce66a3bfc1c4fc7356c6ce8a681c2eb2a72 100644 (file)
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -1,6 +1,6 @@
 ;;; mh-letter.el --- MH-Letter mode
 
-;; Copyright (C) 1993, 1995, 1997, 2000-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 1997, 2000-2012  Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -66,8 +66,9 @@ 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
-semi-obsolete and is only used if `mail-citation-hook' is nil.")
+This is a normal hook, misnamed for historical reasons.
+It is obsolete and is only used if `mail-citation-hook' is nil.")
+(make-obsolete-variable 'mh-yank-hooks 'mail-citation-hook "19.34")
 
 \f
 
@@ -911,7 +912,7 @@ Any match found replaces the text from BEGIN to END."
                (with-output-to-temp-buffer completions-buffer
                  (mh-display-completion-list
                   (all-completions word choices)
-                  ;; The `common-subtring' arg only works if it's a prefix.
+                  ;; The `common-substring' arg only works if it's a prefix.
                   (unless (and (functionp choices)
                                (let ((bounds
                                       (funcall choices