aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog6
-rw-r--r--src/minibuf.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f66cf95d9d7..2d6ffdef092 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12005-12-06 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * minibuf.c (keys_of_minibuf): Just unbind SPC in
4 Vminibuffer_local_filename_completion_map rather than forcing it
5 explicitly to the same binding as the global map.
6
12005-12-06 Ken Raeburn <raeburn@gnu.org> 72005-12-06 Ken Raeburn <raeburn@gnu.org>
2 8
3 * buffer.c (Fkill_buffer): Avoid dangerous side effects in NILP 9 * buffer.c (Fkill_buffer): Avoid dangerous side effects in NILP
diff --git a/src/minibuf.c b/src/minibuf.c
index 76529bf86e6..8ee1022d9be 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -2926,8 +2926,8 @@ keys_of_minibuf ()
2926 initial_define_key (Vminibuffer_local_completion_map, '?', 2926 initial_define_key (Vminibuffer_local_completion_map, '?',
2927 "minibuffer-completion-help"); 2927 "minibuffer-completion-help");
2928 2928
2929 initial_define_key (Vminibuffer_local_filename_completion_map, ' ', 2929 Fdefine_key (Vminibuffer_local_filename_completion_map,
2930 "self-insert-command"); 2930 build_string (" "), Qnil);
2931 2931
2932 initial_define_key (Vminibuffer_local_must_match_map, Ctl ('m'), 2932 initial_define_key (Vminibuffer_local_must_match_map, Ctl ('m'),
2933 "minibuffer-complete-and-exit"); 2933 "minibuffer-complete-and-exit");