diff options
| author | Juri Linkov | 2005-12-11 09:50:53 +0000 |
|---|---|---|
| committer | Juri Linkov | 2005-12-11 09:50:53 +0000 |
| commit | 5203cd0380a012c4606dd00e2383333ee14548dc (patch) | |
| tree | 0a16f5a6d3befadb1938f7d1194f4bc842a20972 /src | |
| parent | 06100606c1512e0f1bac929a10af057313b4cfbd (diff) | |
| download | emacs-5203cd0380a012c4606dd00e2383333ee14548dc.tar.gz emacs-5203cd0380a012c4606dd00e2383333ee14548dc.zip | |
(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).
Diffstat (limited to 'src')
| -rw-r--r-- | src/minibuf.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 | |||
| 2563 | display_completion_list_1 (list) | 2563 | display_completion_list_1 (list) |
| 2564 | Lisp_Object list; | 2564 | Lisp_Object list; |
| 2565 | { | 2565 | { |
| 2566 | return Fdisplay_completion_list (list, Qnil); | 2566 | return Fdisplay_completion_list (list, minibuffer_completion_contents ()); |
| 2567 | } | 2567 | } |
| 2568 | 2568 | ||
| 2569 | DEFUN ("minibuffer-completion-help", Fminibuffer_completion_help, Sminibuffer_completion_help, | 2569 | DEFUN ("minibuffer-completion-help", Fminibuffer_completion_help, Sminibuffer_completion_help, |
| @@ -2934,8 +2934,8 @@ keys_of_minibuf () | |||
| 2934 | initial_define_key (Vminibuffer_local_must_match_map, Ctl ('j'), | 2934 | initial_define_key (Vminibuffer_local_must_match_map, Ctl ('j'), |
| 2935 | "minibuffer-complete-and-exit"); | 2935 | "minibuffer-complete-and-exit"); |
| 2936 | 2936 | ||
| 2937 | initial_define_key (Vminibuffer_local_must_match_filename_map, ' ', | 2937 | Fdefine_key (Vminibuffer_local_must_match_filename_map, |
| 2938 | "self-insert-command"); | 2938 | build_string (" "), Qnil); |
| 2939 | } | 2939 | } |
| 2940 | 2940 | ||
| 2941 | /* arch-tag: 8f69b601-fba3-484c-a6dd-ceaee54a7a73 | 2941 | /* arch-tag: 8f69b601-fba3-484c-a6dd-ceaee54a7a73 |