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