* mh-seq.el (mh-non-seq-mode-line-annotation): Moved

make-variable-buffer-local call to top level to avoid warnings in CVS
Emacs.

* mh-comp.el (mh-insert-letter): Replaced deprecated read-input with
read-string.

3 files changed, 15 insertions, 5 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index ac4e9242729..5c2e2b70654 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-14  Bill Wohler  <wohler@newt.com>
+
+        * mh-seq.el (mh-non-seq-mode-line-annotation): Moved
+        make-variable-buffer-local call to top level to avoid warnings in
+        CVS Emacs.
+
+        * mh-comp.el (mh-insert-letter): Replaced deprecated read-input
+        with read-string.
+
 2005-10-09  Bill Wohler  <wohler@newt.com>
 
         * mh-init.el (mh-image-load-path): New function that adds the path
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index a7af192ec40..7289207cfb2 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -1430,10 +1430,10 @@ not indent and do not delete headers.  Leaves the mark before the letter
 and point after it."
   (interactive
    (list (mh-prompt-for-folder "Message from" mh-sent-from-folder nil)
-         (read-input (concat "Message number"
-                             (if (numberp mh-sent-from-msg)
-                                 (format " (default %d): " mh-sent-from-msg)
-                               ": ")))
+         (read-string (concat "Message number"
+                              (if (numberp mh-sent-from-msg)
+                                  (format " (default %d): " mh-sent-from-msg)
+                                ": ")))
          current-prefix-arg))
   (save-restriction
     (narrow-to-region (point) (point))
diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el
index 51847c2d59d..8459c6fdce6 100644
--- a/lisp/mh-e/mh-seq.el
+++ b/lisp/mh-e/mh-seq.el
@@ -224,6 +224,8 @@ appears."
 ;; Avoid compiler warning
 (defvar tool-bar-map)
 
+(make-variable-buffer-local 'mh-non-seq-mode-line-annotation)
+
 ;;;###mh-autoload
 (defun mh-narrow-to-seq (sequence)
   "Restrict display of this folder to just messages in SEQUENCE.
@@ -243,7 +245,6 @@ Use \\<mh-folder-mode-map>\\[mh-widen] to undo this command."
              (mh-notate-deleted-and-refiled)
              (mh-notate-cur)
              (when msg-at-cursor (mh-goto-msg msg-at-cursor t t))
-             (make-variable-buffer-local 'mh-non-seq-mode-line-annotation)
              (setq mh-non-seq-mode-line-annotation mh-mode-line-annotation)
              (setq mh-mode-line-annotation (symbol-name sequence))
              (mh-make-folder-mode-line)