(Fread_from_minibuffer): Remove extra get_keymap argument.

(Fminibuffer_complete): Convert Fset_window_start argument to Lisp_Integer.

diff --git a/src/minibuf.c b/src/minibuf.c
index 4a2c805f1706f41e06fea813507e96dc562f65e3..31efe44c3a545ca42df57024b5e72804ef07ef51 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -615,7 +615,7 @@ DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1,
   if (NILP (keymap))
     keymap = Vminibuffer_local_map;
   else
-    keymap = get_keymap (keymap,2);
+    keymap = get_keymap (keymap);
 
   if (SYMBOLP (hist))
     {
@@ -1373,7 +1373,7 @@ scroll the window of possible completions.")
       tem = Fpos_visible_in_window_p (make_number (ZV), window);
       if (! NILP (tem))
        /* If end is in view, scroll up to the beginning.  */
-       Fset_window_start (window, BEGV, Qnil);
+       Fset_window_start (window, make_number (BEGV), Qnil);
       else
        /* Else scroll down one screen.  */
        Fscroll_other_window (Qnil);