* 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

4 files changed, 14 insertions, 39 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)
diff --git a/src/callint.c b/src/callint.c
index 940ff3ed249..389f9410625 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -733,12 +733,12 @@ invoke it.  If KEYS is omitted or nil, the return value of
           break;
 
         case 'x':               /* Lisp expression read but not evaluated.  */
-          args[i] = Fread_minibuffer (callint_message, Qnil);
+          args[i] = call1 (intern ("read-minibuffer"), callint_message);
           visargs[i] = last_minibuf_string;
           break;
 
         case 'X':               /* Lisp expression read and evaluated.  */
-          args[i] = Feval_minibuffer (callint_message, Qnil);
+          args[i] = call1 (intern ("eval-minibuffer"), callint_message);
           visargs[i] = last_minibuf_string;
           break;
 
diff --git a/src/lread.c b/src/lread.c
index 8e623e838c7..1a8a57e57a7 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1976,7 +1976,9 @@ STREAM or the value of `standard-input' may be:
   if (EQ (stream, Qt))
     stream = Qread_char;
   if (EQ (stream, Qread_char))
-    return Fread_minibuffer (build_string ("Lisp expression: "), Qnil);
+    /* FIXME: ¿¡ When is this used !?  */
+    return call1 (intern ("read-minibuffer"),
+                  build_string ("Lisp expression: "));
 
   return read_internal_start (stream, Qnil, Qnil);
 }
diff --git a/src/minibuf.c b/src/minibuf.c
index b96d27e0742..b69a16eff42 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -986,34 +986,6 @@ and some related functions, which use zero-indexing for POSITION.  */)
   return val;
 }
 
-DEFUN ("read-minibuffer", Fread_minibuffer, Sread_minibuffer, 1, 2, 0,
-       doc: /* Return a Lisp object read using the minibuffer, unevaluated.
-Prompt with PROMPT.  If non-nil, optional second arg INITIAL-CONTENTS
-is a string to insert in the minibuffer before reading.
-\(INITIAL-CONTENTS can also be a cons of a string and an integer.
-Such arguments are used as in `read-from-minibuffer'.)  */)
-  (Lisp_Object prompt, Lisp_Object initial_contents)
-{
-  CHECK_STRING (prompt);
-  return read_minibuf (Vminibuffer_local_map, initial_contents,
-                       prompt, 1, Qminibuffer_history,
-                       make_number (0), Qnil, 0, 0);
-}
-
-DEFUN ("eval-minibuffer", Feval_minibuffer, Seval_minibuffer, 1, 2, 0,
-       doc: /* Return value of Lisp expression read using the minibuffer.
-Prompt with PROMPT.  If non-nil, optional second arg INITIAL-CONTENTS
-is a string to insert in the minibuffer before reading.
-\(INITIAL-CONTENTS can also be a cons of a string and an integer.
-Such arguments are used as in `read-from-minibuffer'.)  */)
-  (Lisp_Object prompt, Lisp_Object initial_contents)
-{
-  return Feval (read_minibuf (Vread_expression_map, initial_contents,
-                              prompt, 1, Qread_expression_history,
-                              make_number (0), Qnil, 0, 0),
-                Qnil);
-}
-
 /* Functions that use the minibuffer to read various things.  */
 
 DEFUN ("read-string", Fread_string, Sread_string, 1, 5, 0,
@@ -2137,15 +2109,9 @@ properties.  */);
   Vminibuffer_prompt_properties
     = Fcons (intern_c_string ("read-only"), Fcons (Qt, Qnil));
 
-  DEFVAR_LISP ("read-expression-map", Vread_expression_map,
-               doc: /* Minibuffer keymap used for reading Lisp expressions.  */);
-  Vread_expression_map = Qnil;
-
   defsubr (&Sactive_minibuffer_window);
   defsubr (&Sset_minibuffer_window);
   defsubr (&Sread_from_minibuffer);
-  defsubr (&Seval_minibuffer);
-  defsubr (&Sread_minibuffer);
   defsubr (&Sread_string);
   defsubr (&Sread_command);
   defsubr (&Sread_variable);