[Emacs-diffs] Changes to emacs/lisp/array.el

[Juanma Barranquero]

Index: emacs/lisp/array.el
diff -c emacs/lisp/array.el:1.23 emacs/lisp/array.el:1.24
*** emacs/lisp/array.el:1.23    Mon May 16 11:33:45 2005
--- emacs/lisp/array.el Wed May 18 10:17:18 2005
***************
*** 607,613 ****
    (let ((check t)
        (len))
      (while check
!       (setq array-init-field (read-input "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))
--- 607,613 ----
    (let ((check t)
        (len))
      (while check
!       (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,654 ****
          (setq check nil)
        (setq new-columns-per-line
              (string-to-number
!              (read-input
                (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.
--- 648,654 ----
          (setq check nil)
        (setq new-columns-per-line
              (string-to-number
!              (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,948 ****
  (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: ")))))
  
  (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: ")))))
  
  (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: ")))))
  
  (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: ")))))
  
  (defun array-init-rows-numbered (&optional arg)
    "Initialize the value of `array-rows-numbered'."
--- 927,948 ----
  (defun array-init-max-row (&optional arg)
    "Initialize the value of `array-max-row'."
    (setq array-max-row
!       (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-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-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-string "Field width: ")))))
  
  (defun array-init-rows-numbered (&optional arg)
    "Initialize the value of `array-rows-numbered'."