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