aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1993-11-19 17:43:24 +0000
committerRichard M. Stallman1993-11-19 17:43:24 +0000
commitb387ef9a4fb0451325564ea74dc64186bd12d995 (patch)
tree29c224c0bcf8f1876bf06e5e3972d987b6ebc90a
parent7ce370e11ffa9d1c7355b2bb162e0900f46b921e (diff)
downloademacs-b387ef9a4fb0451325564ea74dc64186bd12d995.tar.gz
emacs-b387ef9a4fb0451325564ea74dc64186bd12d995.zip
(eval-expression): Don't bind minibuffer-history-sexp-flag.
(edit-and-eval-command): Likewise.
-rw-r--r--lisp/simple.el16
1 files changed, 7 insertions, 9 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index 776e9cb7d45..2cb169e6f18 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -383,10 +383,9 @@ Other major modes are defined by comparison with this one."
383 "Evaluate EXPRESSION and print value in minibuffer. 383 "Evaluate EXPRESSION and print value in minibuffer.
384Value is also consed on to front of the variable `values'." 384Value is also consed on to front of the variable `values'."
385 (interactive 385 (interactive
386 (let* ((minibuffer-history-sexp-flag t)) 386 (list (read-from-minibuffer "Eval: "
387 (list (read-from-minibuffer "Eval: " 387 nil read-expression-map t
388 nil read-expression-map t 388 'read-expression-history)))
389 'read-expression-history))))
390 (setq values (cons (eval expression) values)) 389 (setq values (cons (eval expression) values))
391 (prin1 (car values) t)) 390 (prin1 (car values) t))
392 391
@@ -394,11 +393,10 @@ Value is also consed on to front of the variable `values'."
394 "Prompting with PROMPT, let user edit COMMAND and eval result. 393 "Prompting with PROMPT, let user edit COMMAND and eval result.
395COMMAND is a Lisp expression. Let user edit that expression in 394COMMAND is a Lisp expression. Let user edit that expression in
396the minibuffer, then read and evaluate the result." 395the minibuffer, then read and evaluate the result."
397 (let* ((minibuffer-history-sexp-flag t) 396 (let ((command (read-from-minibuffer prompt
398 (command (read-from-minibuffer prompt 397 (prin1-to-string command)
399 (prin1-to-string command) 398 read-expression-map t
400 read-expression-map t 399 '(command-history . 1))))
401 '(command-history . 1))))
402 (eval command))) 400 (eval command)))
403 401
404(defun repeat-complex-command (arg) 402(defun repeat-complex-command (arg)