From: Juri Linkov <juri@jurta.org>
Date: Sun, 11 Dec 2005 09:50:53 +0000 (+0000)
Subject: (display_completion_list_1): Call `minibuffer_completion_contents'
X-Git-Tag: emacs-pretest-22.0.90~5346
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5203cd0380a012c4606dd00e2383333ee14548dc;p=emacs.git

(display_completion_list_1): Call `minibuffer_completion_contents'
instead of using `nil' as second arg of `Fdisplay_completion_list'.
(keys_of_minibuf): Unbind SPC in Vminibuffer_local_filename_completion_map
(see also related change on 2005-12-06).
---

diff --git a/src/minibuf.c b/src/minibuf.c
index 8ee1022d9be..48e15c11fa8 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -2563,7 +2563,7 @@ static Lisp_Object
 display_completion_list_1 (list)
      Lisp_Object list;
 {
-  return Fdisplay_completion_list (list, Qnil);
+  return Fdisplay_completion_list (list, minibuffer_completion_contents ());
 }
 
 DEFUN ("minibuffer-completion-help", Fminibuffer_completion_help, Sminibuffer_completion_help,
@@ -2934,8 +2934,8 @@ keys_of_minibuf ()
   initial_define_key (Vminibuffer_local_must_match_map, Ctl ('j'),
 		      "minibuffer-complete-and-exit");
 
-  initial_define_key (Vminibuffer_local_must_match_filename_map, ' ',
-		      "self-insert-command");
+  Fdefine_key (Vminibuffer_local_must_match_filename_map,
+	       build_string (" "), Qnil);
 }
 
 /* arch-tag: 8f69b601-fba3-484c-a6dd-ceaee54a7a73