diff options
| author | Kim F. Storm | 2005-10-20 15:03:32 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2005-10-20 15:03:32 +0000 |
| commit | d6ae289cf04522aad21432be9180027aaafee434 (patch) | |
| tree | 740d082e6bb5328d50966fd45555fb3c484e366d /src | |
| parent | d9cdfe9a72b09a29b1095bce375edb2061e01183 (diff) | |
| download | emacs-d6ae289cf04522aad21432be9180027aaafee434.tar.gz emacs-d6ae289cf04522aad21432be9180027aaafee434.zip | |
(display_completion_list_1): New wrapper function
for Fdisplay_completion_list.
(Fminibuffer_completion_help): Use it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/minibuf.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index 833f72c0500..045223948c6 100644 --- a/src/minibuf.c +++ b/src/minibuf.c | |||
| @@ -2361,14 +2361,14 @@ alternative, the second serves as annotation. | |||
| 2361 | The actual completion alternatives, as inserted, are given `mouse-face' | 2361 | The actual completion alternatives, as inserted, are given `mouse-face' |
| 2362 | properties of `highlight'. | 2362 | properties of `highlight'. |
| 2363 | At the end, this runs the normal hook `completion-setup-hook'. | 2363 | At the end, this runs the normal hook `completion-setup-hook'. |
| 2364 | It can find the completion buffer in `standard-output'. | 2364 | It can find the completion buffer in `standard-output'. |
| 2365 | The optional second arg COMMON-SUBSTRING is a string. | 2365 | The optional second arg COMMON-SUBSTRING is a string. |
| 2366 | It is used to put faces, `completions-first-difference` and | 2366 | It is used to put faces, `completions-first-difference` and |
| 2367 | `completions-common-part' on the completion buffer. The | 2367 | `completions-common-part' on the completion buffer. The |
| 2368 | `completions-common-part' face is put on the common substring | 2368 | `completions-common-part' face is put on the common substring |
| 2369 | specified by COMMON-SUBSTRING. If COMMON-SUBSTRING is nil, | 2369 | specified by COMMON-SUBSTRING. If COMMON-SUBSTRING is nil, |
| 2370 | the faces are not put. | 2370 | the faces are not put. |
| 2371 | Internally, COMMON-SUBSTRING is bound to `completion-common-substring' | 2371 | Internally, COMMON-SUBSTRING is bound to `completion-common-substring' |
| 2372 | during running `completion-setup-hook'. */) | 2372 | during running `completion-setup-hook'. */) |
| 2373 | (completions, common_substring) | 2373 | (completions, common_substring) |
| 2374 | Lisp_Object completions; | 2374 | Lisp_Object completions; |
| @@ -2544,7 +2544,7 @@ during running `completion-setup-hook'. */) | |||
| 2544 | 2544 | ||
| 2545 | specbind (intern ("completion-common-substring"), common_substring); | 2545 | specbind (intern ("completion-common-substring"), common_substring); |
| 2546 | call1 (Vrun_hooks, intern ("completion-setup-hook")); | 2546 | call1 (Vrun_hooks, intern ("completion-setup-hook")); |
| 2547 | 2547 | ||
| 2548 | unbind_to (count1, Qnil); | 2548 | unbind_to (count1, Qnil); |
| 2549 | } | 2549 | } |
| 2550 | 2550 | ||
| @@ -2553,6 +2553,14 @@ during running `completion-setup-hook'. */) | |||
| 2553 | return Qnil; | 2553 | return Qnil; |
| 2554 | } | 2554 | } |
| 2555 | 2555 | ||
| 2556 | |||
| 2557 | static Lisp_Object | ||
| 2558 | display_completion_list_1 (list) | ||
| 2559 | Lisp_Object list; | ||
| 2560 | { | ||
| 2561 | return Fdisplay_completion_list (list, Qnil); | ||
| 2562 | } | ||
| 2563 | |||
| 2556 | DEFUN ("minibuffer-completion-help", Fminibuffer_completion_help, Sminibuffer_completion_help, | 2564 | DEFUN ("minibuffer-completion-help", Fminibuffer_completion_help, Sminibuffer_completion_help, |
| 2557 | 0, 0, "", | 2565 | 0, 0, "", |
| 2558 | doc: /* Display a list of possible completions of the current minibuffer contents. */) | 2566 | doc: /* Display a list of possible completions of the current minibuffer contents. */) |
| @@ -2574,7 +2582,7 @@ DEFUN ("minibuffer-completion-help", Fminibuffer_completion_help, Sminibuffer_co | |||
| 2574 | } | 2582 | } |
| 2575 | else | 2583 | else |
| 2576 | internal_with_output_to_temp_buffer ("*Completions*", | 2584 | internal_with_output_to_temp_buffer ("*Completions*", |
| 2577 | Fdisplay_completion_list, | 2585 | display_completion_list_1, |
| 2578 | Fsort (completions, Qstring_lessp)); | 2586 | Fsort (completions, Qstring_lessp)); |
| 2579 | return Qnil; | 2587 | return Qnil; |
| 2580 | } | 2588 | } |