# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1116411438 0
# Node ID 2c228409c44d3d5b6cdd6ccf20f9712ed45954b3
# Parent  4e1114c6964285bae842ae0d98713ef61e9f38ca
Replace `read-input' by `read-string'.

diff -r 4e1114c69642 -r 2c228409c44d lisp/add-log.el
--- a/lisp/add-log.el	Wed May 18 09:48:34 2005 +0000
+++ b/lisp/add-log.el	Wed May 18 10:17:18 2005 +0000
@@ -492,13 +492,13 @@
 
     (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 -r 4e1114c69642 -r 2c228409c44d lisp/array.el
--- a/lisp/array.el	Wed May 18 09:48:34 2005 +0000
+++ b/lisp/array.el	Wed May 18 10:17:18 2005 +0000
@@ -607,7 +607,7 @@
   (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 @@
 	  (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 @@
 (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 -r 4e1114c69642 -r 2c228409c44d lisp/replace.el
--- a/lisp/replace.el	Wed May 18 09:48:34 2005 +0000
+++ b/lisp/replace.el	Wed May 18 10:17:18 2005 +0000
@@ -1288,14 +1288,14 @@
     (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 @@
 						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 -r 4e1114c69642 -r 2c228409c44d lisp/textmodes/spell.el
--- a/lisp/textmodes/spell.el	Wed May 18 09:48:34 2005 +0000
+++ b/lisp/textmodes/spell.el	Wed May 18 10:17:18 2005 +0000
@@ -128,9 +128,9 @@
 	 (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