* lisp/simple.el (read-expression-map): Use completion-at-point.

Move the declaration from C.
(read-minibuffer, eval-minibuffer): Move from C.
(completion-setup-function): Avoid minibuffer-completion-contents.
* src/minibuf.c (Fread_minibuffer, Feval_minibuffer): Move to Elisp.
(syms_of_minibuf): Adjust accodingly.
* src/lread.c (Fread):
* src/callint.c (Fcall_interactively): Adjust calls accordingly.

Fixes: debbugs:14255

1 files changed, 9 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 325babb4d86..86327fc7fb2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,15 @@
+2013-05-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuf.c (Fread_minibuffer, Feval_minibuffer): Move to Elisp.
+        (syms_of_minibuf): Adjust accodingly.
+        * lread.c (Fread):
+        * callint.c (Fcall_interactively): Adjust calls accordingly.
+
 2013-05-04  Eli Zaretskii  <eliz@gnu.org>
 
         * dispextern.h (WINDOW_WANTS_HEADER_LINE_P): Verify that
-        w->contents is a buffer before computing everything else.  Use
-        parentheses to disambiguate last part of the condition.
+        w->contents is a buffer before computing everything else.
+        Use parentheses to disambiguate last part of the condition.
 
         * w32fns.c (w32_wnd_proc): Remove temporary code used to trap
         assertion violations.  (Bug#14062)