Mercurial > emacs
annotate src/minibuf.c @ 6668:5ab295d49e7f
(generate-calendar-month): Add mouse-face properties.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Mon, 04 Apr 1994 22:59:59 +0000 |
parents | 2c66255e9469 |
children | 2efd8c4eb9be |
rev | line source |
---|---|
284 | 1 /* Minibuffer input and completion. |
2961 | 2 Copyright (C) 1985, 1986, 1993 Free Software Foundation, Inc. |
284 | 3 |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 it under the terms of the GNU General Public License as published by | |
648 | 8 the Free Software Foundation; either version 2, or (at your option) |
284 | 9 any later version. |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |
19 | |
20 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4641
diff
changeset
|
21 #include <config.h> |
284 | 22 #include "lisp.h" |
23 #include "commands.h" | |
24 #include "buffer.h" | |
25 #include "dispextern.h" | |
765 | 26 #include "frame.h" |
284 | 27 #include "window.h" |
28 #include "syntax.h" | |
29 | |
30 #define min(a, b) ((a) < (b) ? (a) : (b)) | |
31 | |
6233
1e90a9197a2a
(temp_echo_area_glyphs): Use quit_char, not C-g.
Karl Heuer <kwzh@gnu.org>
parents:
6207
diff
changeset
|
32 extern int quit_char; |
1e90a9197a2a
(temp_echo_area_glyphs): Use quit_char, not C-g.
Karl Heuer <kwzh@gnu.org>
parents:
6207
diff
changeset
|
33 |
284 | 34 /* List of buffers for use as minibuffers. |
35 The first element of the list is used for the outermost minibuffer invocation, | |
36 the next element is used for a recursive minibuffer invocation, etc. | |
37 The list is extended at the end as deeped minibuffer recursions are encountered. */ | |
38 Lisp_Object Vminibuffer_list; | |
39 | |
40 struct minibuf_save_data | |
41 { | |
42 char *prompt; | |
43 int prompt_width; | |
44 Lisp_Object help_form; | |
45 Lisp_Object current_prefix_arg; | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
46 Lisp_Object history_position; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
47 Lisp_Object history_variable; |
284 | 48 }; |
49 | |
50 int minibuf_save_vector_size; | |
51 struct minibuf_save_data *minibuf_save_vector; | |
52 | |
53 /* Depth in minibuffer invocations. */ | |
54 int minibuf_level; | |
55 | |
56 /* Nonzero means display completion help for invalid input */ | |
57 int auto_help; | |
58 | |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
59 /* Fread_minibuffer leaves the input here as a string. */ |
284 | 60 Lisp_Object last_minibuf_string; |
61 | |
62 /* Nonzero means let functions called when within a minibuffer | |
63 invoke recursive minibuffers (to read arguments, or whatever) */ | |
64 int enable_recursive_minibuffers; | |
65 | |
66 /* help-form is bound to this while in the minibuffer. */ | |
67 | |
68 Lisp_Object Vminibuffer_help_form; | |
69 | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
70 /* Variable which is the history list to add minibuffer values to. */ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
71 |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
72 Lisp_Object Vminibuffer_history_variable; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
73 |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
74 /* Current position in the history list (adjusted by M-n and M-p). */ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
75 |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
76 Lisp_Object Vminibuffer_history_position; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
77 |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
78 Lisp_Object Qminibuffer_history; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
79 |
4641
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
80 Lisp_Object Qread_file_name_internal; |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
81 |
4550
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
82 /* Normal hook for entry to minibuffer. */ |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
83 |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
84 Lisp_Object Qminibuffer_setup_hook, Vminibuffer_setup_hook; |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
85 |
284 | 86 /* Nonzero means completion ignores case. */ |
87 | |
88 int completion_ignore_case; | |
89 | |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
90 /* List of regexps that should restrict possible completions. */ |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
91 |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
92 Lisp_Object Vcompletion_regexp_list; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
93 |
5238
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
94 /* Nonzero means raise the minibuffer frame when the minibuffer |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
95 is entered. */ |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
96 |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
97 int minibuffer_auto_raise; |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
98 |
284 | 99 /* If last completion attempt reported "Complete but not unique" |
100 then this is the string completed then; otherwise this is nil. */ | |
101 | |
102 static Lisp_Object last_exact_completion; | |
103 | |
104 Lisp_Object Quser_variable_p; | |
6544
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
105 |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
106 /* Non-nil means it is the window for C-M-v to scroll |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
107 when the minibuffer is selected. */ |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
108 extern Lisp_Object Vminibuf_scroll_window; |
284 | 109 |
110 /* Actual minibuffer invocation. */ | |
111 | |
112 void read_minibuf_unwind (); | |
113 Lisp_Object get_minibuffer (); | |
114 Lisp_Object read_minibuf (); | |
115 | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
116 /* Read from the minibuffer using keymap MAP, initial contents INITIAL |
866 | 117 (a string), putting point minus BACKUP_N chars from the end of INITIAL, |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
118 prompting with PROMPT (a string), using history list HISTVAR |
866 | 119 with initial position HISTPOS. (BACKUP_N should be <= 0.) |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
120 |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
121 Normally return the result as a string (the text that was read), |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
122 but if EXPFLAG is non-nil, read it and return the object read. |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
123 If HISTVAR is given, save the value read on that history only if it doesn't |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
124 match the front of that history list exactly. The value is pushed onto |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
125 the list as the string that was read, or as the object that resulted iff |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
126 EXPFLAG is non-nil. */ |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
127 |
284 | 128 Lisp_Object |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
129 read_minibuf (map, initial, prompt, backup_n, expflag, histvar, histpos) |
284 | 130 Lisp_Object map; |
131 Lisp_Object initial; | |
132 Lisp_Object prompt; | |
3690
2d6cd35210f3
(read_minibuf): Set and use mini_frame only if MULTI_FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
133 Lisp_Object backup_n; |
284 | 134 int expflag; |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
135 Lisp_Object histvar; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
136 Lisp_Object histpos; |
284 | 137 { |
138 register Lisp_Object val; | |
139 int count = specpdl_ptr - specpdl; | |
3690
2d6cd35210f3
(read_minibuf): Set and use mini_frame only if MULTI_FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
140 Lisp_Object mini_frame; |
284 | 141 struct gcpro gcpro1, gcpro2; |
142 | |
143 if (XTYPE (prompt) != Lisp_String) | |
144 prompt = build_string (""); | |
145 | |
146 /* Emacs in -batch mode calls minibuffer: print the prompt. */ | |
147 if (noninteractive && XTYPE (prompt) == Lisp_String) | |
148 printf ("%s", XSTRING (prompt)->data); | |
149 | |
150 if (!enable_recursive_minibuffers | |
151 && minibuf_level > 0 | |
152 && (EQ (selected_window, minibuf_window))) | |
153 #if 0 | |
765 | 154 || selected_frame != XFRAME (WINDOW_FRAME (XWINDOW (minibuf_window))) |
284 | 155 #endif |
156 error ("Command attempted to use minibuffer while in minibuffer"); | |
157 | |
158 if (minibuf_level == minibuf_save_vector_size) | |
159 minibuf_save_vector = | |
160 (struct minibuf_save_data *) | |
161 xrealloc (minibuf_save_vector, | |
162 (minibuf_save_vector_size *= 2) | |
163 * sizeof (struct minibuf_save_data)); | |
164 minibuf_save_vector[minibuf_level].prompt = minibuf_prompt; | |
165 minibuf_save_vector[minibuf_level].prompt_width = minibuf_prompt_width; | |
166 minibuf_prompt_width = 0; | |
167 /* >> Why is this done this way rather than binding these variables? */ | |
168 minibuf_save_vector[minibuf_level].help_form = Vhelp_form; | |
169 minibuf_save_vector[minibuf_level].current_prefix_arg = Vcurrent_prefix_arg; | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
170 minibuf_save_vector[minibuf_level].history_position = Vminibuffer_history_position; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
171 minibuf_save_vector[minibuf_level].history_variable = Vminibuffer_history_variable; |
284 | 172 GCPRO2 (minibuf_save_vector[minibuf_level].help_form, |
173 minibuf_save_vector[minibuf_level].current_prefix_arg); | |
174 | |
175 record_unwind_protect (Fset_window_configuration, | |
345 | 176 Fcurrent_window_configuration (Qnil)); |
177 | |
765 | 178 /* If the minibuffer window is on a different frame, save that |
179 frame's configuration too. */ | |
3690
2d6cd35210f3
(read_minibuf): Set and use mini_frame only if MULTI_FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
180 #ifdef MULTI_FRAME |
2d6cd35210f3
(read_minibuf): Set and use mini_frame only if MULTI_FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
181 XSET (mini_frame, Lisp_Frame, WINDOW_FRAME (XWINDOW (minibuf_window))); |
765 | 182 if (XFRAME (mini_frame) != selected_frame) |
3690
2d6cd35210f3
(read_minibuf): Set and use mini_frame only if MULTI_FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
183 record_unwind_protect (Fset_window_configuration, |
2d6cd35210f3
(read_minibuf): Set and use mini_frame only if MULTI_FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
184 Fcurrent_window_configuration (mini_frame)); |
6354
a74524e1c961
(read_minibuf): Make minibuffer frame visible when minibuffer activated.
Karl Heuer <kwzh@gnu.org>
parents:
6235
diff
changeset
|
185 |
a74524e1c961
(read_minibuf): Make minibuffer frame visible when minibuffer activated.
Karl Heuer <kwzh@gnu.org>
parents:
6235
diff
changeset
|
186 /* If the minibuffer is on an iconified or invisible frame, |
a74524e1c961
(read_minibuf): Make minibuffer frame visible when minibuffer activated.
Karl Heuer <kwzh@gnu.org>
parents:
6235
diff
changeset
|
187 make it visible now. */ |
a74524e1c961
(read_minibuf): Make minibuffer frame visible when minibuffer activated.
Karl Heuer <kwzh@gnu.org>
parents:
6235
diff
changeset
|
188 Fmake_frame_visible (mini_frame); |
a74524e1c961
(read_minibuf): Make minibuffer frame visible when minibuffer activated.
Karl Heuer <kwzh@gnu.org>
parents:
6235
diff
changeset
|
189 |
5238
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
190 if (minibuffer_auto_raise) |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
191 Fraise_frame (mini_frame); |
3690
2d6cd35210f3
(read_minibuf): Set and use mini_frame only if MULTI_FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
192 #endif |
284 | 193 |
194 val = current_buffer->directory; | |
195 Fset_buffer (get_minibuffer (minibuf_level)); | |
1593
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
196 |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
197 /* The current buffer's default directory is usually the right thing |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
198 for our minibuffer here. However, if you're typing a command at |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
199 a minibuffer-only frame when minibuf_level is zero, then buf IS |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
200 the current_buffer, so reset_buffer leaves buf's default |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
201 directory unchanged. This is a bummer when you've just started |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
202 up Emacs and buf's default directory is Qnil. Here's a hack; can |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
203 you think of something better to do? Find another buffer with a |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
204 better directory, and use that one instead. */ |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
205 if (XTYPE (val) == Lisp_String) |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
206 current_buffer->directory = val; |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
207 else |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
208 { |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
209 Lisp_Object buf_list; |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
210 |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
211 for (buf_list = Vbuffer_alist; |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
212 CONSP (buf_list); |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
213 buf_list = XCONS (buf_list)->cdr) |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
214 { |
6504
c867b9af8de4
(read_minibuf): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6472
diff
changeset
|
215 Lisp_Object other_buf; |
1593
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
216 |
6504
c867b9af8de4
(read_minibuf): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6472
diff
changeset
|
217 other_buf = XCONS (XCONS (buf_list)->car)->cdr; |
1593
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
218 if (XTYPE (XBUFFER (other_buf)->directory) == Lisp_String) |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
219 { |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
220 current_buffer->directory = XBUFFER (other_buf)->directory; |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
221 break; |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
222 } |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
223 } |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
224 } |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
225 |
1568
f55c75c6806d
* minibuf.c (read_minibuf): Protect call to Fredirect_frame_focus
Jim Blandy <jimb@redhat.com>
parents:
1520
diff
changeset
|
226 #ifdef MULTI_FRAME |
6472
7491cbb3d1a3
(read_minibuf): Don't redirect focus unless minibuf is on another frame.
Karl Heuer <kwzh@gnu.org>
parents:
6384
diff
changeset
|
227 if (XFRAME (mini_frame) != selected_frame) |
7491cbb3d1a3
(read_minibuf): Don't redirect focus unless minibuf is on another frame.
Karl Heuer <kwzh@gnu.org>
parents:
6384
diff
changeset
|
228 Fredirect_frame_focus (Fselected_frame (), mini_frame); |
1568
f55c75c6806d
* minibuf.c (read_minibuf): Protect call to Fredirect_frame_focus
Jim Blandy <jimb@redhat.com>
parents:
1520
diff
changeset
|
229 #endif |
284 | 230 Fmake_local_variable (Qprint_escape_newlines); |
231 print_escape_newlines = 1; | |
232 | |
358 | 233 record_unwind_protect (read_minibuf_unwind, Qnil); |
234 | |
284 | 235 Vminibuf_scroll_window = selected_window; |
236 Fset_window_buffer (minibuf_window, Fcurrent_buffer ()); | |
237 Fselect_window (minibuf_window); | |
238 XFASTINT (XWINDOW (minibuf_window)->hscroll) = 0; | |
239 | |
240 Ferase_buffer (); | |
241 minibuf_level++; | |
242 | |
488 | 243 if (!NILP (initial)) |
284 | 244 { |
245 Finsert (1, &initial); | |
488 | 246 if (!NILP (backup_n) && XTYPE (backup_n) == Lisp_Int) |
284 | 247 Fforward_char (backup_n); |
248 } | |
249 | |
250 minibuf_prompt = (char *) alloca (XSTRING (prompt)->size + 1); | |
251 bcopy (XSTRING (prompt)->data, minibuf_prompt, XSTRING (prompt)->size + 1); | |
252 echo_area_glyphs = 0; | |
253 | |
254 Vhelp_form = Vminibuffer_help_form; | |
255 current_buffer->keymap = map; | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
256 Vminibuffer_history_position = histpos; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
257 Vminibuffer_history_variable = histvar; |
284 | 258 |
4550
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
259 /* Run our hook, but not if it is empty. |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
260 (run-hooks would do nothing if it is empty, |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
261 but it's important to save time here in the usual case. */ |
6207
993ca5adfcd1
(read_minibuf): Don't call Vrun_hooks if it is nil.
Richard M. Stallman <rms@gnu.org>
parents:
6161
diff
changeset
|
262 if (!NILP (Vminibuffer_setup_hook) && !EQ (Vminibuffer_setup_hook, Qunbound) |
993ca5adfcd1
(read_minibuf): Don't call Vrun_hooks if it is nil.
Richard M. Stallman <rms@gnu.org>
parents:
6161
diff
changeset
|
263 && !NILP (Vrun_hooks)) |
4550
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
264 call1 (Vrun_hooks, Qminibuffer_setup_hook); |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
265 |
284 | 266 /* ??? MCC did redraw_screen here if switching screens. */ |
267 recursive_edit_1 (); | |
268 | |
269 /* If cursor is on the minibuffer line, | |
270 show the user we have exited by putting it in column 0. */ | |
765 | 271 if ((FRAME_CURSOR_Y (selected_frame) |
284 | 272 >= XFASTINT (XWINDOW (minibuf_window)->top)) |
273 && !noninteractive) | |
274 { | |
765 | 275 FRAME_CURSOR_X (selected_frame) = 0; |
276 update_frame (selected_frame, 1, 1); | |
284 | 277 } |
278 | |
279 /* Make minibuffer contents into a string */ | |
648 | 280 val = make_buffer_string (1, Z); |
284 | 281 bcopy (GAP_END_ADDR, XSTRING (val)->data + GPT - BEG, Z - GPT); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
282 |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
283 /* VAL is the string of minibuffer text. */ |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
284 last_minibuf_string = val; |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
285 |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
286 /* Add the value to the appropriate history list. */ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
287 if (XTYPE (Vminibuffer_history_variable) == Lisp_Symbol |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
288 && ! EQ (XSYMBOL (Vminibuffer_history_variable)->value, Qunbound)) |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
289 { |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
290 /* If the caller wanted to save the value read on a history list, |
5069
47cc31b47402
(read_minibuf): History list always gets strings,
Richard M. Stallman <rms@gnu.org>
parents:
4824
diff
changeset
|
291 then do so if the value is not already the front of the list. */ |
47cc31b47402
(read_minibuf): History list always gets strings,
Richard M. Stallman <rms@gnu.org>
parents:
4824
diff
changeset
|
292 Lisp_Object histval; |
47cc31b47402
(read_minibuf): History list always gets strings,
Richard M. Stallman <rms@gnu.org>
parents:
4824
diff
changeset
|
293 histval = Fsymbol_value (Vminibuffer_history_variable); |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
294 |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
295 /* The value of the history variable must be a cons or nil. Other |
5069
47cc31b47402
(read_minibuf): History list always gets strings,
Richard M. Stallman <rms@gnu.org>
parents:
4824
diff
changeset
|
296 values are unacceptable. We silently ignore these values. */ |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
297 if (NILP (histval) |
5069
47cc31b47402
(read_minibuf): History list always gets strings,
Richard M. Stallman <rms@gnu.org>
parents:
4824
diff
changeset
|
298 || (CONSP (histval) |
47cc31b47402
(read_minibuf): History list always gets strings,
Richard M. Stallman <rms@gnu.org>
parents:
4824
diff
changeset
|
299 && NILP (Fequal (last_minibuf_string, Fcar (histval))))) |
47cc31b47402
(read_minibuf): History list always gets strings,
Richard M. Stallman <rms@gnu.org>
parents:
4824
diff
changeset
|
300 Fset (Vminibuffer_history_variable, |
47cc31b47402
(read_minibuf): History list always gets strings,
Richard M. Stallman <rms@gnu.org>
parents:
4824
diff
changeset
|
301 Fcons (last_minibuf_string, histval)); |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
302 } |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
303 |
5069
47cc31b47402
(read_minibuf): History list always gets strings,
Richard M. Stallman <rms@gnu.org>
parents:
4824
diff
changeset
|
304 /* If Lisp form desired instead of string, parse it. */ |
47cc31b47402
(read_minibuf): History list always gets strings,
Richard M. Stallman <rms@gnu.org>
parents:
4824
diff
changeset
|
305 if (expflag) |
6384
5e8a442a836d
(read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents:
6354
diff
changeset
|
306 { |
5e8a442a836d
(read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents:
6354
diff
changeset
|
307 Lisp_Object expr_and_pos; |
5e8a442a836d
(read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents:
6354
diff
changeset
|
308 unsigned char *p; |
5e8a442a836d
(read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents:
6354
diff
changeset
|
309 |
5e8a442a836d
(read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents:
6354
diff
changeset
|
310 expr_and_pos = Fread_from_string (val, Qnil, Qnil); |
5e8a442a836d
(read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents:
6354
diff
changeset
|
311 /* Ignore trailing whitespace; any other trailing junk is an error. */ |
5e8a442a836d
(read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents:
6354
diff
changeset
|
312 for (p = XSTRING (val)->data + XINT (Fcdr (expr_and_pos)); *p; p++) |
5e8a442a836d
(read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents:
6354
diff
changeset
|
313 if (*p != ' ' && *p != '\t' && *p != '\n') |
5e8a442a836d
(read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents:
6354
diff
changeset
|
314 error ("Trailing garbage following expression"); |
5e8a442a836d
(read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents:
6354
diff
changeset
|
315 val = Fcar (expr_and_pos); |
5e8a442a836d
(read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents:
6354
diff
changeset
|
316 } |
5069
47cc31b47402
(read_minibuf): History list always gets strings,
Richard M. Stallman <rms@gnu.org>
parents:
4824
diff
changeset
|
317 |
284 | 318 UNGCPRO; |
6544
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
319 return unbind_to (count, val); /* The appropriate frame will get selected |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
320 in set-window-configuration. */ |
284 | 321 } |
322 | |
323 /* Return a buffer to be used as the minibuffer at depth `depth'. | |
324 depth = 0 is the lowest allowed argument, and that is the value | |
325 used for nonrecursive minibuffer invocations */ | |
326 | |
327 Lisp_Object | |
328 get_minibuffer (depth) | |
329 int depth; | |
330 { | |
331 Lisp_Object tail, num, buf; | |
6235
d93350e9d2bc
(get_minibuffer): Make name buffer large enough.
Karl Heuer <kwzh@gnu.org>
parents:
6234
diff
changeset
|
332 char name[24]; |
284 | 333 extern Lisp_Object nconc2 (); |
334 | |
335 XFASTINT (num) = depth; | |
336 tail = Fnthcdr (num, Vminibuffer_list); | |
488 | 337 if (NILP (tail)) |
284 | 338 { |
339 tail = Fcons (Qnil, Qnil); | |
340 Vminibuffer_list = nconc2 (Vminibuffer_list, tail); | |
341 } | |
342 buf = Fcar (tail); | |
488 | 343 if (NILP (buf) || NILP (XBUFFER (buf)->name)) |
284 | 344 { |
345 sprintf (name, " *Minibuf-%d*", depth); | |
346 buf = Fget_buffer_create (build_string (name)); | |
1198
7c4519722020
Thu Sep 17 15:51:18 1992 Jim Blandy (jimb@pogo.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1010
diff
changeset
|
347 |
7c4519722020
Thu Sep 17 15:51:18 1992 Jim Blandy (jimb@pogo.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1010
diff
changeset
|
348 /* Although the buffer's name starts with a space, undo should be |
7c4519722020
Thu Sep 17 15:51:18 1992 Jim Blandy (jimb@pogo.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1010
diff
changeset
|
349 enabled in it. */ |
7c4519722020
Thu Sep 17 15:51:18 1992 Jim Blandy (jimb@pogo.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1010
diff
changeset
|
350 Fbuffer_enable_undo (buf); |
7c4519722020
Thu Sep 17 15:51:18 1992 Jim Blandy (jimb@pogo.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1010
diff
changeset
|
351 |
284 | 352 XCONS (tail)->car = buf; |
353 } | |
354 else | |
355 reset_buffer (XBUFFER (buf)); | |
1593
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
356 |
284 | 357 return buf; |
358 } | |
359 | |
360 /* This function is called on exiting minibuffer, whether normally or not, | |
361 and it restores the current window, buffer, etc. */ | |
362 | |
363 void | |
358 | 364 read_minibuf_unwind (data) |
365 Lisp_Object data; | |
284 | 366 { |
367 /* Erase the minibuffer we were using at this level. */ | |
368 Fset_buffer (XWINDOW (minibuf_window)->buffer); | |
369 | |
370 /* Prevent error in erase-buffer. */ | |
371 current_buffer->read_only = Qnil; | |
372 Ferase_buffer (); | |
373 | |
374 /* If this was a recursive minibuffer, | |
375 tie the minibuffer window back to the outer level minibuffer buffer */ | |
376 minibuf_level--; | |
377 /* Make sure minibuffer window is erased, not ignored */ | |
378 windows_or_buffers_changed++; | |
379 XFASTINT (XWINDOW (minibuf_window)->last_modified) = 0; | |
380 | |
381 /* Restore prompt from outer minibuffer */ | |
382 minibuf_prompt = minibuf_save_vector[minibuf_level].prompt; | |
383 minibuf_prompt_width = minibuf_save_vector[minibuf_level].prompt_width; | |
384 Vhelp_form = minibuf_save_vector[minibuf_level].help_form; | |
385 Vcurrent_prefix_arg = minibuf_save_vector[minibuf_level].current_prefix_arg; | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
386 Vminibuffer_history_position |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
387 = minibuf_save_vector[minibuf_level].history_position; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
388 Vminibuffer_history_variable |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
389 = minibuf_save_vector[minibuf_level].history_variable; |
284 | 390 } |
391 | |
1010
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
392 |
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
393 /* This comment supplies the doc string for read-from-minibuffer, |
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
394 for make-docfile to see. We cannot put this in the real DEFUN |
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
395 due to limits in the Unix cpp. |
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
396 |
284 | 397 DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 5, 0, |
398 "Read a string from the minibuffer, prompting with string PROMPT.\n\ | |
399 If optional second arg INITIAL-CONTENTS is non-nil, it is a string\n\ | |
400 to be inserted into the minibuffer before reading input.\n\ | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
401 If INITIAL-CONTENTS is (STRING . POSITION), the initial input\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
402 is STRING, but point is placed POSITION characters into the string.\n\ |
284 | 403 Third arg KEYMAP is a keymap to use whilst reading;\n\ |
404 if omitted or nil, the default is `minibuffer-local-map'.\n\ | |
405 If fourth arg READ is non-nil, then interpret the result as a lisp object\n\ | |
406 and return that object:\n\ | |
407 in other words, do `(car (read-from-string INPUT-STRING))'\n\ | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
408 Fifth arg HIST, if non-nil, specifies a history list\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
409 and optionally the initial position in the list.\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
410 It can be a symbol, which is the history list variable to use,\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
411 or it can be a cons cell (HISTVAR . HISTPOS).\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
412 In that case, HISTVAR is the history list variable to use,\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
413 and HISTPOS is the initial position (the position in the list\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
414 which INITIAL-CONTENTS corresponds to).\n\ |
1010
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
415 Positions are counted starting from 1 at the beginning of the list." |
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
416 */ |
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
417 |
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
418 DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 5, 0, |
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
419 0 /* See immediately above */) |
5376
eb9c60c0cfe8
(read_from_minibuffer): Rename arg initial_input to initial_contents.
Richard M. Stallman <rms@gnu.org>
parents:
5369
diff
changeset
|
420 (prompt, initial_contents, keymap, read, hist) |
eb9c60c0cfe8
(read_from_minibuffer): Rename arg initial_input to initial_contents.
Richard M. Stallman <rms@gnu.org>
parents:
5369
diff
changeset
|
421 Lisp_Object prompt, initial_contents, keymap, read, hist; |
284 | 422 { |
423 int pos = 0; | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
424 Lisp_Object histvar, histpos, position; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
425 position = Qnil; |
284 | 426 |
427 CHECK_STRING (prompt, 0); | |
5376
eb9c60c0cfe8
(read_from_minibuffer): Rename arg initial_input to initial_contents.
Richard M. Stallman <rms@gnu.org>
parents:
5369
diff
changeset
|
428 if (!NILP (initial_contents)) |
284 | 429 { |
5376
eb9c60c0cfe8
(read_from_minibuffer): Rename arg initial_input to initial_contents.
Richard M. Stallman <rms@gnu.org>
parents:
5369
diff
changeset
|
430 if (XTYPE (initial_contents) == Lisp_Cons) |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
431 { |
5376
eb9c60c0cfe8
(read_from_minibuffer): Rename arg initial_input to initial_contents.
Richard M. Stallman <rms@gnu.org>
parents:
5369
diff
changeset
|
432 position = Fcdr (initial_contents); |
eb9c60c0cfe8
(read_from_minibuffer): Rename arg initial_input to initial_contents.
Richard M. Stallman <rms@gnu.org>
parents:
5369
diff
changeset
|
433 initial_contents = Fcar (initial_contents); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
434 } |
5376
eb9c60c0cfe8
(read_from_minibuffer): Rename arg initial_input to initial_contents.
Richard M. Stallman <rms@gnu.org>
parents:
5369
diff
changeset
|
435 CHECK_STRING (initial_contents, 1); |
488 | 436 if (!NILP (position)) |
284 | 437 { |
438 CHECK_NUMBER (position, 0); | |
439 /* Convert to distance from end of input. */ | |
5376
eb9c60c0cfe8
(read_from_minibuffer): Rename arg initial_input to initial_contents.
Richard M. Stallman <rms@gnu.org>
parents:
5369
diff
changeset
|
440 pos = XINT (position) - 1 - XSTRING (initial_contents)->size; |
284 | 441 } |
442 } | |
443 | |
488 | 444 if (NILP (keymap)) |
284 | 445 keymap = Vminibuffer_local_map; |
446 else | |
447 keymap = get_keymap (keymap,2); | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
448 |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
449 if (XTYPE (hist) == Lisp_Symbol) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
450 { |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
451 histvar = hist; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
452 histpos = Qnil; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
453 } |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
454 else |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
455 { |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
456 histvar = Fcar_safe (hist); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
457 histpos = Fcdr_safe (hist); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
458 } |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
459 if (NILP (histvar)) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
460 histvar = Qminibuffer_history; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
461 if (NILP (histpos)) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
462 XFASTINT (histpos) = 0; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
463 |
5376
eb9c60c0cfe8
(read_from_minibuffer): Rename arg initial_input to initial_contents.
Richard M. Stallman <rms@gnu.org>
parents:
5369
diff
changeset
|
464 return read_minibuf (keymap, initial_contents, prompt, |
866 | 465 make_number (pos), !NILP (read), histvar, histpos); |
284 | 466 } |
467 | |
468 DEFUN ("read-minibuffer", Fread_minibuffer, Sread_minibuffer, 1, 2, 0, | |
469 "Return a Lisp object read using the minibuffer.\n\ | |
470 Prompt with PROMPT. If non-nil, optional second arg INITIAL-CONTENTS\n\ | |
471 is a string to insert in the minibuffer before reading.") | |
472 (prompt, initial_contents) | |
473 Lisp_Object prompt, initial_contents; | |
474 { | |
475 CHECK_STRING (prompt, 0); | |
488 | 476 if (!NILP (initial_contents)) |
3841
11500459af1d
* minibuf.c (Fread_minibuffer): Add missing semicolon after
Jim Blandy <jimb@redhat.com>
parents:
3690
diff
changeset
|
477 CHECK_STRING (initial_contents, 1); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
478 return read_minibuf (Vminibuffer_local_map, initial_contents, |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
479 prompt, Qnil, 1, Qminibuffer_history, make_number (0)); |
284 | 480 } |
481 | |
482 DEFUN ("eval-minibuffer", Feval_minibuffer, Seval_minibuffer, 1, 2, 0, | |
483 "Return value of Lisp expression read using the minibuffer.\n\ | |
484 Prompt with PROMPT. If non-nil, optional second arg INITIAL-CONTENTS\n\ | |
485 is a string to insert in the minibuffer before reading.") | |
486 (prompt, initial_contents) | |
487 Lisp_Object prompt, initial_contents; | |
488 { | |
489 return Feval (Fread_minibuffer (prompt, initial_contents)); | |
490 } | |
491 | |
492 /* Functions that use the minibuffer to read various things. */ | |
493 | |
494 DEFUN ("read-string", Fread_string, Sread_string, 1, 2, 0, | |
495 "Read a string from the minibuffer, prompting with string PROMPT.\n\ | |
496 If non-nil second arg INITIAL-INPUT is a string to insert before reading.") | |
497 (prompt, initial_input) | |
498 Lisp_Object prompt, initial_input; | |
499 { | |
500 return Fread_from_minibuffer (prompt, initial_input, Qnil, Qnil, Qnil); | |
501 } | |
502 | |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
503 DEFUN ("read-no-blanks-input", Fread_no_blanks_input, Sread_no_blanks_input, 1, 2, 0, |
284 | 504 "Args PROMPT and INIT, strings. Read a string from the terminal, not allowing blanks.\n\ |
505 Prompt with PROMPT, and provide INIT as an initial value of the input string.") | |
506 (prompt, init) | |
507 Lisp_Object prompt, init; | |
508 { | |
509 CHECK_STRING (prompt, 0); | |
488 | 510 if (! NILP (init)) |
284 | 511 CHECK_STRING (init, 1); |
512 | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
513 return read_minibuf (Vminibuffer_local_ns_map, init, prompt, Qnil, 0, |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
514 Qminibuffer_history, make_number (0)); |
284 | 515 } |
516 | |
517 DEFUN ("read-command", Fread_command, Sread_command, 1, 1, 0, | |
518 "One arg PROMPT, a string. Read the name of a command and return as a symbol.\n\ | |
519 Prompts with PROMPT.") | |
520 (prompt) | |
521 Lisp_Object prompt; | |
522 { | |
523 return Fintern (Fcompleting_read (prompt, Vobarray, Qcommandp, Qt, Qnil, Qnil), | |
524 Qnil); | |
525 } | |
526 | |
527 #ifdef NOTDEF | |
528 DEFUN ("read-function", Fread_function, Sread_function, 1, 1, 0, | |
529 "One arg PROMPT, a string. Read the name of a function and return as a symbol.\n\ | |
530 Prompts with PROMPT.") | |
531 (prompt) | |
532 Lisp_Object prompt; | |
533 { | |
534 return Fintern (Fcompleting_read (prompt, Vobarray, Qfboundp, Qt, Qnil, Qnil), | |
535 Qnil); | |
536 } | |
537 #endif /* NOTDEF */ | |
538 | |
539 DEFUN ("read-variable", Fread_variable, Sread_variable, 1, 1, 0, | |
540 "One arg PROMPT, a string. Read the name of a user variable and return\n\ | |
541 it as a symbol. Prompts with PROMPT.\n\ | |
542 A user variable is one whose documentation starts with a `*' character.") | |
543 (prompt) | |
544 Lisp_Object prompt; | |
545 { | |
546 return Fintern (Fcompleting_read (prompt, Vobarray, | |
547 Quser_variable_p, Qt, Qnil, Qnil), | |
548 Qnil); | |
549 } | |
550 | |
551 DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 3, 0, | |
552 "One arg PROMPT, a string. Read the name of a buffer and return as a string.\n\ | |
553 Prompts with PROMPT.\n\ | |
554 Optional second arg is value to return if user enters an empty line.\n\ | |
555 If optional third arg REQUIRE-MATCH is non-nil, only existing buffer names are allowed.") | |
556 (prompt, def, require_match) | |
557 Lisp_Object prompt, def, require_match; | |
558 { | |
559 Lisp_Object tem; | |
560 Lisp_Object args[3]; | |
561 struct gcpro gcpro1; | |
562 | |
563 if (XTYPE (def) == Lisp_Buffer) | |
564 def = XBUFFER (def)->name; | |
488 | 565 if (!NILP (def)) |
284 | 566 { |
567 args[0] = build_string ("%s(default %s) "); | |
568 args[1] = prompt; | |
569 args[2] = def; | |
570 prompt = Fformat (3, args); | |
571 } | |
572 GCPRO1 (def); | |
573 tem = Fcompleting_read (prompt, Vbuffer_alist, Qnil, require_match, Qnil, Qnil); | |
574 UNGCPRO; | |
575 if (XSTRING (tem)->size) | |
576 return tem; | |
577 return def; | |
578 } | |
579 | |
580 DEFUN ("try-completion", Ftry_completion, Stry_completion, 2, 3, 0, | |
581 "Return common substring of all completions of STRING in ALIST.\n\ | |
582 Each car of each element of ALIST is tested to see if it begins with STRING.\n\ | |
583 All that match are compared together; the longest initial sequence\n\ | |
584 common to all matches is returned as a string.\n\ | |
585 If there is no match at all, nil is returned.\n\ | |
586 For an exact match, t is returned.\n\ | |
587 \n\ | |
588 ALIST can be an obarray instead of an alist.\n\ | |
589 Then the print names of all symbols in the obarray are the possible matches.\n\ | |
590 \n\ | |
591 ALIST can also be a function to do the completion itself.\n\ | |
592 It receives three arguments: the values STRING, PREDICATE and nil.\n\ | |
593 Whatever it returns becomes the value of `try-completion'.\n\ | |
594 \n\ | |
595 If optional third argument PREDICATE is non-nil,\n\ | |
596 it is used to test each possible match.\n\ | |
597 The match is a candidate only if PREDICATE returns non-nil.\n\ | |
598 The argument given to PREDICATE is the alist element or the symbol from the obarray.") | |
599 (string, alist, pred) | |
600 Lisp_Object string, alist, pred; | |
601 { | |
602 Lisp_Object bestmatch, tail, elt, eltstring; | |
603 int bestmatchsize; | |
604 int compare, matchsize; | |
488 | 605 int list = CONSP (alist) || NILP (alist); |
284 | 606 int index, obsize; |
607 int matchcount = 0; | |
608 Lisp_Object bucket, zero, end, tem; | |
609 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; | |
610 | |
611 CHECK_STRING (string, 0); | |
612 if (!list && XTYPE (alist) != Lisp_Vector) | |
613 return call3 (alist, string, pred, Qnil); | |
614 | |
615 bestmatch = Qnil; | |
616 | |
617 /* If ALIST is not a list, set TAIL just for gc pro. */ | |
618 tail = alist; | |
619 if (! list) | |
620 { | |
621 index = 0; | |
622 obsize = XVECTOR (alist)->size; | |
623 bucket = XVECTOR (alist)->contents[index]; | |
624 } | |
625 | |
626 while (1) | |
627 { | |
628 /* Get the next element of the alist or obarray. */ | |
629 /* Exit the loop if the elements are all used up. */ | |
630 /* elt gets the alist element or symbol. | |
631 eltstring gets the name to check as a completion. */ | |
632 | |
633 if (list) | |
634 { | |
488 | 635 if (NILP (tail)) |
284 | 636 break; |
637 elt = Fcar (tail); | |
638 eltstring = Fcar (elt); | |
639 tail = Fcdr (tail); | |
640 } | |
641 else | |
642 { | |
643 if (XFASTINT (bucket) != 0) | |
644 { | |
645 elt = bucket; | |
646 eltstring = Fsymbol_name (elt); | |
647 if (XSYMBOL (bucket)->next) | |
648 XSETSYMBOL (bucket, XSYMBOL (bucket)->next); | |
649 else | |
650 XFASTINT (bucket) = 0; | |
651 } | |
652 else if (++index >= obsize) | |
653 break; | |
654 else | |
655 { | |
656 bucket = XVECTOR (alist)->contents[index]; | |
657 continue; | |
658 } | |
659 } | |
660 | |
661 /* Is this element a possible completion? */ | |
662 | |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
663 if (XTYPE (eltstring) == Lisp_String |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
664 && XSTRING (string)->size <= XSTRING (eltstring)->size |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
665 && 0 > scmp (XSTRING (eltstring)->data, XSTRING (string)->data, |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
666 XSTRING (string)->size)) |
284 | 667 { |
668 /* Yes. */ | |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
669 Lisp_Object regexps; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
670 Lisp_Object zero; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
671 XFASTINT (zero) = 0; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
672 |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
673 /* Ignore this element if it fails to match all the regexps. */ |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
674 for (regexps = Vcompletion_regexp_list; CONSP (regexps); |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
675 regexps = XCONS (regexps)->cdr) |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
676 { |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
677 tem = Fstring_match (XCONS (regexps)->car, eltstring, zero); |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
678 if (NILP (tem)) |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
679 break; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
680 } |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
681 if (CONSP (regexps)) |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
682 continue; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
683 |
284 | 684 /* Ignore this element if there is a predicate |
685 and the predicate doesn't like it. */ | |
686 | |
488 | 687 if (!NILP (pred)) |
284 | 688 { |
689 if (EQ (pred, Qcommandp)) | |
690 tem = Fcommandp (elt); | |
691 else | |
692 { | |
693 GCPRO4 (tail, string, eltstring, bestmatch); | |
694 tem = call1 (pred, elt); | |
695 UNGCPRO; | |
696 } | |
488 | 697 if (NILP (tem)) continue; |
284 | 698 } |
699 | |
700 /* Update computation of how much all possible completions match */ | |
701 | |
702 matchcount++; | |
488 | 703 if (NILP (bestmatch)) |
284 | 704 bestmatch = eltstring, bestmatchsize = XSTRING (eltstring)->size; |
705 else | |
706 { | |
707 compare = min (bestmatchsize, XSTRING (eltstring)->size); | |
708 matchsize = scmp (XSTRING (bestmatch)->data, | |
709 XSTRING (eltstring)->data, | |
710 compare); | |
330 | 711 if (matchsize < 0) |
712 matchsize = compare; | |
713 if (completion_ignore_case) | |
714 { | |
715 /* If this is an exact match except for case, | |
716 use it as the best match rather than one that is not an | |
717 exact match. This way, we get the case pattern | |
718 of the actual match. */ | |
719 if ((matchsize == XSTRING (eltstring)->size | |
720 && matchsize < XSTRING (bestmatch)->size) | |
721 || | |
722 /* If there is more than one exact match ignoring case, | |
723 and one of them is exact including case, | |
724 prefer that one. */ | |
725 /* If there is no exact match ignoring case, | |
726 prefer a match that does not change the case | |
727 of the input. */ | |
728 ((matchsize == XSTRING (eltstring)->size) | |
729 == | |
730 (matchsize == XSTRING (bestmatch)->size) | |
731 && !bcmp (XSTRING (eltstring)->data, | |
732 XSTRING (string)->data, XSTRING (string)->size) | |
733 && bcmp (XSTRING (bestmatch)->data, | |
734 XSTRING (string)->data, XSTRING (string)->size))) | |
735 bestmatch = eltstring; | |
736 } | |
737 bestmatchsize = matchsize; | |
284 | 738 } |
739 } | |
740 } | |
741 | |
488 | 742 if (NILP (bestmatch)) |
284 | 743 return Qnil; /* No completions found */ |
330 | 744 /* If we are ignoring case, and there is no exact match, |
745 and no additional text was supplied, | |
746 don't change the case of what the user typed. */ | |
747 if (completion_ignore_case && bestmatchsize == XSTRING (string)->size | |
748 && XSTRING (bestmatch)->size > bestmatchsize) | |
749 return string; | |
750 | |
751 /* Return t if the supplied string is an exact match (counting case); | |
752 it does not require any change to be made. */ | |
753 if (matchcount == 1 && bestmatchsize == XSTRING (string)->size | |
754 && !bcmp (XSTRING (bestmatch)->data, XSTRING (string)->data, | |
755 bestmatchsize)) | |
284 | 756 return Qt; |
757 | |
758 XFASTINT (zero) = 0; /* Else extract the part in which */ | |
759 XFASTINT (end) = bestmatchsize; /* all completions agree */ | |
760 return Fsubstring (bestmatch, zero, end); | |
761 } | |
762 | |
763 /* Compare exactly LEN chars of strings at S1 and S2, | |
764 ignoring case if appropriate. | |
765 Return -1 if strings match, | |
766 else number of chars that match at the beginning. */ | |
767 | |
768 scmp (s1, s2, len) | |
769 register char *s1, *s2; | |
770 int len; | |
771 { | |
772 register int l = len; | |
773 | |
774 if (completion_ignore_case) | |
775 { | |
776 while (l && DOWNCASE (*s1++) == DOWNCASE (*s2++)) | |
777 l--; | |
778 } | |
779 else | |
780 { | |
781 while (l && *s1++ == *s2++) | |
782 l--; | |
783 } | |
784 if (l == 0) | |
785 return -1; | |
786 else return len - l; | |
787 } | |
788 | |
789 DEFUN ("all-completions", Fall_completions, Sall_completions, 2, 3, 0, | |
790 "Search for partial matches to STRING in ALIST.\n\ | |
791 Each car of each element of ALIST is tested to see if it begins with STRING.\n\ | |
792 The value is a list of all the strings from ALIST that match.\n\ | |
793 ALIST can be an obarray instead of an alist.\n\ | |
794 Then the print names of all symbols in the obarray are the possible matches.\n\ | |
795 \n\ | |
796 ALIST can also be a function to do the completion itself.\n\ | |
797 It receives three arguments: the values STRING, PREDICATE and t.\n\ | |
798 Whatever it returns becomes the value of `all-completion'.\n\ | |
799 \n\ | |
800 If optional third argument PREDICATE is non-nil,\n\ | |
801 it is used to test each possible match.\n\ | |
802 The match is a candidate only if PREDICATE returns non-nil.\n\ | |
803 The argument given to PREDICATE is the alist element or the symbol from the obarray.") | |
804 (string, alist, pred) | |
805 Lisp_Object string, alist, pred; | |
806 { | |
807 Lisp_Object tail, elt, eltstring; | |
808 Lisp_Object allmatches; | |
488 | 809 int list = CONSP (alist) || NILP (alist); |
284 | 810 int index, obsize; |
811 Lisp_Object bucket, tem; | |
812 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; | |
813 | |
814 CHECK_STRING (string, 0); | |
815 if (!list && XTYPE (alist) != Lisp_Vector) | |
816 { | |
817 return call3 (alist, string, pred, Qt); | |
818 } | |
819 allmatches = Qnil; | |
820 | |
821 /* If ALIST is not a list, set TAIL just for gc pro. */ | |
822 tail = alist; | |
823 if (! list) | |
824 { | |
825 index = 0; | |
826 obsize = XVECTOR (alist)->size; | |
827 bucket = XVECTOR (alist)->contents[index]; | |
828 } | |
829 | |
830 while (1) | |
831 { | |
832 /* Get the next element of the alist or obarray. */ | |
833 /* Exit the loop if the elements are all used up. */ | |
834 /* elt gets the alist element or symbol. | |
835 eltstring gets the name to check as a completion. */ | |
836 | |
837 if (list) | |
838 { | |
488 | 839 if (NILP (tail)) |
284 | 840 break; |
841 elt = Fcar (tail); | |
842 eltstring = Fcar (elt); | |
843 tail = Fcdr (tail); | |
844 } | |
845 else | |
846 { | |
847 if (XFASTINT (bucket) != 0) | |
848 { | |
849 elt = bucket; | |
850 eltstring = Fsymbol_name (elt); | |
851 if (XSYMBOL (bucket)->next) | |
852 XSETSYMBOL (bucket, XSYMBOL (bucket)->next); | |
853 else | |
854 XFASTINT (bucket) = 0; | |
855 } | |
856 else if (++index >= obsize) | |
857 break; | |
858 else | |
859 { | |
860 bucket = XVECTOR (alist)->contents[index]; | |
861 continue; | |
862 } | |
863 } | |
864 | |
865 /* Is this element a possible completion? */ | |
866 | |
5369
409c8dd33f42
(Fall_completions): Allow completions that start with space
Richard M. Stallman <rms@gnu.org>
parents:
5238
diff
changeset
|
867 if (XTYPE (eltstring) == Lisp_String |
409c8dd33f42
(Fall_completions): Allow completions that start with space
Richard M. Stallman <rms@gnu.org>
parents:
5238
diff
changeset
|
868 && XSTRING (string)->size <= XSTRING (eltstring)->size |
409c8dd33f42
(Fall_completions): Allow completions that start with space
Richard M. Stallman <rms@gnu.org>
parents:
5238
diff
changeset
|
869 /* Reject alternatives that start with space |
409c8dd33f42
(Fall_completions): Allow completions that start with space
Richard M. Stallman <rms@gnu.org>
parents:
5238
diff
changeset
|
870 unless the input starts with space. */ |
409c8dd33f42
(Fall_completions): Allow completions that start with space
Richard M. Stallman <rms@gnu.org>
parents:
5238
diff
changeset
|
871 && ((XSTRING (string)->size > 0 && XSTRING (string)->data[0] == ' ') |
409c8dd33f42
(Fall_completions): Allow completions that start with space
Richard M. Stallman <rms@gnu.org>
parents:
5238
diff
changeset
|
872 || XSTRING (eltstring)->data[0] != ' ') |
409c8dd33f42
(Fall_completions): Allow completions that start with space
Richard M. Stallman <rms@gnu.org>
parents:
5238
diff
changeset
|
873 && 0 > scmp (XSTRING (eltstring)->data, XSTRING (string)->data, |
409c8dd33f42
(Fall_completions): Allow completions that start with space
Richard M. Stallman <rms@gnu.org>
parents:
5238
diff
changeset
|
874 XSTRING (string)->size)) |
284 | 875 { |
876 /* Yes. */ | |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
877 Lisp_Object regexps; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
878 Lisp_Object zero; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
879 XFASTINT (zero) = 0; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
880 |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
881 /* Ignore this element if it fails to match all the regexps. */ |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
882 for (regexps = Vcompletion_regexp_list; CONSP (regexps); |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
883 regexps = XCONS (regexps)->cdr) |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
884 { |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
885 tem = Fstring_match (XCONS (regexps)->car, eltstring, zero); |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
886 if (NILP (tem)) |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
887 break; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
888 } |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
889 if (CONSP (regexps)) |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
890 continue; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
891 |
284 | 892 /* Ignore this element if there is a predicate |
893 and the predicate doesn't like it. */ | |
894 | |
488 | 895 if (!NILP (pred)) |
284 | 896 { |
897 if (EQ (pred, Qcommandp)) | |
898 tem = Fcommandp (elt); | |
899 else | |
900 { | |
901 GCPRO4 (tail, eltstring, allmatches, string); | |
902 tem = call1 (pred, elt); | |
903 UNGCPRO; | |
904 } | |
488 | 905 if (NILP (tem)) continue; |
284 | 906 } |
907 /* Ok => put it on the list. */ | |
908 allmatches = Fcons (eltstring, allmatches); | |
909 } | |
910 } | |
911 | |
912 return Fnreverse (allmatches); | |
913 } | |
914 | |
915 Lisp_Object Vminibuffer_completion_table, Qminibuffer_completion_table; | |
916 Lisp_Object Vminibuffer_completion_predicate, Qminibuffer_completion_predicate; | |
917 Lisp_Object Vminibuffer_completion_confirm, Qminibuffer_completion_confirm; | |
918 | |
1010
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
919 /* This comment supplies the doc string for completing-read, |
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
920 for make-docfile to see. We cannot put this in the real DEFUN |
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
921 due to limits in the Unix cpp. |
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
922 |
284 | 923 DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 6, 0, |
924 "Read a string in the minibuffer, with completion.\n\ | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
925 Args: PROMPT, TABLE, PREDICATE, REQUIRE-MATCH, INITIAL-INPUT, HIST.\n\ |
284 | 926 PROMPT is a string to prompt with; normally it ends in a colon and a space.\n\ |
927 TABLE is an alist whose elements' cars are strings, or an obarray.\n\ | |
928 PREDICATE limits completion to a subset of TABLE.\n\ | |
929 See `try-completion' for more details on completion, TABLE, and PREDICATE.\n\ | |
930 If REQUIRE-MATCH is non-nil, the user is not allowed to exit unless\n\ | |
931 the input is (or completes to) an element of TABLE.\n\ | |
932 If it is also not t, Return does not exit if it does non-null completion.\n\ | |
933 If INITIAL-INPUT is non-nil, insert it in the minibuffer initially.\n\ | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
934 If it is (STRING . POSITION), the initial input\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
935 is STRING, but point is placed POSITION characters into the string.\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
936 HIST, if non-nil, specifies a history list\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
937 and optionally the initial position in the list.\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
938 It can be a symbol, which is the history list variable to use,\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
939 or it can be a cons cell (HISTVAR . HISTPOS).\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
940 In that case, HISTVAR is the history list variable to use,\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
941 and HISTPOS is the initial position (the position in the list\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
942 which INITIAL-CONTENTS corresponds to).\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
943 Positions are counted starting from 1 at the beginning of the list.\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
944 Completion ignores case if the ambient value of\n\ |
1010
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
945 `completion-ignore-case' is non-nil." |
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
946 */ |
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
947 DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 6, 0, |
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
948 0 /* See immediately above */) |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
949 (prompt, table, pred, require_match, init, hist) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
950 Lisp_Object prompt, table, pred, require_match, init, hist; |
284 | 951 { |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
952 Lisp_Object val, histvar, histpos, position; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
953 int pos = 0; |
284 | 954 int count = specpdl_ptr - specpdl; |
955 specbind (Qminibuffer_completion_table, table); | |
956 specbind (Qminibuffer_completion_predicate, pred); | |
957 specbind (Qminibuffer_completion_confirm, | |
958 EQ (require_match, Qt) ? Qnil : Qt); | |
959 last_exact_completion = Qnil; | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
960 |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
961 position = Qnil; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
962 if (!NILP (init)) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
963 { |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
964 if (XTYPE (init) == Lisp_Cons) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
965 { |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
966 position = Fcdr (init); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
967 init = Fcar (init); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
968 } |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
969 CHECK_STRING (init, 0); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
970 if (!NILP (position)) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
971 { |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
972 CHECK_NUMBER (position, 0); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
973 /* Convert to distance from end of input. */ |
967
6df04dcbd2e9
* minibuf.c (Fcompleting_read): Stop subtracting one from the
Jim Blandy <jimb@redhat.com>
parents:
866
diff
changeset
|
974 pos = XINT (position) - XSTRING (init)->size; |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
975 } |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
976 } |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
977 |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
978 if (XTYPE (hist) == Lisp_Symbol) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
979 { |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
980 histvar = hist; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
981 histpos = Qnil; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
982 } |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
983 else |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
984 { |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
985 histvar = Fcar_safe (hist); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
986 histpos = Fcdr_safe (hist); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
987 } |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
988 if (NILP (histvar)) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
989 histvar = Qminibuffer_history; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
990 if (NILP (histpos)) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
991 XFASTINT (histpos) = 0; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
992 |
488 | 993 val = read_minibuf (NILP (require_match) |
284 | 994 ? Vminibuffer_local_completion_map |
995 : Vminibuffer_local_must_match_map, | |
866 | 996 init, prompt, make_number (pos), 0, |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
997 histvar, histpos); |
284 | 998 return unbind_to (count, val); |
999 } | |
1000 | |
1001 /* Temporarily display the string M at the end of the current | |
1002 minibuffer contents. This is used to display things like | |
1003 "[No Match]" when the user requests a completion for a prefix | |
1004 that has no possible completions, and other quick, unobtrusive | |
1005 messages. */ | |
1006 | |
1007 temp_echo_area_glyphs (m) | |
1008 char *m; | |
1009 { | |
1010 int osize = ZV; | |
1011 Lisp_Object oinhibit; | |
1012 oinhibit = Vinhibit_quit; | |
1013 | |
1443
b359c67a9194
* minibuf.c (temp_echo_area_glyphs): Don't clear echo_area_glyphs
Jim Blandy <jimb@redhat.com>
parents:
1317
diff
changeset
|
1014 /* Clear out any old echo-area message to make way for our new thing. */ |
b359c67a9194
* minibuf.c (temp_echo_area_glyphs): Don't clear echo_area_glyphs
Jim Blandy <jimb@redhat.com>
parents:
1317
diff
changeset
|
1015 message (0); |
284 | 1016 |
1017 SET_PT (osize); | |
1018 insert_string (m); | |
1019 SET_PT (osize); | |
1020 Vinhibit_quit = Qt; | |
1021 Fsit_for (make_number (2), Qnil, Qnil); | |
1022 del_range (point, ZV); | |
488 | 1023 if (!NILP (Vquit_flag)) |
284 | 1024 { |
1025 Vquit_flag = Qnil; | |
6233
1e90a9197a2a
(temp_echo_area_glyphs): Use quit_char, not C-g.
Karl Heuer <kwzh@gnu.org>
parents:
6207
diff
changeset
|
1026 unread_command_events = Fcons (make_number (quit_char), Qnil); |
284 | 1027 } |
1028 Vinhibit_quit = oinhibit; | |
1029 } | |
1030 | |
1031 Lisp_Object Fminibuffer_completion_help (); | |
330 | 1032 Lisp_Object assoc_for_completion (); |
284 | 1033 |
1034 /* returns: | |
1035 * 0 no possible completion | |
1036 * 1 was already an exact and unique completion | |
1037 * 3 was already an exact completion | |
1038 * 4 completed to an exact completion | |
1039 * 5 some completion happened | |
1040 * 6 no completion happened | |
1041 */ | |
1042 int | |
1043 do_completion () | |
1044 { | |
1045 Lisp_Object completion, tem; | |
1046 int completedp; | |
1047 Lisp_Object last; | |
1048 | |
1049 completion = Ftry_completion (Fbuffer_string (), Vminibuffer_completion_table, | |
1050 Vminibuffer_completion_predicate); | |
1051 last = last_exact_completion; | |
1052 last_exact_completion = Qnil; | |
1053 | |
488 | 1054 if (NILP (completion)) |
284 | 1055 { |
1056 bitch_at_user (); | |
1057 temp_echo_area_glyphs (" [No match]"); | |
1058 return 0; | |
1059 } | |
1060 | |
1061 if (EQ (completion, Qt)) /* exact and unique match */ | |
1062 return 1; | |
1063 | |
1064 /* compiler bug */ | |
1065 tem = Fstring_equal (completion, Fbuffer_string()); | |
488 | 1066 if (completedp = NILP (tem)) |
284 | 1067 { |
1068 Ferase_buffer (); /* Some completion happened */ | |
1069 Finsert (1, &completion); | |
1070 } | |
1071 | |
1072 /* It did find a match. Do we match some possibility exactly now? */ | |
1073 if (CONSP (Vminibuffer_completion_table) | |
488 | 1074 || NILP (Vminibuffer_completion_table)) |
330 | 1075 tem = assoc_for_completion (Fbuffer_string (), |
1076 Vminibuffer_completion_table); | |
284 | 1077 else if (XTYPE (Vminibuffer_completion_table) == Lisp_Vector) |
1078 { | |
1079 /* the primitive used by Fintern_soft */ | |
1080 extern Lisp_Object oblookup (); | |
1081 | |
1082 tem = Fbuffer_string (); | |
1083 /* Bypass intern-soft as that loses for nil */ | |
1084 tem = oblookup (Vminibuffer_completion_table, | |
1085 XSTRING (tem)->data, XSTRING (tem)->size); | |
1086 if (XTYPE (tem) != Lisp_Symbol) | |
1087 tem = Qnil; | |
488 | 1088 else if (!NILP (Vminibuffer_completion_predicate)) |
284 | 1089 tem = call1 (Vminibuffer_completion_predicate, tem); |
1090 else | |
1091 tem = Qt; | |
1092 } | |
1093 else | |
1094 tem = call3 (Vminibuffer_completion_table, | |
1095 Fbuffer_string (), | |
1096 Vminibuffer_completion_predicate, | |
1097 Qlambda); | |
1098 | |
488 | 1099 if (NILP (tem)) |
284 | 1100 { /* not an exact match */ |
1101 if (completedp) | |
1102 return 5; | |
1103 else if (auto_help) | |
1104 Fminibuffer_completion_help (); | |
1105 else | |
1106 temp_echo_area_glyphs (" [Next char not unique]"); | |
1107 return 6; | |
1108 } | |
1109 else if (completedp) | |
1110 return 4; | |
1111 /* If the last exact completion and this one were the same, | |
1112 it means we've already given a "Complete but not unique" | |
330 | 1113 message and the user's hit TAB again, so now we give him help. */ |
284 | 1114 last_exact_completion = completion; |
488 | 1115 if (!NILP (last)) |
284 | 1116 { |
1117 tem = Fbuffer_string (); | |
488 | 1118 if (!NILP (Fequal (tem, last))) |
284 | 1119 Fminibuffer_completion_help (); |
1120 } | |
1121 return 3; | |
1122 } | |
1123 | |
330 | 1124 /* Like assoc but assumes KEY is a string, and ignores case if appropriate. */ |
1125 | |
1126 Lisp_Object | |
1127 assoc_for_completion (key, list) | |
1128 register Lisp_Object key; | |
1129 Lisp_Object list; | |
1130 { | |
1131 register Lisp_Object tail; | |
1132 | |
1133 if (completion_ignore_case) | |
1134 key = Fupcase (key); | |
1135 | |
488 | 1136 for (tail = list; !NILP (tail); tail = Fcdr (tail)) |
330 | 1137 { |
1138 register Lisp_Object elt, tem, thiscar; | |
1139 elt = Fcar (tail); | |
1140 if (!CONSP (elt)) continue; | |
1141 thiscar = Fcar (elt); | |
1142 if (XTYPE (thiscar) != Lisp_String) | |
1143 continue; | |
1144 if (completion_ignore_case) | |
1145 thiscar = Fupcase (thiscar); | |
1146 tem = Fequal (thiscar, key); | |
488 | 1147 if (!NILP (tem)) return elt; |
330 | 1148 QUIT; |
1149 } | |
1150 return Qnil; | |
1151 } | |
284 | 1152 |
1153 DEFUN ("minibuffer-complete", Fminibuffer_complete, Sminibuffer_complete, 0, 0, "", | |
6234
46e46e523620
(Fminibuffer_complete, Fminibuffer_complete_word): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
6233
diff
changeset
|
1154 "Complete the minibuffer contents as far as possible.\n\ |
6544
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1155 Return nil if there is no valid completion, else t.\n\ |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1156 If no characters can be completed, display a list of possible completions.\n\ |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1157 If you repeat this command after it displayed such a list,\n\ |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1158 scroll the window of possible completions.") |
284 | 1159 () |
1160 { | |
6544
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1161 register int i; |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1162 Lisp_Object window, tem; |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1163 |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1164 /* If the previous command was not this, then mark the completion |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1165 buffer obsolete. */ |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1166 if (! EQ (last_command, this_command)) |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1167 Vminibuf_scroll_window = Qnil; |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1168 |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1169 window = Vminibuf_scroll_window; |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1170 /* If there's a fresh completion window with a live buffer, |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1171 and this command is repeated, scroll that window. */ |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1172 if (! NILP (window) && ! NILP (XWINDOW (window)->buffer) |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1173 && !NILP (XBUFFER (XWINDOW (window)->buffer)->name)) |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1174 { |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1175 struct buffer *obuf = current_buffer; |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1176 |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1177 Fset_buffer (XWINDOW (window)->buffer); |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1178 tem = Fpos_visible_in_window_p (make_number (ZV), window); |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1179 if (! NILP (tem)) |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1180 /* If end is in view, scroll up to the beginning. */ |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1181 Fset_window_start (window, BEGV); |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1182 else |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1183 /* Else scroll down one screen. */ |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1184 Fscroll_other_window (Qnil); |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1185 |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1186 set_buffer_internal (obuf); |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1187 return Qnil; |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1188 } |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1189 |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
1190 i = do_completion (); |
284 | 1191 switch (i) |
1192 { | |
1193 case 0: | |
1194 return Qnil; | |
1195 | |
1196 case 1: | |
1197 temp_echo_area_glyphs (" [Sole completion]"); | |
1198 break; | |
1199 | |
1200 case 3: | |
1201 temp_echo_area_glyphs (" [Complete, but not unique]"); | |
1202 break; | |
1203 } | |
1204 | |
1205 return Qt; | |
1206 } | |
1207 | |
1208 DEFUN ("minibuffer-complete-and-exit", Fminibuffer_complete_and_exit, | |
1209 Sminibuffer_complete_and_exit, 0, 0, "", | |
1210 "Complete the minibuffer contents, and maybe exit.\n\ | |
1211 Exit if the name is valid with no completion needed.\n\ | |
1212 If name was completed to a valid match,\n\ | |
1213 a repetition of this command will exit.") | |
1214 () | |
1215 { | |
1216 register int i; | |
1217 | |
1218 /* Allow user to specify null string */ | |
1219 if (BEGV == ZV) | |
1220 goto exit; | |
1221 | |
1222 i = do_completion (); | |
1223 switch (i) | |
1224 { | |
1225 case 1: | |
1226 case 3: | |
1227 goto exit; | |
1228 | |
1229 case 4: | |
488 | 1230 if (!NILP (Vminibuffer_completion_confirm)) |
284 | 1231 { |
1232 temp_echo_area_glyphs (" [Confirm]"); | |
1233 return Qnil; | |
1234 } | |
1235 else | |
1236 goto exit; | |
1237 | |
1238 default: | |
1239 return Qnil; | |
1240 } | |
1241 exit: | |
1242 Fthrow (Qexit, Qnil); | |
1243 /* NOTREACHED */ | |
1244 } | |
1245 | |
1246 DEFUN ("minibuffer-complete-word", Fminibuffer_complete_word, Sminibuffer_complete_word, | |
1247 0, 0, "", | |
1248 "Complete the minibuffer contents at most a single word.\n\ | |
1249 After one word is completed as much as possible, a space or hyphen\n\ | |
6234
46e46e523620
(Fminibuffer_complete, Fminibuffer_complete_word): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
6233
diff
changeset
|
1250 is added, provided that matches some possible completion.\n\ |
46e46e523620
(Fminibuffer_complete, Fminibuffer_complete_word): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
6233
diff
changeset
|
1251 Return nil if there is no valid completion, else t.") |
284 | 1252 () |
1253 { | |
1254 Lisp_Object completion, tem; | |
1255 register int i; | |
1256 register unsigned char *completion_string; | |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
1257 struct gcpro gcpro1; |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
1258 |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
1259 /* We keep calling Fbuffer_string rather than arrange for GC to |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
1260 hold onto a pointer to one of the strings thus made. */ |
284 | 1261 |
1262 completion = Ftry_completion (Fbuffer_string (), | |
1263 Vminibuffer_completion_table, | |
1264 Vminibuffer_completion_predicate); | |
488 | 1265 if (NILP (completion)) |
284 | 1266 { |
1267 bitch_at_user (); | |
1268 temp_echo_area_glyphs (" [No match]"); | |
1269 return Qnil; | |
1270 } | |
1271 if (EQ (completion, Qt)) | |
1272 return Qnil; | |
1273 | |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
1274 #if 0 /* How the below code used to look, for reference. */ |
284 | 1275 tem = Fbuffer_string (); |
1276 b = XSTRING (tem)->data; | |
1277 i = ZV - 1 - XSTRING (completion)->size; | |
1278 p = XSTRING (completion)->data; | |
1279 if (i > 0 || | |
1280 0 <= scmp (b, p, ZV - 1)) | |
1281 { | |
1282 i = 1; | |
1283 /* Set buffer to longest match of buffer tail and completion head. */ | |
1284 while (0 <= scmp (b + i, p, ZV - 1 - i)) | |
1285 i++; | |
1286 del_range (1, i + 1); | |
1287 SET_PT (ZV); | |
1288 } | |
1289 #else /* Rewritten code */ | |
1290 { | |
1291 register unsigned char *buffer_string; | |
1292 int buffer_length, completion_length; | |
1293 | |
1294 tem = Fbuffer_string (); | |
4641
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
1295 /* If reading a file name, |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
1296 expand any $ENVVAR refs in the buffer and in TEM. */ |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
1297 if (EQ (Vminibuffer_completion_table, Qread_file_name_internal)) |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
1298 { |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
1299 Lisp_Object substituted; |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
1300 substituted = Fsubstitute_in_file_name (tem); |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
1301 if (! EQ (substituted, tem)) |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
1302 { |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
1303 tem = substituted; |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
1304 Ferase_buffer (); |
4715
494fa3445d1e
(Fminibuffer_complete_word): Pass new arg to insert_from_string*.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1305 insert_from_string (tem, 0, XSTRING (tem)->size, 0); |
4641
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
1306 } |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
1307 } |
284 | 1308 buffer_string = XSTRING (tem)->data; |
1309 completion_string = XSTRING (completion)->data; | |
1310 buffer_length = XSTRING (tem)->size; /* ie ZV - BEGV */ | |
1311 completion_length = XSTRING (completion)->size; | |
1312 i = buffer_length - completion_length; | |
1313 /* Mly: I don't understand what this is supposed to do AT ALL */ | |
1314 if (i > 0 || | |
1315 0 <= scmp (buffer_string, completion_string, buffer_length)) | |
1316 { | |
1317 /* Set buffer to longest match of buffer tail and completion head. */ | |
1318 if (i <= 0) i = 1; | |
1319 buffer_string += i; | |
1320 buffer_length -= i; | |
1321 while (0 <= scmp (buffer_string++, completion_string, buffer_length--)) | |
1322 i++; | |
1323 del_range (1, i + 1); | |
1324 SET_PT (ZV); | |
1325 } | |
1326 } | |
1327 #endif /* Rewritten code */ | |
1328 i = ZV - BEGV; | |
1329 | |
1330 /* If completion finds next char not unique, | |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
1331 consider adding a space or a hyphen. */ |
284 | 1332 if (i == XSTRING (completion)->size) |
1333 { | |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
1334 GCPRO1 (completion); |
284 | 1335 tem = Ftry_completion (concat2 (Fbuffer_string (), build_string (" ")), |
1336 Vminibuffer_completion_table, | |
1337 Vminibuffer_completion_predicate); | |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
1338 UNGCPRO; |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
1339 |
284 | 1340 if (XTYPE (tem) == Lisp_String) |
1341 completion = tem; | |
1342 else | |
1343 { | |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
1344 GCPRO1 (completion); |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
1345 tem = |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
1346 Ftry_completion (concat2 (Fbuffer_string (), build_string ("-")), |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
1347 Vminibuffer_completion_table, |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
1348 Vminibuffer_completion_predicate); |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
1349 UNGCPRO; |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
1350 |
284 | 1351 if (XTYPE (tem) == Lisp_String) |
1352 completion = tem; | |
1353 } | |
1354 } | |
1355 | |
1356 /* Now find first word-break in the stuff found by completion. | |
1357 i gets index in string of where to stop completing. */ | |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
1358 |
284 | 1359 completion_string = XSTRING (completion)->data; |
1360 | |
1361 for (; i < XSTRING (completion)->size; i++) | |
1362 if (SYNTAX (completion_string[i]) != Sword) break; | |
1363 if (i < XSTRING (completion)->size) | |
1364 i = i + 1; | |
1365 | |
1366 /* If got no characters, print help for user. */ | |
1367 | |
1368 if (i == ZV - BEGV) | |
1369 { | |
1370 if (auto_help) | |
1371 Fminibuffer_completion_help (); | |
1372 return Qnil; | |
1373 } | |
1374 | |
1375 /* Otherwise insert in minibuffer the chars we got */ | |
1376 | |
1377 Ferase_buffer (); | |
4715
494fa3445d1e
(Fminibuffer_complete_word): Pass new arg to insert_from_string*.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1378 insert_from_string (completion, 0, i, 1); |
284 | 1379 return Qt; |
1380 } | |
1381 | |
1382 DEFUN ("display-completion-list", Fdisplay_completion_list, Sdisplay_completion_list, | |
1383 1, 1, 0, | |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1384 "Display the list of completions, COMPLETIONS, using `standard-output'.\n\ |
284 | 1385 Each element may be just a symbol or string\n\ |
6161
4a1c5b2c005d
(Fdisplay_completion_list): Restore original buffer
Richard M. Stallman <rms@gnu.org>
parents:
5376
diff
changeset
|
1386 or may be a list of two strings to be printed as if concatenated.\n\ |
4a1c5b2c005d
(Fdisplay_completion_list): Restore original buffer
Richard M. Stallman <rms@gnu.org>
parents:
5376
diff
changeset
|
1387 `standard-output' must be a buffer.\n\ |
4a1c5b2c005d
(Fdisplay_completion_list): Restore original buffer
Richard M. Stallman <rms@gnu.org>
parents:
5376
diff
changeset
|
1388 At the end, run the normal hook `completion-setup-hook'.\n\ |
4a1c5b2c005d
(Fdisplay_completion_list): Restore original buffer
Richard M. Stallman <rms@gnu.org>
parents:
5376
diff
changeset
|
1389 It can find the completion buffer in `standard-output'.") |
284 | 1390 (completions) |
1391 Lisp_Object completions; | |
1392 { | |
1393 register Lisp_Object tail, elt; | |
1394 register int i; | |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1395 int column = 0; |
284 | 1396 /* No GCPRO needed, since (when it matters) every variable |
1397 points to a non-string that is pointed to by COMPLETIONS. */ | |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1398 struct buffer *old = current_buffer; |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1399 if (XTYPE (Vstandard_output) == Lisp_Buffer) |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1400 set_buffer_internal (XBUFFER (Vstandard_output)); |
284 | 1401 |
488 | 1402 if (NILP (completions)) |
4102
dba3acd9972c
(Fdisplay_completion_list): Run completion-setup-hook.
Richard M. Stallman <rms@gnu.org>
parents:
3841
diff
changeset
|
1403 write_string ("There are no possible completions of what you have typed.", |
dba3acd9972c
(Fdisplay_completion_list): Run completion-setup-hook.
Richard M. Stallman <rms@gnu.org>
parents:
3841
diff
changeset
|
1404 -1); |
284 | 1405 else |
1406 { | |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1407 write_string ("Possible completions are:", -1); |
488 | 1408 for (tail = completions, i = 0; !NILP (tail); tail = Fcdr (tail), i++) |
284 | 1409 { |
1410 /* this needs fixing for the case of long completions | |
1411 and/or narrow windows */ | |
1412 /* Sadly, the window it will appear in is not known | |
1413 until after the text has been made. */ | |
1414 if (i & 1) | |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1415 { |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1416 if (XTYPE (Vstandard_output) == Lisp_Buffer) |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1417 Findent_to (make_number (35), make_number (1)); |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1418 else |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1419 { |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1420 do |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1421 { |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1422 write_string (" ", -1); |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1423 column++; |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1424 } |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1425 while (column < 35); |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1426 } |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1427 } |
284 | 1428 else |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1429 { |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1430 Fterpri (Qnil); |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1431 column = 0; |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1432 } |
284 | 1433 elt = Fcar (tail); |
1434 if (CONSP (elt)) | |
1435 { | |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1436 if (XTYPE (Vstandard_output) != Lisp_Buffer) |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1437 { |
737 | 1438 Lisp_Object tem; |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1439 tem = Flength (Fcar (elt)); |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1440 column += XINT (tem); |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1441 tem = Flength (Fcar (Fcdr (elt))); |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1442 column += XINT (tem); |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1443 } |
284 | 1444 Fprinc (Fcar (elt), Qnil); |
1445 Fprinc (Fcar (Fcdr (elt)), Qnil); | |
1446 } | |
1447 else | |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1448 { |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1449 if (XTYPE (Vstandard_output) != Lisp_Buffer) |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1450 { |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1451 Lisp_Object tem; |
1933
63ba4f555b90
* minibuf.c (Fdisplay_completion_list): Pass the proper number of
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1452 tem = Flength (elt); |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1453 column += XINT (tem); |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1454 } |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1455 Fprinc (elt, Qnil); |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1456 } |
284 | 1457 } |
1458 } | |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
1459 |
6161
4a1c5b2c005d
(Fdisplay_completion_list): Restore original buffer
Richard M. Stallman <rms@gnu.org>
parents:
5376
diff
changeset
|
1460 if (XTYPE (Vstandard_output) == Lisp_Buffer) |
4a1c5b2c005d
(Fdisplay_completion_list): Restore original buffer
Richard M. Stallman <rms@gnu.org>
parents:
5376
diff
changeset
|
1461 set_buffer_internal (old); |
4a1c5b2c005d
(Fdisplay_completion_list): Restore original buffer
Richard M. Stallman <rms@gnu.org>
parents:
5376
diff
changeset
|
1462 |
4102
dba3acd9972c
(Fdisplay_completion_list): Run completion-setup-hook.
Richard M. Stallman <rms@gnu.org>
parents:
3841
diff
changeset
|
1463 if (!NILP (Vrun_hooks)) |
dba3acd9972c
(Fdisplay_completion_list): Run completion-setup-hook.
Richard M. Stallman <rms@gnu.org>
parents:
3841
diff
changeset
|
1464 call1 (Vrun_hooks, intern ("completion-setup-hook")); |
dba3acd9972c
(Fdisplay_completion_list): Run completion-setup-hook.
Richard M. Stallman <rms@gnu.org>
parents:
3841
diff
changeset
|
1465 |
284 | 1466 return Qnil; |
1467 } | |
1468 | |
1469 DEFUN ("minibuffer-completion-help", Fminibuffer_completion_help, Sminibuffer_completion_help, | |
1470 0, 0, "", | |
1471 "Display a list of possible completions of the current minibuffer contents.") | |
1472 () | |
1473 { | |
1474 Lisp_Object completions; | |
1475 | |
1476 message ("Making completion list..."); | |
1477 completions = Fall_completions (Fbuffer_string (), | |
1478 Vminibuffer_completion_table, | |
1479 Vminibuffer_completion_predicate); | |
1480 echo_area_glyphs = 0; | |
1481 | |
488 | 1482 if (NILP (completions)) |
284 | 1483 { |
1484 bitch_at_user (); | |
1485 temp_echo_area_glyphs (" [No completions]"); | |
1486 } | |
1487 else | |
1488 internal_with_output_to_temp_buffer ("*Completions*", | |
1489 Fdisplay_completion_list, | |
1490 Fsort (completions, Qstring_lessp)); | |
1491 return Qnil; | |
1492 } | |
1493 | |
1494 DEFUN ("self-insert-and-exit", Fself_insert_and_exit, Sself_insert_and_exit, 0, 0, "", | |
1495 "Terminate minibuffer input.") | |
1496 () | |
1497 { | |
1498 if (XTYPE (last_command_char) == Lisp_Int) | |
1499 internal_self_insert (last_command_char, 0); | |
1500 else | |
1501 bitch_at_user (); | |
1502 | |
1503 Fthrow (Qexit, Qnil); | |
1504 } | |
1505 | |
1506 DEFUN ("exit-minibuffer", Fexit_minibuffer, Sexit_minibuffer, 0, 0, "", | |
1507 "Terminate this minibuffer argument.") | |
1508 () | |
1509 { | |
1510 Fthrow (Qexit, Qnil); | |
1511 } | |
1512 | |
1513 DEFUN ("minibuffer-depth", Fminibuffer_depth, Sminibuffer_depth, 0, 0, 0, | |
1514 "Return current depth of activations of minibuffer, a nonnegative integer.") | |
1515 () | |
1516 { | |
1517 return make_number (minibuf_level); | |
1518 } | |
1519 | |
6590
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1520 DEFUN ("minibuffer-prompt", Fminibuffer_prompt, Sminibuffer_prompt, 0, 0, 0, |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1521 "Return the prompt string of the currently-active minibuffer.\n\ |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1522 If no minibuffer is active, return nil.") |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1523 () |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1524 { |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1525 if (!minibuf_prompt) |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1526 return Qnil; |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1527 return build_string (minibuf_prompt); |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1528 } |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1529 |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1530 DEFUN ("minibuffer-prompt-width", Fminibuffer_prompt_width, |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1531 Sminibuffer_prompt_width, 0, 0, 0, |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1532 "Return the display width of the minibuffer prompt.") |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1533 () |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1534 { |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1535 Lisp_Object width; |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1536 XFASTINT (width) = minibuf_prompt_width; |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1537 return width; |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1538 } |
284 | 1539 |
1540 init_minibuf_once () | |
1541 { | |
1542 Vminibuffer_list = Qnil; | |
1543 staticpro (&Vminibuffer_list); | |
1544 } | |
1545 | |
1546 syms_of_minibuf () | |
1547 { | |
1548 minibuf_level = 0; | |
1549 minibuf_prompt = 0; | |
1550 minibuf_save_vector_size = 5; | |
1551 minibuf_save_vector = (struct minibuf_save_data *) malloc (5 * sizeof (struct minibuf_save_data)); | |
1552 | |
4641
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
1553 Qread_file_name_internal = intern ("read-file-name-internal"); |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
1554 staticpro (&Qread_file_name_internal); |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
1555 |
284 | 1556 Qminibuffer_completion_table = intern ("minibuffer-completion-table"); |
1557 staticpro (&Qminibuffer_completion_table); | |
1558 | |
1559 Qminibuffer_completion_confirm = intern ("minibuffer-completion-confirm"); | |
1560 staticpro (&Qminibuffer_completion_confirm); | |
1561 | |
1562 Qminibuffer_completion_predicate = intern ("minibuffer-completion-predicate"); | |
1563 staticpro (&Qminibuffer_completion_predicate); | |
1564 | |
1565 staticpro (&last_minibuf_string); | |
1566 last_minibuf_string = Qnil; | |
1567 | |
1568 Quser_variable_p = intern ("user-variable-p"); | |
1569 staticpro (&Quser_variable_p); | |
1570 | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1571 Qminibuffer_history = intern ("minibuffer-history"); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1572 staticpro (&Qminibuffer_history); |
284 | 1573 |
4550
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
1574 Qminibuffer_setup_hook = intern ("minibuffer-setup-hook"); |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
1575 staticpro (&Qminibuffer_setup_hook); |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
1576 |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
1577 DEFVAR_LISP ("minibuffer-setup-hook", &Vminibuffer_setup_hook, |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
1578 "Normal hook run just after entry to minibuffer."); |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
1579 Vminibuffer_setup_hook = Qnil; |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
1580 |
284 | 1581 DEFVAR_BOOL ("completion-auto-help", &auto_help, |
1582 "*Non-nil means automatically provide help for invalid completion input."); | |
1583 auto_help = 1; | |
1584 | |
1585 DEFVAR_BOOL ("completion-ignore-case", &completion_ignore_case, | |
1586 "Non-nil means don't consider case significant in completion."); | |
1587 completion_ignore_case = 0; | |
1588 | |
1589 DEFVAR_BOOL ("enable-recursive-minibuffers", &enable_recursive_minibuffers, | |
1590 "*Non-nil means to allow minibuffer commands while in the minibuffer.\n\ | |
1591 More precisely, this variable makes a difference when the minibuffer window\n\ | |
1592 is the selected window. If you are in some other window, minibuffer commands\n\ | |
1593 are allowed even if a minibuffer is active."); | |
1594 enable_recursive_minibuffers = 0; | |
1595 | |
1596 DEFVAR_LISP ("minibuffer-completion-table", &Vminibuffer_completion_table, | |
1597 "Alist or obarray used for completion in the minibuffer.\n\ | |
1598 This becomes the ALIST argument to `try-completion' and `all-completion'.\n\ | |
1599 \n\ | |
1600 The value may alternatively be a function, which is given three arguments:\n\ | |
1601 STRING, the current buffer contents;\n\ | |
1602 PREDICATE, the predicate for filtering possible matches;\n\ | |
1603 CODE, which says what kind of things to do.\n\ | |
1604 CODE can be nil, t or `lambda'.\n\ | |
1605 nil means to return the best completion of STRING, or nil if there is none.\n\ | |
1606 t means to return a list of all possible completions of STRING.\n\ | |
1607 `lambda' means to return t if STRING is a valid completion as it stands."); | |
1608 Vminibuffer_completion_table = Qnil; | |
1609 | |
1610 DEFVAR_LISP ("minibuffer-completion-predicate", &Vminibuffer_completion_predicate, | |
1611 "Within call to `completing-read', this holds the PREDICATE argument."); | |
1612 Vminibuffer_completion_predicate = Qnil; | |
1613 | |
1614 DEFVAR_LISP ("minibuffer-completion-confirm", &Vminibuffer_completion_confirm, | |
1615 "Non-nil => demand confirmation of completion before exiting minibuffer."); | |
1616 Vminibuffer_completion_confirm = Qnil; | |
1617 | |
1618 DEFVAR_LISP ("minibuffer-help-form", &Vminibuffer_help_form, | |
1619 "Value that `help-form' takes on inside the minibuffer."); | |
1620 Vminibuffer_help_form = Qnil; | |
1621 | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1622 DEFVAR_LISP ("minibuffer-history-variable", &Vminibuffer_history_variable, |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1623 "History list symbol to add minibuffer values to.\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1624 Each minibuffer output is added with\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1625 (set minibuffer-history-variable\n\ |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1626 (cons STRING (symbol-value minibuffer-history-variable)))"); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1627 XFASTINT (Vminibuffer_history_variable) = 0; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1628 |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1629 DEFVAR_LISP ("minibuffer-history-position", &Vminibuffer_history_position, |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1630 "Current position of redoing in the history list."); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1631 Vminibuffer_history_position = Qnil; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1632 |
5238
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
1633 DEFVAR_BOOL ("minibuffer-auto-raise", &minibuffer_auto_raise, |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
1634 "*Non-nil means entering the minibuffer raises the minibuffer's frame."); |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
1635 minibuffer_auto_raise = 0; |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
1636 |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1637 DEFVAR_LISP ("completion-regexp-list", &Vcompletion_regexp_list, |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1638 "List of regexps that should restrict possible completions."); |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1639 Vcompletion_regexp_list = Qnil; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1640 |
284 | 1641 defsubr (&Sread_from_minibuffer); |
1642 defsubr (&Seval_minibuffer); | |
1643 defsubr (&Sread_minibuffer); | |
1644 defsubr (&Sread_string); | |
1645 defsubr (&Sread_command); | |
1646 defsubr (&Sread_variable); | |
1647 defsubr (&Sread_buffer); | |
1648 defsubr (&Sread_no_blanks_input); | |
1649 defsubr (&Sminibuffer_depth); | |
6590
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1650 defsubr (&Sminibuffer_prompt); |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
1651 defsubr (&Sminibuffer_prompt_width); |
284 | 1652 |
1653 defsubr (&Stry_completion); | |
1654 defsubr (&Sall_completions); | |
1655 defsubr (&Scompleting_read); | |
1656 defsubr (&Sminibuffer_complete); | |
1657 defsubr (&Sminibuffer_complete_word); | |
1658 defsubr (&Sminibuffer_complete_and_exit); | |
1659 defsubr (&Sdisplay_completion_list); | |
1660 defsubr (&Sminibuffer_completion_help); | |
1661 | |
1662 defsubr (&Sself_insert_and_exit); | |
1663 defsubr (&Sexit_minibuffer); | |
1664 | |
1665 } | |
1666 | |
1667 keys_of_minibuf () | |
1668 { | |
1669 initial_define_key (Vminibuffer_local_map, Ctl ('g'), | |
1670 "abort-recursive-edit"); | |
1671 initial_define_key (Vminibuffer_local_map, Ctl ('m'), | |
1672 "exit-minibuffer"); | |
1673 initial_define_key (Vminibuffer_local_map, Ctl ('j'), | |
1674 "exit-minibuffer"); | |
1675 | |
1676 initial_define_key (Vminibuffer_local_ns_map, Ctl ('g'), | |
1677 "abort-recursive-edit"); | |
1678 initial_define_key (Vminibuffer_local_ns_map, Ctl ('m'), | |
1679 "exit-minibuffer"); | |
1680 initial_define_key (Vminibuffer_local_ns_map, Ctl ('j'), | |
1681 "exit-minibuffer"); | |
1682 | |
1683 initial_define_key (Vminibuffer_local_ns_map, ' ', | |
1684 "exit-minibuffer"); | |
1685 initial_define_key (Vminibuffer_local_ns_map, '\t', | |
1686 "exit-minibuffer"); | |
1687 initial_define_key (Vminibuffer_local_ns_map, '?', | |
1688 "self-insert-and-exit"); | |
1689 | |
1690 initial_define_key (Vminibuffer_local_completion_map, Ctl ('g'), | |
1691 "abort-recursive-edit"); | |
1692 initial_define_key (Vminibuffer_local_completion_map, Ctl ('m'), | |
1693 "exit-minibuffer"); | |
1694 initial_define_key (Vminibuffer_local_completion_map, Ctl ('j'), | |
1695 "exit-minibuffer"); | |
1696 | |
1697 initial_define_key (Vminibuffer_local_completion_map, '\t', | |
1698 "minibuffer-complete"); | |
1699 initial_define_key (Vminibuffer_local_completion_map, ' ', | |
1700 "minibuffer-complete-word"); | |
1701 initial_define_key (Vminibuffer_local_completion_map, '?', | |
1702 "minibuffer-completion-help"); | |
1703 | |
1704 initial_define_key (Vminibuffer_local_must_match_map, Ctl ('g'), | |
1705 "abort-recursive-edit"); | |
1706 initial_define_key (Vminibuffer_local_must_match_map, Ctl ('m'), | |
1707 "minibuffer-complete-and-exit"); | |
1708 initial_define_key (Vminibuffer_local_must_match_map, Ctl ('j'), | |
1709 "minibuffer-complete-and-exit"); | |
1710 initial_define_key (Vminibuffer_local_must_match_map, '\t', | |
1711 "minibuffer-complete"); | |
1712 initial_define_key (Vminibuffer_local_must_match_map, ' ', | |
1713 "minibuffer-complete-word"); | |
1714 initial_define_key (Vminibuffer_local_must_match_map, '?', | |
1715 "minibuffer-completion-help"); | |
1716 } |