(Fcompleting_read): If Vminibuffer_completing_file_name is

non-nil, use the new keymaps Vminibuffer_local_filename_completion_map
and Vminibuffer_local_must_match_filename_map keymaps.
(keys_of_minibuf): Bind SPC in the new file-name completion keymaps.

1 files changed, 12 insertions, 2 deletions

diff --git a/src/minibuf.c b/src/minibuf.c
index 00354df3dc9..e7df7bd0153 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1747,8 +1747,12 @@ Completion ignores case if the ambient value of
     XSETFASTINT (histpos, 0);
 
   val = read_minibuf (NILP (require_match)
-                      ? Vminibuffer_local_completion_map
-                      : Vminibuffer_local_must_match_map,
+                      ? (NILP (Vminibuffer_completing_file_name)
+                         ? Vminibuffer_local_completion_map
+                         : Vminibuffer_local_filename_completion_map)
+                      : (NILP (Vminibuffer_completing_file_name)
+                         ? Vminibuffer_local_must_match_map
+                         : Vminibuffer_local_must_match_filename_map),
                       init, prompt, make_number (pos), 0,
                       histvar, histpos, def, 0,
                       !NILP (inherit_input_method), 0);
@@ -2921,10 +2925,16 @@ keys_of_minibuf ()
   initial_define_key (Vminibuffer_local_completion_map, '?',
                       "minibuffer-completion-help");
 
+  initial_define_key (Vminibuffer_local_filename_completion_map, ' ',
+                      "self-insert-command");
+
   initial_define_key (Vminibuffer_local_must_match_map, Ctl ('m'),
                       "minibuffer-complete-and-exit");
   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");
 }
 
 /* arch-tag: 8f69b601-fba3-484c-a6dd-ceaee54a7a73