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