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