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

[Richard M. Stallman]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.572 emacs/lisp/simple.el:1.573
*** emacs/lisp/simple.el:1.572  Fri Sep 13 10:21:45 2002
--- emacs/lisp/simple.el        Tue Sep 24 14:39:48 2002
***************
*** 650,663 ****
    "Prompting with PROMPT, let user edit COMMAND and eval result.
  COMMAND is a Lisp expression.  Let user edit that expression in
  the minibuffer, then read and evaluate the result."
!   (let ((command (read-from-minibuffer prompt
!                                      (prin1-to-string command)
!                                      read-expression-map t
!                                      '(command-history . 1))))
!     ;; If command was added to command-history as a string,
!     ;; get rid of that.  We want only evaluable expressions there.
!     (if (stringp (car command-history))
!       (setq command-history (cdr command-history)))
  
      ;; If command to be redone does not match front of history,
      ;; add it to the history.
--- 650,665 ----
    "Prompting with PROMPT, let user edit COMMAND and eval result.
  COMMAND is a Lisp expression.  Let user edit that expression in
  the minibuffer, then read and evaluate the result."
!   (let ((command
!        (unwind-protect
!            (read-from-minibuffer prompt
!                                  (prin1-to-string command)
!                                  read-expression-map t
!                                  '(command-history . 1))
!          ;; If command was added to command-history as a string,
!          ;; get rid of that.  We want only evaluable expressions there.
!          (if (stringp (car command-history))
!              (setq command-history (cdr command-history))))))
  
      ;; If command to be redone does not match front of history,
      ;; add it to the history.
***************
*** 683,696 ****
                (let ((print-level nil)
                      (minibuffer-history-position arg)
                      (minibuffer-history-sexp-flag (1+ (minibuffer-depth))))
!                 (read-from-minibuffer
!                  "Redo: " (prin1-to-string elt) read-expression-map t
!                  (cons 'command-history arg))))
  
!         ;; If command was added to command-history as a string,
!         ;; get rid of that.  We want only evaluable expressions there.
!         (if (stringp (car command-history))
!             (setq command-history (cdr command-history)))
  
          ;; If command to be redone does not match front of history,
          ;; add it to the history.
--- 685,700 ----
                (let ((print-level nil)
                      (minibuffer-history-position arg)
                      (minibuffer-history-sexp-flag (1+ (minibuffer-depth))))
!                 (unwind-protect
!                     (read-from-minibuffer
!                      "Redo: " (prin1-to-string elt) read-expression-map t
!                      (cons 'command-history arg))
  
!                   ;; If command was added to command-history as a
!                   ;; string, get rid of that.  We want only
!                   ;; evaluable expressions there.
!                   (if (stringp (car command-history))
!                       (setq command-history (cdr command-history))))))
  
          ;; If command to be redone does not match front of history,
          ;; add it to the history.