Replace `read-input' by `read-string'.

diff --git a/lisp/add-log.el b/lisp/add-log.el
index 7c5f846..6dcbfca 100644 (file)
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -492,13 +492,13 @@ non-nil, otherwise in local time."
 
     (if whoami
        (progn
-         (setq full-name (read-input "Full name: " full-name))
+         (setq full-name (read-string "Full name: " full-name))
          ;; Note that some sites have room and phone number fields in
          ;; full name which look silly when inserted.  Rather than do
          ;; anything about that here, let user give prefix argument so that
          ;; s/he can edit the full name field in prompter if s/he wants.
          (setq mailing-address
-               (read-input "Mailing address: " mailing-address))))
+               (read-string "Mailing address: " mailing-address))))
 
     (unless (equal file-name buffer-file-name)
       (if (or other-window (window-dedicated-p (selected-window)))

diff --git a/lisp/array.el b/lisp/array.el
index 56ef9b2..f65f14a 100644 (file)
--- a/lisp/array.el
+++ b/lisp/array.el
@@ -607,7 +607,7 @@ If optional ARG is given, copy through ARG rows up."
   (let ((check t)
        (len))
     (while check
-      (setq array-init-field (read-input "Initial field value: "))
+      (setq array-init-field (read-string "Initial field value: "))
       (setq len (length array-init-field))
       (if (/= len array-field-width)
          (if (y-or-n-p (format "Change field width to %d? " len))
@@ -648,7 +648,7 @@ of array-rows-numbered."
          (setq check nil)
        (setq new-columns-per-line
              (string-to-number
-              (read-input
+              (read-string
                (format "Columns per line (1 - %d): " array-max-column)))))))
   ;; Check on new-rows-numbered.  It has to be done this way
   ;;  because interactive does not have y-or-n-p.
@@ -927,22 +927,22 @@ Entering array mode calls the function `array-mode-hook'."
 (defun array-init-max-row (&optional arg)
   "Initialize the value of `array-max-row'."
   (setq array-max-row
-       (or arg (string-to-number (read-input "Number of array rows: ")))))
+       (or arg (string-to-number (read-string "Number of array rows: ")))))
 
 (defun array-init-max-column (&optional arg)
   "Initialize the value of `array-max-column'."
   (setq array-max-column
-       (or arg (string-to-number (read-input "Number of array columns: ")))))
+       (or arg (string-to-number (read-string "Number of array columns: ")))))
 
 (defun array-init-columns-per-line (&optional arg)
   "Initialize the value of `array-columns-per-line'."
   (setq array-columns-per-line
-       (or arg (string-to-number (read-input "Array columns per line: ")))))
+       (or arg (string-to-number (read-string "Array columns per line: ")))))
 
 (defun array-init-field-width (&optional arg)
   "Initialize the value of `array-field-width'."
   (setq array-field-width
-       (or arg (string-to-number (read-input "Field width: ")))))
+       (or arg (string-to-number (read-string "Field width: ")))))
 
 (defun array-init-rows-numbered (&optional arg)
   "Initialize the value of `array-rows-numbered'."

diff --git a/lisp/replace.el b/lisp/replace.el
index 1cef7ec..c9c70b5 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1288,14 +1288,14 @@ passed in.  If LITERAL is set, no checking is done, anyway."
     (while (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\\\?\\)"
                         newtext)
       (setq newtext
-           (read-input "Edit replacement string: "
-                       (prog1
-                           (cons
-                            (replace-match "" t t newtext 3)
-                            (1+ (match-beginning 3)))
-                         (setq match-data
-                               (replace-match-data
-                                nil match-data match-data))))
+           (read-string "Edit replacement string: "
+                         (prog1
+                             (cons
+                              (replace-match "" t t newtext 3)
+                              (1+ (match-beginning 3)))
+                           (setq match-data
+                                 (replace-match-data
+                                  nil match-data match-data))))
            noedit nil)))
   (set-match-data match-data)
   (replace-match newtext fixedcase literal)
@@ -1571,8 +1571,8 @@ make, or the user didn't cancel the call."
                                                nil real-match-data
                                                real-match-data)
                               next-replacement
-                              (read-input "Edit replacement string: "
-                                          next-replacement)
+                              (read-string "Edit replacement string: "
+                                            next-replacement)
                               noedit nil)
                         (if replaced
                             (set-match-data real-match-data)

diff --git a/lisp/textmodes/spell.el b/lisp/textmodes/spell.el
index c628981..6afaae8 100644 (file)
--- a/lisp/textmodes/spell.el
+++ b/lisp/textmodes/spell.el
@@ -128,9 +128,9 @@ for example, \"word\"."
         (forward-char 1)
         (delete-region (point-min) (point))
         (setq newword
-              (read-input (concat "`" word
-                                  "' not recognized; edit a replacement: ")
-                          word))
+              (read-string (concat "`" word
+                                    "' not recognized; edit a replacement: ")
+                            word))
         (flush-lines (concat "^" (regexp-quote word) "$")))
        (if (not (equal word newword))
            (progn