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