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