summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2013-08-25 14:25:59 -0600
committerTom Tromey <tromey@redhat.com>2013-08-25 14:25:59 -0600
commit793ea5055aea85ff9227e1bf0c84ab37edba7201 (patch)
treec9799eebe2b797a55fcbfcbd3710c9b5aa70051d /lisp/emacs-lisp
parent1ce4c6398ea453a66f6943552b0ec866a690e9b1 (diff)
parente687aa335a21662f67d2d73063272504a171ffab (diff)
downloademacs-793ea5055aea85ff9227e1bf0c84ab37edba7201.tar.gz
emacs-793ea5055aea85ff9227e1bf0c84ab37edba7201.tar.bz2
emacs-793ea5055aea85ff9227e1bf0c84ab37edba7201.zip
merge from trunk
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/pp.el6
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index b7e553272f2..4cb089aca97 100644
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -127,8 +127,7 @@ after OUT-BUFFER-NAME."
"Evaluate EXPRESSION and pretty-print its value.
Also add the value to the front of the list in the variable `values'."
(interactive
- (list (read-from-minibuffer "Eval: " nil read-expression-map t
- 'read-expression-history)))
+ (list (read--expression "Eval: ")))
(message "Evaluating...")
(setq values (cons (eval expression) values))
(pp-display-expression (car values) "*Pp Eval Output*"))
@@ -137,8 +136,7 @@ Also add the value to the front of the list in the variable `values'."
(defun pp-macroexpand-expression (expression)
"Macroexpand EXPRESSION and pretty-print its value."
(interactive
- (list (read-from-minibuffer "Macroexpand: " nil read-expression-map t
- 'read-expression-history)))
+ (list (read--expression "Macroexpand: ")))
(pp-display-expression (macroexpand expression) "*Pp Macroexpand Output*"))
(defun pp-last-sexp ()