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