merge from trunk

2 files changed, 9 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9050178b706..d8bae263da2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,15 @@
+2013-08-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/pp.el (pp-eval-expression, pp-macroexpand-expression):
+        Use read--expression so that completion works again.
+
 2013-08-21  Sam Steingold  <sds@gnu.org>
 
         Add rudimentary inferior shell interaction
         * progmodes/sh-script.el (sh-shell-process): New buffer-local variable.
         (sh-set-shell): Reset it.
-        (sh-show-shell, sh-cd-here, sh-send-line-or-region-and-step): New
-        commands (bound to C-c C-z, C-c C-d, and C-c C-n).
+        (sh-show-shell, sh-cd-here, sh-send-line-or-region-and-step):
+        New commands (bound to C-c C-z, C-c C-d, and C-c C-n).
 
 2013-08-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
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 ()