Mercurial > emacs
annotate src/minibuf.c @ 91620:acb32817f0e8
Use "do...while (0)", not "if (1)..else" in macro definitions.
author | Jan Djärv <jan.h.d@swipnet.se> |
---|---|
date | Thu, 07 Feb 2008 12:51:51 +0000 |
parents | 606f2d163a64 |
children | 620496d91e55 |
rev | line source |
---|---|
284 | 1 /* Minibuffer input and completion. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64575
diff
changeset
|
2 Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68261
diff
changeset
|
3 2001, 2002, 2003, 2004, 2005, |
79759 | 4 2006, 2007, 2008 Free Software Foundation, Inc. |
284 | 5 |
6 This file is part of GNU Emacs. | |
7 | |
8 GNU Emacs is free software; you can redistribute it and/or modify | |
9 it under the terms of the GNU General Public License as published by | |
78260
922696f363b0
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
77326
diff
changeset
|
10 the Free Software Foundation; either version 3, or (at your option) |
284 | 11 any later version. |
12 | |
13 GNU Emacs is distributed in the hope that it will be useful, | |
14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 GNU General Public License for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
19 along with GNU Emacs; see the file COPYING. If not, write to | |
64084 | 20 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
21 Boston, MA 02110-1301, USA. */ | |
284 | 22 |
23 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4641
diff
changeset
|
24 #include <config.h> |
25788
7796a636f039
(toplevel): Move include of stdio.h to other includes.
Gerd Moellmann <gerd@gnu.org>
parents:
25738
diff
changeset
|
25 #include <stdio.h> |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
26 |
284 | 27 #include "lisp.h" |
28 #include "commands.h" | |
29 #include "buffer.h" | |
88351
aac41b50c875
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43573
diff
changeset
|
30 #include "character.h" |
284 | 31 #include "dispextern.h" |
31102
6a0caa788013
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30976
diff
changeset
|
32 #include "keyboard.h" |
765 | 33 #include "frame.h" |
284 | 34 #include "window.h" |
35 #include "syntax.h" | |
34224
5a5d98ee4078
* minibuf.c: Include intervals.h.
Ken Raeburn <raeburn@raeburn.org>
parents:
33682
diff
changeset
|
36 #include "intervals.h" |
39697
0b986bb45526
Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
37 #include "keymap.h" |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
53364
diff
changeset
|
38 #include "termhooks.h" |
284 | 39 |
6233
1e90a9197a2a
(temp_echo_area_glyphs): Use quit_char, not C-g.
Karl Heuer <kwzh@gnu.org>
parents:
6207
diff
changeset
|
40 extern int quit_char; |
1e90a9197a2a
(temp_echo_area_glyphs): Use quit_char, not C-g.
Karl Heuer <kwzh@gnu.org>
parents:
6207
diff
changeset
|
41 |
284 | 42 /* 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
|
43 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
|
44 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
|
45 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
|
46 minibuffer recursions are encountered. */ |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
47 |
284 | 48 Lisp_Object Vminibuffer_list; |
49 | |
7952
9e2e0fdd1710
(minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents:
7836
diff
changeset
|
50 /* Data to remember during recursive minibuffer invocations */ |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
51 |
7952
9e2e0fdd1710
(minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents:
7836
diff
changeset
|
52 Lisp_Object minibuf_save_list; |
284 | 53 |
54 /* Depth in minibuffer invocations. */ | |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
55 |
284 | 56 int minibuf_level; |
57 | |
15967
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
58 /* Nonzero means display completion help for invalid input. */ |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
59 |
31105
0c34d4d76e65
(Vcompletion_auto_help): Renamed from `auto_help'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31102
diff
changeset
|
60 Lisp_Object Vcompletion_auto_help; |
284 | 61 |
15967
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
62 /* The maximum length of a minibuffer history. */ |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
63 |
15967
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
64 Lisp_Object Qhistory_length, Vhistory_length; |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
65 |
57016
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
66 /* No duplicates in history. */ |
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
67 |
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
68 int history_delete_duplicates; |
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
69 |
71120
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
70 /* Non-nil means add new input to history. */ |
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
71 |
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
72 Lisp_Object Vhistory_add_new_input; |
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
73 |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
74 /* Fread_minibuffer leaves the input here as a string. */ |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
75 |
284 | 76 Lisp_Object last_minibuf_string; |
77 | |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
78 /* Nonzero means let functions called when within a minibuffer |
284 | 79 invoke recursive minibuffers (to read arguments, or whatever) */ |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
80 |
284 | 81 int enable_recursive_minibuffers; |
82 | |
18444
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
83 /* Nonzero means don't ignore text properties |
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
84 in Fread_from_minibuffer. */ |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
85 |
18444
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
86 int minibuffer_allow_text_properties; |
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
87 |
284 | 88 /* help-form is bound to this while in the minibuffer. */ |
89 | |
90 Lisp_Object Vminibuffer_help_form; | |
91 | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
92 /* 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
|
93 |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
94 Lisp_Object Vminibuffer_history_variable; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
95 |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
96 /* 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
|
97 |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
98 Lisp_Object Vminibuffer_history_position; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
99 |
33682
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
100 /* Text properties that are added to minibuffer prompts. |
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
101 These are in addition to the basic `field' property, and stickiness |
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
102 properties. */ |
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
103 |
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
104 Lisp_Object Vminibuffer_prompt_properties; |
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
105 |
22010
547e4c0a42c0
(Qbuffer_name_history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21854
diff
changeset
|
106 Lisp_Object Qminibuffer_history, Qbuffer_name_history; |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
107 |
4641
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
108 Lisp_Object Qread_file_name_internal; |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
109 |
6742
ef62a96ce830
(Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
6720
diff
changeset
|
110 /* 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
|
111 |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
112 Lisp_Object Qminibuffer_setup_hook, Vminibuffer_setup_hook; |
6742
ef62a96ce830
(Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
6720
diff
changeset
|
113 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
|
114 |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
115 /* Function to call to read a buffer name. */ |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
116 Lisp_Object Vread_buffer_function; |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
117 |
284 | 118 /* Nonzero means completion ignores case. */ |
119 | |
120 int completion_ignore_case; | |
79108
f197bd049c23
(Qcompletion_ignore_case): New Lisp_Object.
Glenn Morris <rgm@gnu.org>
parents:
78260
diff
changeset
|
121 Lisp_Object Qcompletion_ignore_case; |
284 | 122 |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
123 /* List of regexps that should restrict possible completions. */ |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
124 |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
125 Lisp_Object Vcompletion_regexp_list; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
126 |
5238
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
127 /* 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
|
128 is entered. */ |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
129 |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
130 int minibuffer_auto_raise; |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
131 |
284 | 132 /* If last completion attempt reported "Complete but not unique" |
133 then this is the string completed then; otherwise this is nil. */ | |
134 | |
135 static Lisp_Object last_exact_completion; | |
136 | |
73450
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
137 /* Keymap for reading expressions. */ |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
138 Lisp_Object Vread_expression_map; |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
139 |
75558
f7b5b15084ef
(read_minibuf): Save and clear Vminibuffer_completing_file_name.
Richard M. Stallman <rms@gnu.org>
parents:
75475
diff
changeset
|
140 Lisp_Object Vminibuffer_completion_table, Qminibuffer_completion_table; |
f7b5b15084ef
(read_minibuf): Save and clear Vminibuffer_completing_file_name.
Richard M. Stallman <rms@gnu.org>
parents:
75475
diff
changeset
|
141 Lisp_Object Vminibuffer_completion_predicate, Qminibuffer_completion_predicate; |
f7b5b15084ef
(read_minibuf): Save and clear Vminibuffer_completing_file_name.
Richard M. Stallman <rms@gnu.org>
parents:
75475
diff
changeset
|
142 Lisp_Object Vminibuffer_completion_confirm, Qminibuffer_completion_confirm; |
f7b5b15084ef
(read_minibuf): Save and clear Vminibuffer_completing_file_name.
Richard M. Stallman <rms@gnu.org>
parents:
75475
diff
changeset
|
143 Lisp_Object Vminibuffer_completing_file_name; |
f7b5b15084ef
(read_minibuf): Save and clear Vminibuffer_completing_file_name.
Richard M. Stallman <rms@gnu.org>
parents:
75475
diff
changeset
|
144 |
23448
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
145 Lisp_Object Quser_variable_p; |
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
146 |
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
147 Lisp_Object Qminibuffer_default; |
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
148 |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
149 Lisp_Object Qcurrent_input_method, Qactivate_input_method; |
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
150 |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
151 Lisp_Object Qcase_fold_search; |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
152 |
73450
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
153 Lisp_Object Qread_expression_history; |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
154 |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
155 extern Lisp_Object Voverriding_local_map; |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
156 |
23448
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
157 extern Lisp_Object Qmouse_face; |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
158 |
26059
2a7f35e0072b
(Fminibuffer_complete_and_exit): Supply value for new
Gerd Moellmann <gerd@gnu.org>
parents:
25836
diff
changeset
|
159 extern Lisp_Object Qfield; |
284 | 160 |
13397
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
161 /* 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
|
162 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
|
163 or when a minibuffer exits. */ |
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
164 |
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
165 void |
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
166 choose_minibuf_frame () |
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
167 { |
25673
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
168 if (FRAMEP (selected_frame) |
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
169 && FRAME_LIVE_P (XFRAME (selected_frame)) |
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
170 && !EQ (minibuf_window, XFRAME (selected_frame)->minibuffer_window)) |
13397
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
171 { |
25673
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
172 struct frame *sf = XFRAME (selected_frame); |
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
173 Lisp_Object buffer; |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
174 |
13397
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
175 /* 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
|
176 window anymore. */ |
25673
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
177 if (NILP (sf->minibuffer_window)) |
13397
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
178 abort (); |
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
179 |
25673
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
180 /* Under X, we come here with minibuf_window being the |
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
181 minibuffer window of the unused termcap window created in |
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
182 init_window_once. That window doesn't have a buffer. */ |
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
183 buffer = XWINDOW (minibuf_window)->buffer; |
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
184 if (BUFFERP (buffer)) |
51200
be76b5735f96
Update Fset_window_buffer usage.
Kim F. Storm <storm@cua.dk>
parents:
51048
diff
changeset
|
185 Fset_window_buffer (sf->minibuffer_window, buffer, Qnil); |
25673
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
186 minibuf_window = sf->minibuffer_window; |
13397
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
187 } |
16475
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
188 |
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
189 /* Make sure no other frame has a minibuffer as its selected window, |
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
190 because the text would not be displayed in it, and that would be |
16564
83d580ba04cf
(choose_minibuf_frame): Don't change selected_frame's
Richard M. Stallman <rms@gnu.org>
parents:
16475
diff
changeset
|
191 confusing. Only allow the selected frame to do this, |
83d580ba04cf
(choose_minibuf_frame): Don't change selected_frame's
Richard M. Stallman <rms@gnu.org>
parents:
16475
diff
changeset
|
192 and that only if the minibuffer is active. */ |
16475
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
193 { |
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
194 Lisp_Object tail, frame; |
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
195 |
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
196 FOR_EACH_FRAME (tail, frame) |
16564
83d580ba04cf
(choose_minibuf_frame): Don't change selected_frame's
Richard M. Stallman <rms@gnu.org>
parents:
16475
diff
changeset
|
197 if (MINI_WINDOW_P (XWINDOW (FRAME_SELECTED_WINDOW (XFRAME (frame)))) |
25673
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
198 && !(EQ (frame, selected_frame) |
16564
83d580ba04cf
(choose_minibuf_frame): Don't change selected_frame's
Richard M. Stallman <rms@gnu.org>
parents:
16475
diff
changeset
|
199 && minibuf_level > 0)) |
16475
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
200 Fset_frame_selected_window (frame, Fframe_first_window (frame)); |
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
201 } |
13397
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
202 } |
14435
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
203 |
18904
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
204 Lisp_Object |
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
205 choose_minibuf_frame_1 (ignore) |
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
206 Lisp_Object ignore; |
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
207 { |
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
208 choose_minibuf_frame (); |
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
209 return Qnil; |
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
210 } |
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
211 |
14435
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
212 DEFUN ("set-minibuffer-window", Fset_minibuffer_window, |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
213 Sset_minibuffer_window, 1, 1, 0, |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
214 doc: /* Specify which minibuffer window to use for the minibuffer. |
53364
d4539e5181a1
(Fset_minibuffer_window): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53312
diff
changeset
|
215 This affects where the minibuffer is displayed if you put text in it |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
216 without invoking the usual minibuffer commands. */) |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
217 (window) |
14435
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
218 Lisp_Object window; |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
219 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40403
diff
changeset
|
220 CHECK_WINDOW (window); |
14435
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
221 if (! MINI_WINDOW_P (XWINDOW (window))) |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
222 error ("Window is not a minibuffer window"); |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
223 |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
224 minibuf_window = window; |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
225 |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
226 return window; |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
227 } |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
228 |
13397
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
229 |
284 | 230 /* Actual minibuffer invocation. */ |
231 | |
20584
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
232 static Lisp_Object read_minibuf_unwind P_ ((Lisp_Object)); |
55795
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
233 static Lisp_Object run_exit_minibuf_hook P_ ((Lisp_Object)); |
20584
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
234 static Lisp_Object read_minibuf P_ ((Lisp_Object, Lisp_Object, |
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
235 Lisp_Object, Lisp_Object, |
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
236 int, Lisp_Object, |
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
237 Lisp_Object, Lisp_Object, |
70930
f3ddca90b6b1
(read_minibuf): Remove arg KEEP_ALL. Callers changed.
Juri Linkov <juri@jurta.org>
parents:
70499
diff
changeset
|
238 int, int)); |
26320 | 239 static Lisp_Object read_minibuf_noninteractive P_ ((Lisp_Object, Lisp_Object, |
240 Lisp_Object, Lisp_Object, | |
241 int, Lisp_Object, | |
242 Lisp_Object, Lisp_Object, | |
243 int, int)); | |
244 static Lisp_Object string_to_object P_ ((Lisp_Object, Lisp_Object)); | |
245 | |
246 | |
247 /* Read a Lisp object from VAL and return it. If VAL is an empty | |
248 string, and DEFALT is a string, read from DEFALT instead of VAL. */ | |
249 | |
250 static Lisp_Object | |
251 string_to_object (val, defalt) | |
252 Lisp_Object val, defalt; | |
253 { | |
254 struct gcpro gcpro1, gcpro2; | |
255 Lisp_Object expr_and_pos; | |
256 int pos; | |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
257 |
26320 | 258 GCPRO2 (val, defalt); |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
259 |
85516
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
260 if (STRINGP (val) && SCHARS (val) == 0) |
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
261 { |
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
262 if (STRINGP (defalt)) |
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
263 val = defalt; |
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
264 else if (CONSP (defalt) && STRINGP (XCAR (defalt))) |
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
265 val = XCAR (defalt); |
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
266 } |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
267 |
26320 | 268 expr_and_pos = Fread_from_string (val, Qnil, Qnil); |
269 pos = XINT (Fcdr (expr_and_pos)); | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
270 if (pos != SCHARS (val)) |
26320 | 271 { |
272 /* Ignore trailing whitespace; any other trailing junk | |
273 is an error. */ | |
274 int i; | |
275 pos = string_char_to_byte (val, pos); | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
276 for (i = pos; i < SBYTES (val); i++) |
26320 | 277 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
278 int c = SREF (val, i); |
26320 | 279 if (c != ' ' && c != '\t' && c != '\n') |
280 error ("Trailing garbage following expression"); | |
281 } | |
282 } | |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
283 |
26320 | 284 val = Fcar (expr_and_pos); |
285 RETURN_UNGCPRO (val); | |
286 } | |
287 | |
288 | |
289 /* Like read_minibuf but reading from stdin. This function is called | |
290 from read_minibuf to do the job if noninteractive. */ | |
291 | |
292 static Lisp_Object | |
293 read_minibuf_noninteractive (map, initial, prompt, backup_n, expflag, | |
294 histvar, histpos, defalt, allow_props, | |
295 inherit_input_method) | |
296 Lisp_Object map; | |
297 Lisp_Object initial; | |
298 Lisp_Object prompt; | |
299 Lisp_Object backup_n; | |
300 int expflag; | |
301 Lisp_Object histvar; | |
302 Lisp_Object histpos; | |
303 Lisp_Object defalt; | |
304 int allow_props; | |
305 int inherit_input_method; | |
306 { | |
307 int size, len; | |
308 char *line, *s; | |
309 Lisp_Object val; | |
310 | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
311 fprintf (stdout, "%s", SDATA (prompt)); |
26320 | 312 fflush (stdout); |
313 | |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31140
diff
changeset
|
314 val = Qnil; |
26320 | 315 size = 100; |
316 len = 0; | |
317 line = (char *) xmalloc (size * sizeof *line); | |
318 while ((s = fgets (line + len, size - len, stdin)) != NULL | |
319 && (len = strlen (line), | |
320 len == size - 1 && line[len - 1] != '\n')) | |
321 { | |
322 size *= 2; | |
323 line = (char *) xrealloc (line, size); | |
324 } | |
325 | |
326 if (s) | |
327 { | |
328 len = strlen (line); | |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
329 |
26320 | 330 if (len > 0 && line[len - 1] == '\n') |
331 line[--len] = '\0'; | |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
332 |
26320 | 333 val = build_string (line); |
334 xfree (line); | |
335 } | |
336 else | |
337 { | |
338 xfree (line); | |
339 error ("Error reading from stdin"); | |
340 } | |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
341 |
26320 | 342 /* If Lisp form desired instead of string, parse it. */ |
343 if (expflag) | |
85516
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
344 val = string_to_object (val, CONSP (defalt) ? XCAR (defalt) : defalt); |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
345 |
26320 | 346 return val; |
347 } | |
46019
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
348 |
46877
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
349 DEFUN ("minibufferp", Fminibufferp, |
47620
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
350 Sminibufferp, 0, 1, 0, |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
351 doc: /* Return t if BUFFER is a minibuffer. |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
352 No argument or nil as argument means use current buffer as BUFFER. |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
353 BUFFER can be a buffer or a buffer name. */) |
47620
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
354 (buffer) |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
355 Lisp_Object buffer; |
46877
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
356 { |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
357 Lisp_Object tem; |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
358 |
47620
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
359 if (NILP (buffer)) |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
360 buffer = Fcurrent_buffer (); |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
361 else if (STRINGP (buffer)) |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
362 buffer = Fget_buffer (buffer); |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
363 else |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
364 CHECK_BUFFER (buffer); |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
365 |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
366 tem = Fmemq (buffer, Vminibuffer_list); |
46877
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
367 return ! NILP (tem) ? Qt : Qnil; |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
368 } |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
369 |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
370 DEFUN ("minibuffer-prompt-end", Fminibuffer_prompt_end, |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
371 Sminibuffer_prompt_end, 0, 0, 0, |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
372 doc: /* Return the buffer position of the end of the minibuffer prompt. |
64575
ea5296a45331
(Fminibuffer_prompt_end, Feval_minibuffer): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
64467
diff
changeset
|
373 Return (point-min) if current buffer is not a minibuffer. */) |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
374 () |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
375 { |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
376 /* This function is written to be most efficient when there's a prompt. */ |
46877
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
377 Lisp_Object beg, end, tem; |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
378 beg = make_number (BEGV); |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
379 |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
380 tem = Fmemq (Fcurrent_buffer (), Vminibuffer_list); |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
381 if (NILP (tem)) |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
382 return beg; |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
383 |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
384 end = Ffield_end (beg, Qnil, Qnil); |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
385 |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
386 if (XINT (end) == ZV && NILP (Fget_char_property (beg, Qfield, Qnil))) |
39646
0630a03f4079
* minibuf.c (Fminibuffer_prompt_end): Don't apply make_number to a Lisp_Object.
Ken Raeburn <raeburn@raeburn.org>
parents:
39595
diff
changeset
|
387 return beg; |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
388 else |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
389 return end; |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
390 } |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
391 |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
392 DEFUN ("minibuffer-contents", Fminibuffer_contents, |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
393 Sminibuffer_contents, 0, 0, 0, |
42881 | 394 doc: /* Return the user input in a minibuffer as a string. |
77326
58d40e42dfe4
(Fminibuffer_contents, Fminibuffer_contents_no_properties,
Juanma Barranquero <lekktu@gmail.com>
parents:
76384
diff
changeset
|
395 If the current buffer is not a minibuffer, return its entire contents. */) |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
396 () |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
397 { |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
398 int prompt_end = XINT (Fminibuffer_prompt_end ()); |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
399 return make_buffer_string (prompt_end, ZV, 1); |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
400 } |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
401 |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
402 DEFUN ("minibuffer-contents-no-properties", Fminibuffer_contents_no_properties, |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
403 Sminibuffer_contents_no_properties, 0, 0, 0, |
42881 | 404 doc: /* Return the user input in a minibuffer as a string, without text-properties. |
77326
58d40e42dfe4
(Fminibuffer_contents, Fminibuffer_contents_no_properties,
Juanma Barranquero <lekktu@gmail.com>
parents:
76384
diff
changeset
|
405 If the current buffer is not a minibuffer, return its entire contents. */) |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
406 () |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
407 { |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
408 int prompt_end = XINT (Fminibuffer_prompt_end ()); |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
409 return make_buffer_string (prompt_end, ZV, 0); |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
410 } |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
411 |
67618
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
412 DEFUN ("minibuffer-completion-contents", Fminibuffer_completion_contents, |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
413 Sminibuffer_completion_contents, 0, 0, 0, |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
414 doc: /* Return the user input in a minibuffer before point as a string. |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
415 That is what completion commands operate on. |
77326
58d40e42dfe4
(Fminibuffer_contents, Fminibuffer_contents_no_properties,
Juanma Barranquero <lekktu@gmail.com>
parents:
76384
diff
changeset
|
416 If the current buffer is not a minibuffer, return its entire contents. */) |
67618
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
417 () |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
418 { |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
419 int prompt_end = XINT (Fminibuffer_prompt_end ()); |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
420 if (PT < prompt_end) |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
421 error ("Cannot do completion in the prompt"); |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
422 return make_buffer_string (prompt_end, PT, 1); |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
423 } |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
424 |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
425 DEFUN ("delete-minibuffer-contents", Fdelete_minibuffer_contents, |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
426 Sdelete_minibuffer_contents, 0, 0, 0, |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
427 doc: /* Delete all user input in a minibuffer. |
77326
58d40e42dfe4
(Fminibuffer_contents, Fminibuffer_contents_no_properties,
Juanma Barranquero <lekktu@gmail.com>
parents:
76384
diff
changeset
|
428 If the current buffer is not a minibuffer, erase its entire contents. */) |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
429 () |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
430 { |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
431 int prompt_end = XINT (Fminibuffer_prompt_end ()); |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
432 if (prompt_end < ZV) |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
433 del_range (prompt_end, ZV); |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
434 return Qnil; |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
435 } |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
436 |
46019
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
437 |
53251
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
438 /* Read from the minibuffer using keymap MAP and initial contents INITIAL, |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
439 putting point minus BACKUP_N bytes from the end of INITIAL, |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
440 prompting with PROMPT (a string), using history list HISTVAR |
53251
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
441 with initial position HISTPOS. INITIAL should be a string or a |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
442 cons of a string and an integer. BACKUP_N should be <= 0, or |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
443 Qnil, which is equivalent to 0. If INITIAL is a cons, BACKUP_N is |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
444 ignored and replaced with an integer that puts point at one-indexed |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
445 position N in INITIAL, where N is the CDR of INITIAL, or at the |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
446 beginning of INITIAL if N <= 0. |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
447 |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
448 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
|
449 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
|
450 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
|
451 match the front of that history list exactly. The value is pushed onto |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
452 the list as the string that was read. |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
453 |
51039
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
454 DEFALT specifies the default value for the sake of history commands. |
18444
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
455 |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
456 If ALLOW_PROPS is nonzero, we do not throw away text properties. |
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
457 |
53251
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
458 if INHERIT_INPUT_METHOD is nonzero, the minibuffer inherits the |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
459 current input method. */ |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
460 |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
461 static Lisp_Object |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
462 read_minibuf (map, initial, prompt, backup_n, expflag, |
70930
f3ddca90b6b1
(read_minibuf): Remove arg KEEP_ALL. Callers changed.
Juri Linkov <juri@jurta.org>
parents:
70499
diff
changeset
|
463 histvar, histpos, defalt, allow_props, inherit_input_method) |
284 | 464 Lisp_Object map; |
465 Lisp_Object initial; | |
466 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
|
467 Lisp_Object backup_n; |
284 | 468 int expflag; |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
469 Lisp_Object histvar; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
470 Lisp_Object histpos; |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
471 Lisp_Object defalt; |
20584
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
472 int allow_props; |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
473 int inherit_input_method; |
284 | 474 { |
10249
a664a948dd55
(read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents:
10173
diff
changeset
|
475 Lisp_Object val; |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
476 int count = SPECPDL_INDEX (); |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
477 Lisp_Object mini_frame, ambient_dir, minibuffer, input_method; |
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
478 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; |
19561
7e13891b6f22
(read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents:
19545
diff
changeset
|
479 Lisp_Object enable_multibyte; |
53251
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
480 int pos = INTEGERP (backup_n) ? XINT (backup_n) : 0; |
51039
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
481 /* String to add to the history. */ |
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
482 Lisp_Object histstring; |
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
483 |
67963
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
484 Lisp_Object empty_minibuf; |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
485 Lisp_Object dummy, frame; |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
486 |
40403
4d2b8d93aa27
(read_minibuf): Remove unused external declaration of variable
Pavel Janík <Pavel@Janik.cz>
parents:
39989
diff
changeset
|
487 extern Lisp_Object Qfront_sticky; |
25612
7f8ebd701925
(read_minibuf): Put all three properties on the same range--the whole prompt.
Richard M. Stallman <rms@gnu.org>
parents:
25516
diff
changeset
|
488 extern Lisp_Object Qrear_nonsticky; |
10249
a664a948dd55
(read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents:
10173
diff
changeset
|
489 |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
490 specbind (Qminibuffer_default, defalt); |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
491 |
75720
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
492 /* If Vminibuffer_completing_file_name is `lambda' on entry, it was t |
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
493 in previous recursive minibuffer, but was not set explicitly |
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
494 to t for this invocation, so set it to nil in this minibuffer. |
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
495 Save the old value now, before we change it. */ |
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
496 specbind (intern ("minibuffer-completing-file-name"), Vminibuffer_completing_file_name); |
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
497 if (EQ (Vminibuffer_completing_file_name, Qlambda)) |
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
498 Vminibuffer_completing_file_name = Qnil; |
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
499 |
27863
30eebaedce93
(read_minibuf): Cancel busy-cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
27697
diff
changeset
|
500 #ifdef HAVE_X_WINDOWS |
36255
1890bad59762
Use display_hourglass_p, start_hourglass,
Gerd Moellmann <gerd@gnu.org>
parents:
34224
diff
changeset
|
501 if (display_hourglass_p) |
1890bad59762
Use display_hourglass_p, start_hourglass,
Gerd Moellmann <gerd@gnu.org>
parents:
34224
diff
changeset
|
502 cancel_hourglass (); |
27863
30eebaedce93
(read_minibuf): Cancel busy-cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
27697
diff
changeset
|
503 #endif |
10818
8c81853b2679
(read_minibuf): Make sure the display is locked.
Karl Heuer <kwzh@gnu.org>
parents:
10619
diff
changeset
|
504 |
53251
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
505 if (!NILP (initial)) |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
506 { |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
507 if (CONSP (initial)) |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
508 { |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
509 backup_n = Fcdr (initial); |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
510 initial = Fcar (initial); |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
511 CHECK_STRING (initial); |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
512 if (!NILP (backup_n)) |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
513 { |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
514 CHECK_NUMBER (backup_n); |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
515 /* Convert to distance from end of input. */ |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
516 if (XINT (backup_n) < 1) |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
517 /* A number too small means the beginning of the string. */ |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
518 pos = - SCHARS (initial); |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
519 else |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
520 pos = XINT (backup_n) - 1 - SCHARS (initial); |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
521 } |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
522 } |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
523 else |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
524 CHECK_STRING (initial); |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
525 } |
10249
a664a948dd55
(read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents:
10173
diff
changeset
|
526 val = Qnil; |
14969
ea072e2f75f8
(read_minibuf): GCPRO ambient_dir.
Richard M. Stallman <rms@gnu.org>
parents:
14952
diff
changeset
|
527 ambient_dir = current_buffer->directory; |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
528 input_method = Qnil; |
19561
7e13891b6f22
(read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents:
19545
diff
changeset
|
529 enable_multibyte = Qnil; |
14969
ea072e2f75f8
(read_minibuf): GCPRO ambient_dir.
Richard M. Stallman <rms@gnu.org>
parents:
14952
diff
changeset
|
530 |
10249
a664a948dd55
(read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents:
10173
diff
changeset
|
531 /* 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
|
532 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
|
533 BACKUP_N because we use the value only if it is an integer. */ |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
534 GCPRO5 (map, initial, val, ambient_dir, input_method); |
284 | 535 |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
536 if (!STRINGP (prompt)) |
81280
d27a83277a4b
(read_minibuf): Use empty_unibyte_string.
Juanma Barranquero <lekktu@gmail.com>
parents:
77326
diff
changeset
|
537 prompt = empty_unibyte_string; |
284 | 538 |
539 if (!enable_recursive_minibuffers | |
16180
9b0180c495ff
(read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
540 && minibuf_level > 0) |
9b0180c495ff
(read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
541 { |
9b0180c495ff
(read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
542 if (EQ (selected_window, minibuf_window)) |
9b0180c495ff
(read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
543 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
|
544 else |
9b0180c495ff
(read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
545 /* 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
|
546 Fthrow (Qexit, |
9b0180c495ff
(read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
547 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
|
548 } |
284 | 549 |
70353
ecf86801649d
(read_minibuf): Don't use read_minibuf_noninteractive
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
550 if (noninteractive && NILP (Vexecuting_kbd_macro)) |
36530
c98e0f6d63f2
(read_minibuf): Clean up the binding stack if
Gerd Moellmann <gerd@gnu.org>
parents:
36255
diff
changeset
|
551 { |
53251
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
552 val = read_minibuf_noninteractive (map, initial, prompt, |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
553 make_number (pos), |
36530
c98e0f6d63f2
(read_minibuf): Clean up the binding stack if
Gerd Moellmann <gerd@gnu.org>
parents:
36255
diff
changeset
|
554 expflag, histvar, histpos, defalt, |
c98e0f6d63f2
(read_minibuf): Clean up the binding stack if
Gerd Moellmann <gerd@gnu.org>
parents:
36255
diff
changeset
|
555 allow_props, inherit_input_method); |
51781
bd0acf8d5f97
(read_minibuf): UNGCPRO before returning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51200
diff
changeset
|
556 UNGCPRO; |
36530
c98e0f6d63f2
(read_minibuf): Clean up the binding stack if
Gerd Moellmann <gerd@gnu.org>
parents:
36255
diff
changeset
|
557 return unbind_to (count, val); |
c98e0f6d63f2
(read_minibuf): Clean up the binding stack if
Gerd Moellmann <gerd@gnu.org>
parents:
36255
diff
changeset
|
558 } |
26320 | 559 |
14952
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
560 /* Choose the minibuffer window and frame, and take action on them. */ |
284 | 561 |
12631
ab75fc26058e
(read_minibuf): Call choose_minibuffer_frame.
Richard M. Stallman <rms@gnu.org>
parents:
12164
diff
changeset
|
562 choose_minibuf_frame (); |
ab75fc26058e
(read_minibuf): Call choose_minibuffer_frame.
Richard M. Stallman <rms@gnu.org>
parents:
12164
diff
changeset
|
563 |
18904
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
564 record_unwind_protect (choose_minibuf_frame_1, Qnil); |
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
565 |
284 | 566 record_unwind_protect (Fset_window_configuration, |
345 | 567 Fcurrent_window_configuration (Qnil)); |
568 | |
765 | 569 /* If the minibuffer window is on a different frame, save that |
570 frame's configuration too. */ | |
8899
81103c53aa59
(read_minibuf): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8872
diff
changeset
|
571 mini_frame = WINDOW_FRAME (XWINDOW (minibuf_window)); |
25673
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
572 if (!EQ (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
|
573 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
|
574 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
|
575 |
a74524e1c961
(read_minibuf): Make minibuffer frame visible when minibuffer activated.
Karl Heuer <kwzh@gnu.org>
parents:
6235
diff
changeset
|
576 /* 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
|
577 make it visible now. */ |
a74524e1c961
(read_minibuf): Make minibuffer frame visible when minibuffer activated.
Karl Heuer <kwzh@gnu.org>
parents:
6235
diff
changeset
|
578 Fmake_frame_visible (mini_frame); |
a74524e1c961
(read_minibuf): Make minibuffer frame visible when minibuffer activated.
Karl Heuer <kwzh@gnu.org>
parents:
6235
diff
changeset
|
579 |
5238
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
580 if (minibuffer_auto_raise) |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
581 Fraise_frame (mini_frame); |
284 | 582 |
83449
ff74a86c2b16
Overhaul and simplify single_kboard API. Allow calls to `recursive-edit' in process filters. Small fixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83431
diff
changeset
|
583 temporarily_switch_to_single_kboard (XFRAME (mini_frame)); |
83374
0b75ace4f7ad
Fix crash after y-or-n-p prompt triggered by emacsclient. (Reported by Han Boetes, analysis by Kalle Olavi Niemitalo.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83353
diff
changeset
|
584 |
14952
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
585 /* 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
|
586 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
|
587 |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
588 /* 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
|
589 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
|
590 specpdl slots. */ |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
591 minibuf_save_list |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
592 = Fcons (Voverriding_local_map, |
75558
f7b5b15084ef
(read_minibuf): Save and clear Vminibuffer_completing_file_name.
Richard M. Stallman <rms@gnu.org>
parents:
75475
diff
changeset
|
593 Fcons (minibuf_window, |
75720
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
594 minibuf_save_list)); |
14952
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
595 minibuf_save_list |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
596 = Fcons (minibuf_prompt, |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
597 Fcons (make_number (minibuf_prompt_width), |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
598 Fcons (Vhelp_form, |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
599 Fcons (Vcurrent_prefix_arg, |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
600 Fcons (Vminibuffer_history_position, |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
601 Fcons (Vminibuffer_history_variable, |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
602 minibuf_save_list)))))); |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
603 |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
604 record_unwind_protect (read_minibuf_unwind, Qnil); |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
605 minibuf_level++; |
55795
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
606 /* We are exiting the minibuffer one way or the other, so run the hook. |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
607 It should be run before unwinding the minibuf settings. Do it |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
608 separately from read_minibuf_unwind because we need to make sure that |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
609 read_minibuf_unwind is fully executed even if exit-minibuffer-hook |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
610 signals an error. --Stef */ |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
611 record_unwind_protect (run_exit_minibuf_hook, Qnil); |
14952
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
612 |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
613 /* 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
|
614 |
25658
a9f38bb7f815
(read_minibuf_unwind): Call resize_mini_window with
Gerd Moellmann <gerd@gnu.org>
parents:
25612
diff
changeset
|
615 minibuf_prompt_width = 0; |
14952
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
616 minibuf_prompt = Fcopy_sequence (prompt); |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
617 Vminibuffer_history_position = histpos; |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
618 Vminibuffer_history_variable = histvar; |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
619 Vhelp_form = Vminibuffer_help_form; |
75720
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
620 /* If this minibuffer is reading a file name, that doesn't mean |
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
621 recursive ones are. But we cannot set it to nil, because |
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
622 completion code still need to know the minibuffer is completing a |
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
623 file name. So use `lambda' as intermediate value meaning |
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
624 "t" in this minibuffer, but "nil" in next minibuffer. */ |
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
625 if (!NILP (Vminibuffer_completing_file_name)) |
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
626 Vminibuffer_completing_file_name = Qlambda; |
14952
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
627 |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
628 if (inherit_input_method) |
19561
7e13891b6f22
(read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents:
19545
diff
changeset
|
629 { |
43000
c16f32068114
(Fread_from_minibuffer, Fread_command, Fread_function)
Pavel Janík <Pavel@Janik.cz>
parents:
42881
diff
changeset
|
630 /* `current-input-method' is buffer local. So, remember it in |
19561
7e13891b6f22
(read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents:
19545
diff
changeset
|
631 INPUT_METHOD before changing the current buffer. */ |
7e13891b6f22
(read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents:
19545
diff
changeset
|
632 input_method = Fsymbol_value (Qcurrent_input_method); |
7e13891b6f22
(read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents:
19545
diff
changeset
|
633 enable_multibyte = current_buffer->enable_multibyte_characters; |
7e13891b6f22
(read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents:
19545
diff
changeset
|
634 } |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
635 |
14952
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
636 /* Switch to the minibuffer. */ |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
637 |
17387
b0d63d297969
(read_minibuf): Get the string from the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
17375
diff
changeset
|
638 minibuffer = get_minibuffer (minibuf_level); |
b0d63d297969
(read_minibuf): Get the string from the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
17375
diff
changeset
|
639 Fset_buffer (minibuffer); |
1593
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
640 |
67869
ea017f365939
(Fminibuffer_message): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67720
diff
changeset
|
641 /* If appropriate, copy enable-multibyte-characters into the minibuffer. */ |
ea017f365939
(Fminibuffer_message): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67720
diff
changeset
|
642 if (inherit_input_method) |
ea017f365939
(Fminibuffer_message): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67720
diff
changeset
|
643 current_buffer->enable_multibyte_characters = enable_multibyte; |
ea017f365939
(Fminibuffer_message): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67720
diff
changeset
|
644 |
1593
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
645 /* 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
|
646 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
|
647 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
|
648 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
|
649 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
|
650 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
|
651 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
|
652 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
|
653 if (STRINGP (ambient_dir)) |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
654 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
|
655 else |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
656 { |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
657 Lisp_Object buf_list; |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
658 |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
659 for (buf_list = Vbuffer_alist; |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
660 CONSP (buf_list); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26059
diff
changeset
|
661 buf_list = XCDR (buf_list)) |
1593
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
662 { |
6504
c867b9af8de4
(read_minibuf): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6472
diff
changeset
|
663 Lisp_Object other_buf; |
1593
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
664 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26059
diff
changeset
|
665 other_buf = XCDR (XCAR (buf_list)); |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
666 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
|
667 { |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
668 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
|
669 break; |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
670 } |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
671 } |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
672 } |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
673 |
25673
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
674 if (!EQ (mini_frame, selected_frame)) |
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
675 Fredirect_frame_focus (selected_frame, mini_frame); |
358 | 676 |
284 | 677 Vminibuf_scroll_window = selected_window; |
43573
3d6e86e8823b
(read_minibuf): Set Vminibuf_selected_window on first
Kim F. Storm <storm@cua.dk>
parents:
43040
diff
changeset
|
678 if (minibuf_level == 1 || !EQ (minibuf_window, selected_window)) |
43595
b7964dae2379
(minibuf_selected_window): Renamed from Vminibuf_selected_window.
Kim F. Storm <storm@cua.dk>
parents:
43573
diff
changeset
|
679 minibuf_selected_window = selected_window; |
67963
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
680 |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
681 /* Empty out the minibuffers of all frames other than the one |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
682 where we are going to display one now. |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
683 Set them to point to ` *Minibuf-0*', which is always empty. */ |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
684 empty_minibuf = Fget_buffer (build_string (" *Minibuf-0*")); |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
685 |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
686 FOR_EACH_FRAME (dummy, frame) |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
687 { |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
688 Lisp_Object root_window = Fframe_root_window (frame); |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
689 Lisp_Object mini_window = XWINDOW (root_window)->next; |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
690 |
68261
380cef0ff139
(read_minibuf): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
67963
diff
changeset
|
691 if (! NILP (mini_window) && ! EQ (mini_window, minibuf_window) |
380cef0ff139
(read_minibuf): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
67963
diff
changeset
|
692 && !NILP (Fwindow_minibuffer_p (mini_window))) |
67963
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
693 Fset_window_buffer (mini_window, empty_minibuf, Qnil); |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
694 } |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
695 |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
696 /* Display this minibuffer in the proper window. */ |
51200
be76b5735f96
Update Fset_window_buffer usage.
Kim F. Storm <storm@cua.dk>
parents:
51048
diff
changeset
|
697 Fset_window_buffer (minibuf_window, Fcurrent_buffer (), Qnil); |
51048
7ac9c3bea5ea
(Fselect_window): Add optional arg `norecord'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51039
diff
changeset
|
698 Fselect_window (minibuf_window, Qnil); |
9316
5f7cfbdef872
(read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents:
9183
diff
changeset
|
699 XSETFASTINT (XWINDOW (minibuf_window)->hscroll, 0); |
284 | 700 |
14952
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
701 Fmake_local_variable (Qprint_escape_newlines); |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
702 print_escape_newlines = 1; |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
703 |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
704 /* 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
|
705 { |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46224
diff
changeset
|
706 int count1 = SPECPDL_INDEX (); |
14667
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
707 specbind (Qinhibit_read_only, Qt); |
39248
51b411c7b689
(read_minibuf): Bind inhibit-modification-hooks to t,
Gerd Moellmann <gerd@gnu.org>
parents:
38166
diff
changeset
|
708 specbind (Qinhibit_modification_hooks, Qt); |
14667
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
709 Ferase_buffer (); |
76369
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
710 |
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
711 if (!NILP (current_buffer->enable_multibyte_characters) |
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
712 && ! STRING_MULTIBYTE (minibuf_prompt)) |
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
713 minibuf_prompt = Fstring_make_multibyte (minibuf_prompt); |
77326
58d40e42dfe4
(Fminibuffer_contents, Fminibuffer_contents_no_properties,
Juanma Barranquero <lekktu@gmail.com>
parents:
76384
diff
changeset
|
714 |
76369
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
715 /* Insert the prompt, record where it ends. */ |
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
716 Finsert (1, &minibuf_prompt); |
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
717 if (PT > BEG) |
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
718 { |
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
719 Fput_text_property (make_number (BEG), make_number (PT), |
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
720 Qfront_sticky, Qt, Qnil); |
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
721 Fput_text_property (make_number (BEG), make_number (PT), |
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
722 Qrear_nonsticky, Qt, Qnil); |
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
723 Fput_text_property (make_number (BEG), make_number (PT), |
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
724 Qfield, Qt, Qnil); |
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
725 Fadd_text_properties (make_number (BEG), make_number (PT), |
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
726 Vminibuffer_prompt_properties, Qnil); |
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
727 } |
14667
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
728 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
|
729 } |
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
730 |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
731 minibuf_prompt_width = (int) current_column (); /* iftc */ |
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
732 |
14952
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
733 /* Put in the initial input. */ |
488 | 734 if (!NILP (initial)) |
284 | 735 { |
736 Finsert (1, &initial); | |
53251
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
737 Fforward_char (make_number (pos)); |
284 | 738 } |
739 | |
25354
2049a0c919a1
Remove conditional compilation on
Gerd Moellmann <gerd@gnu.org>
parents:
25014
diff
changeset
|
740 clear_message (1, 1); |
284 | 741 current_buffer->keymap = map; |
742 | |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
743 /* Turn on an input method stored in INPUT_METHOD if any. */ |
19728
6fad157cece4
(read_minibuf): Fix use of Ffboundp.
Richard M. Stallman <rms@gnu.org>
parents:
19672
diff
changeset
|
744 if (STRINGP (input_method) && !NILP (Ffboundp (Qactivate_input_method))) |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
745 call1 (Qactivate_input_method, input_method); |
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
746 |
4550
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
747 /* 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
|
748 (run-hooks would do nothing if it is empty, |
43000
c16f32068114
(Fread_from_minibuffer, Fread_command, Fread_function)
Pavel Janík <Pavel@Janik.cz>
parents:
42881
diff
changeset
|
749 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
|
750 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
|
751 && !NILP (Vrun_hooks)) |
4550
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
752 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
|
753 |
33088
9d03916282c9
(read_minibuf): Reset the undo history just before starting the recursive-edit.
Miles Bader <miles@gnu.org>
parents:
32988
diff
changeset
|
754 /* Don't allow the user to undo past this point. */ |
9d03916282c9
(read_minibuf): Reset the undo history just before starting the recursive-edit.
Miles Bader <miles@gnu.org>
parents:
32988
diff
changeset
|
755 current_buffer->undo_list = Qnil; |
9d03916282c9
(read_minibuf): Reset the undo history just before starting the recursive-edit.
Miles Bader <miles@gnu.org>
parents:
32988
diff
changeset
|
756 |
284 | 757 recursive_edit_1 (); |
758 | |
759 /* If cursor is on the minibuffer line, | |
760 show the user we have exited by putting it in column 0. */ | |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
761 if (XWINDOW (minibuf_window)->cursor.vpos >= 0 |
284 | 762 && !noninteractive) |
763 { | |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
764 XWINDOW (minibuf_window)->cursor.hpos = 0; |
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
765 XWINDOW (minibuf_window)->cursor.x = 0; |
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
766 XWINDOW (minibuf_window)->must_be_updated_p = 1; |
25673
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
767 update_frame (XFRAME (selected_frame), 1, 1); |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
53364
diff
changeset
|
768 { |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
53364
diff
changeset
|
769 struct frame *f = XFRAME (XWINDOW (minibuf_window)->frame); |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
53364
diff
changeset
|
770 struct redisplay_interface *rif = FRAME_RIF (f); |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
53364
diff
changeset
|
771 if (rif && rif->flush_display) |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
53364
diff
changeset
|
772 rif->flush_display (f); |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
53364
diff
changeset
|
773 } |
284 | 774 } |
775 | |
18444
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
776 /* Make minibuffer contents into a string. */ |
17387
b0d63d297969
(read_minibuf): Get the string from the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
17375
diff
changeset
|
777 Fset_buffer (minibuffer); |
27611
d9295615b99f
(read_minibuf_noninteractive): Remove undeclared gcpro1, gcpro2.
Dave Love <fx@gnu.org>
parents:
27284
diff
changeset
|
778 if (allow_props) |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
779 val = Fminibuffer_contents (); |
27611
d9295615b99f
(read_minibuf_noninteractive): Remove undeclared gcpro1, gcpro2.
Dave Love <fx@gnu.org>
parents:
27284
diff
changeset
|
780 else |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
781 val = Fminibuffer_contents_no_properties (); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
782 |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
783 /* VAL is the string of minibuffer text. */ |
20075
de449ef32afd
(read_minibuf): Return DEFALT here, if minibuffer is empty.
Karl Heuer <kwzh@gnu.org>
parents:
19902
diff
changeset
|
784 |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
785 last_minibuf_string = val; |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
786 |
51039
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
787 /* Choose the string to add to the history. */ |
70930
f3ddca90b6b1
(read_minibuf): Remove arg KEEP_ALL. Callers changed.
Juri Linkov <juri@jurta.org>
parents:
70499
diff
changeset
|
788 if (SCHARS (val) != 0) |
51039
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
789 histstring = val; |
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
790 else if (STRINGP (defalt)) |
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
791 histstring = defalt; |
85516
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
792 else if (CONSP (defalt) && STRINGP (XCAR (defalt))) |
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
793 histstring = XCAR (defalt); |
51039
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
794 else |
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
795 histstring = Qnil; |
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
796 |
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
797 /* Add the value to the appropriate history list, if any. */ |
71120
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
798 if (!NILP (Vhistory_add_new_input) |
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
799 && SYMBOLP (Vminibuffer_history_variable) |
51039
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
800 && !NILP (histstring)) |
9615
f696aae6c5e0
(read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9583
diff
changeset
|
801 { |
f696aae6c5e0
(read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9583
diff
changeset
|
802 /* 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
|
803 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
|
804 Lisp_Object histval; |
22137
2b0e6a1e7fb9
(read_minibuf): If history list var is void, make it nil.
Richard M. Stallman <rms@gnu.org>
parents:
22048
diff
changeset
|
805 |
2b0e6a1e7fb9
(read_minibuf): If history list var is void, make it nil.
Richard M. Stallman <rms@gnu.org>
parents:
22048
diff
changeset
|
806 /* If variable is unbound, make it nil. */ |
39581
6d9fa06012a6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
39250
diff
changeset
|
807 if (EQ (SYMBOL_VALUE (Vminibuffer_history_variable), Qunbound)) |
22137
2b0e6a1e7fb9
(read_minibuf): If history list var is void, make it nil.
Richard M. Stallman <rms@gnu.org>
parents:
22048
diff
changeset
|
808 Fset (Vminibuffer_history_variable, Qnil); |
2b0e6a1e7fb9
(read_minibuf): If history list var is void, make it nil.
Richard M. Stallman <rms@gnu.org>
parents:
22048
diff
changeset
|
809 |
9615
f696aae6c5e0
(read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9583
diff
changeset
|
810 histval = Fsymbol_value (Vminibuffer_history_variable); |
f696aae6c5e0
(read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9583
diff
changeset
|
811 |
f696aae6c5e0
(read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9583
diff
changeset
|
812 /* 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
|
813 values are unacceptable. We silently ignore these values. */ |
51039
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
814 |
9615
f696aae6c5e0
(read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9583
diff
changeset
|
815 if (NILP (histval) |
f696aae6c5e0
(read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9583
diff
changeset
|
816 || (CONSP (histval) |
51039
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
817 /* Don't duplicate the most recent entry in the history. */ |
70930
f3ddca90b6b1
(read_minibuf): Remove arg KEEP_ALL. Callers changed.
Juri Linkov <juri@jurta.org>
parents:
70499
diff
changeset
|
818 && (NILP (Fequal (histstring, Fcar (histval)))))) |
15967
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
819 { |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
820 Lisp_Object length; |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
821 |
57016
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
822 if (history_delete_duplicates) Fdelete (histstring, histval); |
51039
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
823 histval = Fcons (histstring, histval); |
15967
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
824 Fset (Vminibuffer_history_variable, histval); |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
825 |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
826 /* Truncate if requested. */ |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
827 length = Fget (Vminibuffer_history_variable, Qhistory_length); |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
828 if (NILP (length)) length = Vhistory_length; |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
829 if (INTEGERP (length)) |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
830 { |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
831 if (XINT (length) <= 0) |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
832 Fset (Vminibuffer_history_variable, Qnil); |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
833 else |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
834 { |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
835 Lisp_Object temp; |
15967
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
836 |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
837 temp = Fnthcdr (Fsub1 (length), histval); |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
838 if (CONSP (temp)) Fsetcdr (temp, Qnil); |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
839 } |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
840 } |
15967
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
841 } |
9615
f696aae6c5e0
(read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9583
diff
changeset
|
842 } |
f696aae6c5e0
(read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9583
diff
changeset
|
843 |
5069
47cc31b47402
(read_minibuf): History list always gets strings,
Richard M. Stallman <rms@gnu.org>
parents:
4824
diff
changeset
|
844 /* 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
|
845 if (expflag) |
26320 | 846 val = string_to_object (val, defalt); |
5069
47cc31b47402
(read_minibuf): History list always gets strings,
Richard M. Stallman <rms@gnu.org>
parents:
4824
diff
changeset
|
847 |
10249
a664a948dd55
(read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents:
10173
diff
changeset
|
848 /* The appropriate frame will get selected |
a664a948dd55
(read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents:
10173
diff
changeset
|
849 in set-window-configuration. */ |
51781
bd0acf8d5f97
(read_minibuf): UNGCPRO before returning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51200
diff
changeset
|
850 UNGCPRO; |
bd0acf8d5f97
(read_minibuf): UNGCPRO before returning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51200
diff
changeset
|
851 return unbind_to (count, val); |
284 | 852 } |
853 | |
854 /* Return a buffer to be used as the minibuffer at depth `depth'. | |
855 depth = 0 is the lowest allowed argument, and that is the value | |
856 used for nonrecursive minibuffer invocations */ | |
857 | |
858 Lisp_Object | |
859 get_minibuffer (depth) | |
860 int depth; | |
861 { | |
862 Lisp_Object tail, num, buf; | |
6235
d93350e9d2bc
(get_minibuffer): Make name buffer large enough.
Karl Heuer <kwzh@gnu.org>
parents:
6234
diff
changeset
|
863 char name[24]; |
284 | 864 extern Lisp_Object nconc2 (); |
865 | |
9316
5f7cfbdef872
(read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents:
9183
diff
changeset
|
866 XSETFASTINT (num, depth); |
284 | 867 tail = Fnthcdr (num, Vminibuffer_list); |
488 | 868 if (NILP (tail)) |
284 | 869 { |
870 tail = Fcons (Qnil, Qnil); | |
871 Vminibuffer_list = nconc2 (Vminibuffer_list, tail); | |
872 } | |
873 buf = Fcar (tail); | |
488 | 874 if (NILP (buf) || NILP (XBUFFER (buf)->name)) |
284 | 875 { |
876 sprintf (name, " *Minibuf-%d*", depth); | |
877 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
|
878 |
7c4519722020
Thu Sep 17 15:51:18 1992 Jim Blandy (jimb@pogo.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1010
diff
changeset
|
879 /* 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
|
880 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
|
881 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
|
882 |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39966
diff
changeset
|
883 XSETCAR (tail, buf); |
284 | 884 } |
885 else | |
8872
0f20e5e19ed6
(get_minibuffer): Call Fkill_all_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8790
diff
changeset
|
886 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
887 int count = SPECPDL_INDEX (); |
52005
3e9cb0aeebe1
(get_minibuffer): Be careful when calling `reset_buffer'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51781
diff
changeset
|
888 /* `reset_buffer' blindly sets the list of overlays to NULL, so we |
3e9cb0aeebe1
(get_minibuffer): Be careful when calling `reset_buffer'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51781
diff
changeset
|
889 have to empty the list, otherwise we end up with overlays that |
3e9cb0aeebe1
(get_minibuffer): Be careful when calling `reset_buffer'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51781
diff
changeset
|
890 think they belong to this buffer while the buffer doesn't know about |
3e9cb0aeebe1
(get_minibuffer): Be careful when calling `reset_buffer'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51781
diff
changeset
|
891 them any more. */ |
52014
292d2d0762b8
(get_minibuffer): Use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52005
diff
changeset
|
892 delete_all_overlays (XBUFFER (buf)); |
292d2d0762b8
(get_minibuffer): Use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52005
diff
changeset
|
893 reset_buffer (XBUFFER (buf)); |
9001
69f0ae06bcdf
(Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8899
diff
changeset
|
894 record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); |
69f0ae06bcdf
(Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8899
diff
changeset
|
895 Fset_buffer (buf); |
69f0ae06bcdf
(Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8899
diff
changeset
|
896 Fkill_all_local_variables (); |
69f0ae06bcdf
(Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8899
diff
changeset
|
897 unbind_to (count, Qnil); |
8872
0f20e5e19ed6
(get_minibuffer): Call Fkill_all_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8790
diff
changeset
|
898 } |
1593
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
899 |
284 | 900 return buf; |
901 } | |
902 | |
55795
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
903 static Lisp_Object |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
904 run_exit_minibuf_hook (data) |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
905 Lisp_Object data; |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
906 { |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
907 if (!NILP (Vminibuffer_exit_hook) && !EQ (Vminibuffer_exit_hook, Qunbound) |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
908 && !NILP (Vrun_hooks)) |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
909 safe_run_hooks (Qminibuffer_exit_hook); |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
910 |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
911 return Qnil; |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
912 } |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
913 |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
914 /* This function is called on exiting minibuffer, whether normally or |
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
915 not, and it restores the current window, buffer, etc. */ |
284 | 916 |
20302
5b3bc7f24d51
(read_minibuf_unwind): Fix return type and return nil.
Andreas Schwab <schwab@suse.de>
parents:
20075
diff
changeset
|
917 static Lisp_Object |
358 | 918 read_minibuf_unwind (data) |
919 Lisp_Object data; | |
284 | 920 { |
9049
522a9e03ca05
(read_minibuf_unwind): Preserve Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
9001
diff
changeset
|
921 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
|
922 Lisp_Object window; |
9049
522a9e03ca05
(read_minibuf_unwind): Preserve Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
9001
diff
changeset
|
923 |
14667
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
924 /* 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
|
925 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
|
926 minibuf_level--; |
9049
522a9e03ca05
(read_minibuf_unwind): Preserve Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
9001
diff
changeset
|
927 |
14667
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
928 window = minibuf_window; |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
929 /* To keep things predictable, in case it matters, let's be in the |
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
930 minibuffer when we reset the relevant variables. */ |
14667
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
931 Fset_buffer (XWINDOW (window)->buffer); |
284 | 932 |
14667
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
933 /* 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
|
934 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
|
935 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
|
936 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
|
937 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
|
938 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
|
939 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
|
940 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
|
941 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
|
942 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
|
943 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
|
944 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
|
945 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
|
946 Voverriding_local_map = Fcar (minibuf_save_list); |
0f6b7b33340a
(read_minibuf): Save Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
10859
diff
changeset
|
947 minibuf_save_list = Fcdr (minibuf_save_list); |
16475
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
948 #if 0 |
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
949 temp = Fcar (minibuf_save_list); |
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
950 if (FRAME_LIVE_P (XFRAME (WINDOW_FRAME (XWINDOW (temp))))) |
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
951 minibuf_window = temp; |
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
952 #endif |
12631
ab75fc26058e
(read_minibuf): Call choose_minibuffer_frame.
Richard M. Stallman <rms@gnu.org>
parents:
12164
diff
changeset
|
953 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
|
954 |
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
955 /* 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
|
956 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
957 int count = SPECPDL_INDEX (); |
14667
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
958 /* 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
|
959 specbind (Qinhibit_read_only, Qt); |
39250
5921e30bf534
(read_minibuf_unwind): Bind inhibit-modification-hooks.
Gerd Moellmann <gerd@gnu.org>
parents:
39248
diff
changeset
|
960 specbind (Qinhibit_modification_hooks, Qt); |
14667
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
961 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
|
962 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
|
963 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
|
964 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
|
965 } |
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
966 |
25516
866049050d67
(read_minibuf_unwind): Resize mini-window when
Gerd Moellmann <gerd@gnu.org>
parents:
25478
diff
changeset
|
967 /* When we get to the outmost level, make sure we resize the |
866049050d67
(read_minibuf_unwind): Resize mini-window when
Gerd Moellmann <gerd@gnu.org>
parents:
25478
diff
changeset
|
968 mini-window back to its normal size. */ |
866049050d67
(read_minibuf_unwind): Resize mini-window when
Gerd Moellmann <gerd@gnu.org>
parents:
25478
diff
changeset
|
969 if (minibuf_level == 0) |
25658
a9f38bb7f815
(read_minibuf_unwind): Call resize_mini_window with
Gerd Moellmann <gerd@gnu.org>
parents:
25612
diff
changeset
|
970 resize_mini_window (XWINDOW (window), 0); |
25516
866049050d67
(read_minibuf_unwind): Resize mini-window when
Gerd Moellmann <gerd@gnu.org>
parents:
25478
diff
changeset
|
971 |
14667
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
972 /* 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
|
973 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
|
974 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
|
975 XSETFASTINT (XWINDOW (window)->last_overlay_modified, 0); |
20302
5b3bc7f24d51
(read_minibuf_unwind): Fix return type and return nil.
Andreas Schwab <schwab@suse.de>
parents:
20075
diff
changeset
|
976 return Qnil; |
284 | 977 } |
978 | |
1010
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
979 |
70930
f3ddca90b6b1
(read_minibuf): Remove arg KEEP_ALL. Callers changed.
Juri Linkov <juri@jurta.org>
parents:
70499
diff
changeset
|
980 DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 7, 0, |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
981 doc: /* Read a string from the minibuffer, prompting with string PROMPT. |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
982 The optional second arg INITIAL-CONTENTS is an obsolete alternative to |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
983 DEFAULT-VALUE. It normally should be nil in new code, except when |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
984 HIST is a cons. It is discussed in more detail below. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
985 Third arg KEYMAP is a keymap to use whilst reading; |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
986 if omitted or nil, the default is `minibuffer-local-map'. |
43000
c16f32068114
(Fread_from_minibuffer, Fread_command, Fread_function)
Pavel Janík <Pavel@Janik.cz>
parents:
42881
diff
changeset
|
987 If fourth arg READ is non-nil, then interpret the result as a Lisp object |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
988 and return that object: |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
989 in other words, do `(car (read-from-string INPUT-STRING))' |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
990 Fifth arg HIST, if non-nil, specifies a history list and optionally |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
991 the initial position in the list. It can be a symbol, which is the |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
992 history list variable to use, or it can be a cons cell |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
993 (HISTVAR . HISTPOS). In that case, HISTVAR is the history list variable |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
994 to use, and HISTPOS is the initial position for use by the minibuffer |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
995 history commands. For consistency, you should also specify that |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
996 element of the history as the value of INITIAL-CONTENTS. Positions |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
997 are counted starting from 1 at the beginning of the list. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
998 Sixth arg DEFAULT-VALUE is the default value. If non-nil, it is available |
53251
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
999 for history commands; but, unless READ is non-nil, `read-from-minibuffer' |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1000 does NOT return DEFAULT-VALUE if the user enters empty input! It returns |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1001 the empty string. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1002 Seventh arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits |
42881 | 1003 the current input method and the setting of `enable-multibyte-characters'. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1004 If the variable `minibuffer-allow-text-properties' is non-nil, |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1005 then the string which is returned includes whatever text properties |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1006 were present in the minibuffer. Otherwise the value has no text properties. |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1007 |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1008 The remainder of this documentation string describes the |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1009 INITIAL-CONTENTS argument in more detail. It is only relevant when |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1010 studying existing code, or when HIST is a cons. If non-nil, |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1011 INITIAL-CONTENTS is a string to be inserted into the minibuffer before |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1012 reading input. Normally, point is put at the end of that string. |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1013 However, if INITIAL-CONTENTS is \(STRING . POSITION), the initial |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1014 input is STRING, but point is placed at _one-indexed_ position |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1015 POSITION in the minibuffer. Any integer value less than or equal to |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1016 one puts point at the beginning of the string. *Note* that this |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1017 behavior differs from the way such arguments are used in `completing-read' |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1018 and some related functions, which use zero-indexing for POSITION. */) |
75060 | 1019 (prompt, initial_contents, keymap, read, hist, default_value, inherit_input_method) |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
1020 Lisp_Object prompt, initial_contents, keymap, read, hist, default_value; |
70930
f3ddca90b6b1
(read_minibuf): Remove arg KEEP_ALL. Callers changed.
Juri Linkov <juri@jurta.org>
parents:
70499
diff
changeset
|
1021 Lisp_Object inherit_input_method; |
284 | 1022 { |
53251
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1023 Lisp_Object histvar, histpos, val; |
17805
f1625c2d3db9
(Fread_from_minibuffer): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
17737
diff
changeset
|
1024 struct gcpro gcpro1; |
f1625c2d3db9
(Fread_from_minibuffer): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
17737
diff
changeset
|
1025 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40403
diff
changeset
|
1026 CHECK_STRING (prompt); |
488 | 1027 if (NILP (keymap)) |
284 | 1028 keymap = Vminibuffer_local_map; |
1029 else | |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32772
diff
changeset
|
1030 keymap = get_keymap (keymap, 1, 0); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1031 |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
1032 if (SYMBOLP (hist)) |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1033 { |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1034 histvar = hist; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1035 histpos = Qnil; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1036 } |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1037 else |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1038 { |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1039 histvar = Fcar_safe (hist); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1040 histpos = Fcdr_safe (hist); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1041 } |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1042 if (NILP (histvar)) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1043 histvar = Qminibuffer_history; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1044 if (NILP (histpos)) |
9316
5f7cfbdef872
(read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents:
9183
diff
changeset
|
1045 XSETFASTINT (histpos, 0); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1046 |
17805
f1625c2d3db9
(Fread_from_minibuffer): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
17737
diff
changeset
|
1047 GCPRO1 (default_value); |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
1048 val = read_minibuf (keymap, initial_contents, prompt, |
53251
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1049 Qnil, !NILP (read), |
18444
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
1050 histvar, histpos, default_value, |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
1051 minibuffer_allow_text_properties, |
70930
f3ddca90b6b1
(read_minibuf): Remove arg KEEP_ALL. Callers changed.
Juri Linkov <juri@jurta.org>
parents:
70499
diff
changeset
|
1052 !NILP (inherit_input_method)); |
17805
f1625c2d3db9
(Fread_from_minibuffer): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
17737
diff
changeset
|
1053 UNGCPRO; |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
1054 return val; |
284 | 1055 } |
1056 | |
1057 DEFUN ("read-minibuffer", Fread_minibuffer, Sread_minibuffer, 1, 2, 0, | |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1058 doc: /* Return a Lisp object read using the minibuffer, unevaluated. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1059 Prompt with PROMPT. If non-nil, optional second arg INITIAL-CONTENTS |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1060 is a string to insert in the minibuffer before reading. |
85676
a1ea2ab31c31
(Fread_minibuffer, Feval_minibuffer): Reflow docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
85516
diff
changeset
|
1061 \(INITIAL-CONTENTS can also be a cons of a string and an integer. |
a1ea2ab31c31
(Fread_minibuffer, Feval_minibuffer): Reflow docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
85516
diff
changeset
|
1062 Such arguments are used as in `read-from-minibuffer'.) */) |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1063 (prompt, initial_contents) |
284 | 1064 Lisp_Object prompt, initial_contents; |
1065 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40403
diff
changeset
|
1066 CHECK_STRING (prompt); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1067 return read_minibuf (Vminibuffer_local_map, initial_contents, |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
1068 prompt, Qnil, 1, Qminibuffer_history, |
70930
f3ddca90b6b1
(read_minibuf): Remove arg KEEP_ALL. Callers changed.
Juri Linkov <juri@jurta.org>
parents:
70499
diff
changeset
|
1069 make_number (0), Qnil, 0, 0); |
284 | 1070 } |
1071 | |
1072 DEFUN ("eval-minibuffer", Feval_minibuffer, Seval_minibuffer, 1, 2, 0, | |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1073 doc: /* Return value of Lisp expression read using the minibuffer. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1074 Prompt with PROMPT. If non-nil, optional second arg INITIAL-CONTENTS |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1075 is a string to insert in the minibuffer before reading. |
85676
a1ea2ab31c31
(Fread_minibuffer, Feval_minibuffer): Reflow docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
85516
diff
changeset
|
1076 \(INITIAL-CONTENTS can also be a cons of a string and an integer. |
a1ea2ab31c31
(Fread_minibuffer, Feval_minibuffer): Reflow docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
85516
diff
changeset
|
1077 Such arguments are used as in `read-from-minibuffer'.) */) |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1078 (prompt, initial_contents) |
284 | 1079 Lisp_Object prompt, initial_contents; |
1080 { | |
73450
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
1081 return Feval (read_minibuf (Vread_expression_map, initial_contents, |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
1082 prompt, Qnil, 1, Qread_expression_history, |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
1083 make_number (0), Qnil, 0, 0)); |
284 | 1084 } |
1085 | |
1086 /* Functions that use the minibuffer to read various things. */ | |
1087 | |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
1088 DEFUN ("read-string", Fread_string, Sread_string, 1, 5, 0, |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1089 doc: /* Read a string from the minibuffer, prompting with string PROMPT. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1090 If non-nil, second arg INITIAL-INPUT is a string to insert before reading. |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1091 This argument has been superseded by DEFAULT-VALUE and should normally |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1092 be nil in new code. It behaves as in `read-from-minibuffer'. See the |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1093 documentation string of that function for details. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1094 The third arg HISTORY, if non-nil, specifies a history list |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1095 and optionally the initial position in the list. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1096 See `read-from-minibuffer' for details of HISTORY argument. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1097 Fourth arg DEFAULT-VALUE is the default value. If non-nil, it is used |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1098 for history commands, and as the value to return if the user enters |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1099 the empty string. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1100 Fifth arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits |
42881 | 1101 the current input method and the setting of `enable-multibyte-characters'. */) |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1102 (prompt, initial_input, history, default_value, inherit_input_method) |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
1103 Lisp_Object prompt, initial_input, history, default_value; |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
1104 Lisp_Object inherit_input_method; |
284 | 1105 { |
20865
7a730831aa0e
(read_minibuf): If input is empty, return empty string.
Richard M. Stallman <rms@gnu.org>
parents:
20754
diff
changeset
|
1106 Lisp_Object val; |
7a730831aa0e
(read_minibuf): If input is empty, return empty string.
Richard M. Stallman <rms@gnu.org>
parents:
20754
diff
changeset
|
1107 val = Fread_from_minibuffer (prompt, initial_input, Qnil, |
7a730831aa0e
(read_minibuf): If input is empty, return empty string.
Richard M. Stallman <rms@gnu.org>
parents:
20754
diff
changeset
|
1108 Qnil, history, default_value, |
70930
f3ddca90b6b1
(read_minibuf): Remove arg KEEP_ALL. Callers changed.
Juri Linkov <juri@jurta.org>
parents:
70499
diff
changeset
|
1109 inherit_input_method); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1110 if (STRINGP (val) && SCHARS (val) == 0 && ! NILP (default_value)) |
85516
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
1111 val = CONSP (default_value) ? XCAR (default_value) : default_value; |
20865
7a730831aa0e
(read_minibuf): If input is empty, return empty string.
Richard M. Stallman <rms@gnu.org>
parents:
20754
diff
changeset
|
1112 return val; |
284 | 1113 } |
1114 | |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
1115 DEFUN ("read-no-blanks-input", Fread_no_blanks_input, Sread_no_blanks_input, 1, 3, 0, |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1116 doc: /* Read a string from the terminal, not allowing blanks. |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1117 Prompt with PROMPT. Whitespace terminates the input. If INITIAL is |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1118 non-nil, it should be a string, which is used as initial input, with |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1119 point positioned at the end, so that SPACE will accept the input. |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1120 \(Actually, INITIAL can also be a cons of a string and an integer. |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1121 Such values are treated as in `read-from-minibuffer', but are normally |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1122 not useful in this function.) |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1123 Third arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1124 the current input method and the setting of`enable-multibyte-characters'. */) |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1125 (prompt, initial, inherit_input_method) |
20921
ccde9a52e7c1
(read_minibuf): Do use DEFALT in place of empty input
Richard M. Stallman <rms@gnu.org>
parents:
20865
diff
changeset
|
1126 Lisp_Object prompt, initial, inherit_input_method; |
284 | 1127 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40403
diff
changeset
|
1128 CHECK_STRING (prompt); |
20921
ccde9a52e7c1
(read_minibuf): Do use DEFALT in place of empty input
Richard M. Stallman <rms@gnu.org>
parents:
20865
diff
changeset
|
1129 return read_minibuf (Vminibuffer_local_ns_map, initial, prompt, Qnil, |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
1130 0, Qminibuffer_history, make_number (0), Qnil, 0, |
70930
f3ddca90b6b1
(read_minibuf): Remove arg KEEP_ALL. Callers changed.
Juri Linkov <juri@jurta.org>
parents:
70499
diff
changeset
|
1131 !NILP (inherit_input_method)); |
284 | 1132 } |
1133 | |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
1134 DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0, |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1135 doc: /* Read the name of a command and return as a symbol. |
43000
c16f32068114
(Fread_from_minibuffer, Fread_command, Fread_function)
Pavel Janík <Pavel@Janik.cz>
parents:
42881
diff
changeset
|
1136 Prompt with PROMPT. By default, return DEFAULT-VALUE. */) |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1137 (prompt, default_value) |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
1138 Lisp_Object prompt, default_value; |
284 | 1139 { |
20478
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1140 Lisp_Object name, default_string; |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1141 |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1142 if (NILP (default_value)) |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1143 default_string = Qnil; |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1144 else if (SYMBOLP (default_value)) |
45408
3e68a6534915
* minibuf.c (Fread_command, Fread_variable): Use SYMBOL_NAME and
Ken Raeburn <raeburn@raeburn.org>
parents:
44939
diff
changeset
|
1145 default_string = SYMBOL_NAME (default_value); |
20478
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1146 else |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1147 default_string = default_value; |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
1148 |
20478
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1149 name = Fcompleting_read (prompt, Vobarray, Qcommandp, Qt, |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1150 Qnil, Qnil, default_string, Qnil); |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1151 if (NILP (name)) |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1152 return name; |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1153 return Fintern (name, Qnil); |
284 | 1154 } |
1155 | |
1156 #ifdef NOTDEF | |
1157 DEFUN ("read-function", Fread_function, Sread_function, 1, 1, 0, | |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1158 doc: /* One arg PROMPT, a string. Read the name of a function and return as a symbol. |
43000
c16f32068114
(Fread_from_minibuffer, Fread_command, Fread_function)
Pavel Janík <Pavel@Janik.cz>
parents:
42881
diff
changeset
|
1159 Prompt with PROMPT. */) |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1160 (prompt) |
284 | 1161 Lisp_Object prompt; |
1162 { | |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
1163 return Fintern (Fcompleting_read (prompt, Vobarray, Qfboundp, Qt, Qnil, Qnil, Qnil, Qnil), |
284 | 1164 Qnil); |
1165 } | |
1166 #endif /* NOTDEF */ | |
1167 | |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
1168 DEFUN ("read-variable", Fread_variable, Sread_variable, 1, 2, 0, |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1169 doc: /* Read the name of a user variable and return it as a symbol. |
43000
c16f32068114
(Fread_from_minibuffer, Fread_command, Fread_function)
Pavel Janík <Pavel@Janik.cz>
parents:
42881
diff
changeset
|
1170 Prompt with PROMPT. By default, return DEFAULT-VALUE. |
49106
f9342d2eaa31
(Fread_variable): Doc fix.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48727
diff
changeset
|
1171 A user variable is one for which `user-variable-p' returns non-nil. */) |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1172 (prompt, default_value) |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
1173 Lisp_Object prompt, default_value; |
284 | 1174 { |
20478
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1175 Lisp_Object name, default_string; |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1176 |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1177 if (NILP (default_value)) |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1178 default_string = Qnil; |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1179 else if (SYMBOLP (default_value)) |
45408
3e68a6534915
* minibuf.c (Fread_command, Fread_variable): Use SYMBOL_NAME and
Ken Raeburn <raeburn@raeburn.org>
parents:
44939
diff
changeset
|
1180 default_string = SYMBOL_NAME (default_value); |
20478
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1181 else |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1182 default_string = default_value; |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
1183 |
20478
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1184 name = Fcompleting_read (prompt, Vobarray, |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1185 Quser_variable_p, Qt, |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1186 Qnil, Qnil, default_string, Qnil); |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1187 if (NILP (name)) |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1188 return name; |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1189 return Fintern (name, Qnil); |
284 | 1190 } |
1191 | |
1192 DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 3, 0, | |
43000
c16f32068114
(Fread_from_minibuffer, Fread_command, Fread_function)
Pavel Janík <Pavel@Janik.cz>
parents:
42881
diff
changeset
|
1193 doc: /* Read the name of a buffer and return as a string. |
c16f32068114
(Fread_from_minibuffer, Fread_command, Fread_function)
Pavel Janík <Pavel@Janik.cz>
parents:
42881
diff
changeset
|
1194 Prompt with PROMPT. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1195 Optional second arg DEF is value to return if user enters an empty line. |
43000
c16f32068114
(Fread_from_minibuffer, Fread_command, Fread_function)
Pavel Janík <Pavel@Janik.cz>
parents:
42881
diff
changeset
|
1196 If optional third arg REQUIRE-MATCH is non-nil, |
65758
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1197 only existing buffer names are allowed. |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1198 The argument PROMPT should be a string ending with a colon and a space. */) |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1199 (prompt, def, require_match) |
284 | 1200 Lisp_Object prompt, def, require_match; |
1201 { | |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1202 Lisp_Object args[4]; |
65758
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1203 unsigned char *s; |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1204 int len; |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
1205 |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
1206 if (BUFFERP (def)) |
284 | 1207 def = XBUFFER (def)->name; |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1208 |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1209 if (NILP (Vread_buffer_function)) |
284 | 1210 { |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1211 if (!NILP (def)) |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1212 { |
65758
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1213 /* A default value was provided: we must change PROMPT, |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1214 editing the default value in before the colon. To achieve |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1215 this, we replace PROMPT with a substring that doesn't |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1216 contain the terminal space and colon (if present). They |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1217 are then added back using Fformat. */ |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1218 |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1219 if (STRINGP (prompt)) |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1220 { |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1221 s = SDATA (prompt); |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1222 len = strlen (s); |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1223 if (len >= 2 && s[len - 2] == ':' && s[len - 1] == ' ') |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1224 len = len - 2; |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1225 else if (len >= 1 && (s[len - 1] == ':' || s[len - 1] == ' ')) |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1226 len--; |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1227 |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1228 prompt = make_specified_string (s, -1, len, |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1229 STRING_MULTIBYTE (prompt)); |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1230 } |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1231 |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1232 args[0] = build_string ("%s (default %s): "); |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1233 args[1] = prompt; |
85516
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
1234 args[2] = CONSP (def) ? XCAR (def) : def; |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1235 prompt = Fformat (3, args); |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1236 } |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1237 |
72606
18e29ef6d5d7
(Finternal_complete_buffer): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71797
diff
changeset
|
1238 return Fcompleting_read (prompt, intern ("internal-complete-buffer"), |
18e29ef6d5d7
(Finternal_complete_buffer): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71797
diff
changeset
|
1239 Qnil, require_match, Qnil, Qbuffer_name_history, |
22010
547e4c0a42c0
(Qbuffer_name_history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21854
diff
changeset
|
1240 def, Qnil); |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1241 } |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1242 else |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1243 { |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1244 args[0] = Vread_buffer_function; |
284 | 1245 args[1] = prompt; |
1246 args[2] = def; | |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1247 args[3] = require_match; |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1248 return Ffuncall(4, args); |
284 | 1249 } |
1250 } | |
1251 | |
21854
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1252 static Lisp_Object |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1253 minibuf_conform_representation (string, basis) |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1254 Lisp_Object string, basis; |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1255 { |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1256 if (STRING_MULTIBYTE (string) == STRING_MULTIBYTE (basis)) |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1257 return string; |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1258 |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1259 if (STRING_MULTIBYTE (string)) |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1260 return Fstring_make_unibyte (string); |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1261 else |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1262 return Fstring_make_multibyte (string); |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1263 } |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1264 |
284 | 1265 DEFUN ("try-completion", Ftry_completion, Stry_completion, 2, 3, 0, |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1266 doc: /* Return common substring of all completions of STRING in COLLECTION. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1267 Test each possible completion specified by COLLECTION |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1268 to see if it begins with STRING. The possible completions may be |
60210
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1269 strings or symbols. Symbols are converted to strings before testing, |
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1270 see `symbol-name'. |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1271 All that match STRING are compared together; the longest initial sequence |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1272 common to all these matches is the return value. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1273 If there is no match at all, the return value is nil. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1274 For a unique match which is exact, the return value is t. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1275 |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1276 If COLLECTION is an alist, the keys (cars of elements) are the |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1277 possible completions. If an element is not a cons cell, then the |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1278 element itself is the possible completion. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1279 If COLLECTION is a hash-table, all the keys that are strings or symbols |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1280 are the possible completions. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1281 If COLLECTION is an obarray, the names of all symbols in the obarray |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1282 are the possible completions. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1283 |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1284 COLLECTION can also be a function to do the completion itself. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1285 It receives three arguments: the values STRING, PREDICATE and nil. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1286 Whatever it returns becomes the value of `try-completion'. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1287 |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1288 If optional third argument PREDICATE is non-nil, |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1289 it is used to test each possible match. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1290 The match is a candidate only if PREDICATE returns non-nil. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1291 The argument given to PREDICATE is the alist element |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1292 or the symbol from the obarray. If COLLECTION is a hash-table, |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1293 predicate is called with two arguments: the key and the value. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1294 Additionally to this predicate, `completion-regexp-list' |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1295 is used to further constrain the set of candidates. */) |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1296 (string, collection, predicate) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1297 Lisp_Object string, collection, predicate; |
284 | 1298 { |
1299 Lisp_Object bestmatch, tail, elt, eltstring; | |
20584
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
1300 /* Size in bytes of BESTMATCH. */ |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31140
diff
changeset
|
1301 int bestmatchsize = 0; |
20584
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
1302 /* These are in bytes, too. */ |
284 | 1303 int compare, matchsize; |
82403
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1304 enum { function_table, list_table, obarray_table, hash_table} |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1305 type = (HASH_TABLE_P (collection) ? hash_table |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1306 : VECTORP (collection) ? obarray_table |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1307 : ((NILP (collection) |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1308 || (CONSP (collection) |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1309 && (!SYMBOLP (XCAR (collection)) |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1310 || NILP (XCAR (collection))))) |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1311 ? list_table : function_table)); |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31140
diff
changeset
|
1312 int index = 0, obsize = 0; |
284 | 1313 int matchcount = 0; |
56167
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1314 int bindcount = -1; |
284 | 1315 Lisp_Object bucket, zero, end, tem; |
1316 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; | |
1317 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40403
diff
changeset
|
1318 CHECK_STRING (string); |
82403
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1319 if (type == function_table) |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1320 return call3 (collection, string, predicate, Qnil); |
284 | 1321 |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31140
diff
changeset
|
1322 bestmatch = bucket = Qnil; |
58908
e1f3effbdccb
(Fall_completions): Add var `zero' and use it in loop.
Richard M. Stallman <rms@gnu.org>
parents:
58896
diff
changeset
|
1323 zero = make_number (0); |
284 | 1324 |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1325 /* If COLLECTION is not a list, set TAIL just for gc pro. */ |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1326 tail = collection; |
82403
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1327 if (type == obarray_table) |
284 | 1328 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1329 collection = check_obarray (collection); |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1330 obsize = XVECTOR (collection)->size; |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1331 bucket = XVECTOR (collection)->contents[index]; |
284 | 1332 } |
1333 | |
1334 while (1) | |
1335 { | |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1336 /* Get the next element of the alist, obarray, or hash-table. */ |
284 | 1337 /* Exit the loop if the elements are all used up. */ |
1338 /* elt gets the alist element or symbol. | |
1339 eltstring gets the name to check as a completion. */ | |
1340 | |
82403
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1341 if (type == list_table) |
284 | 1342 { |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1343 if (!CONSP (tail)) |
284 | 1344 break; |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1345 elt = XCAR (tail); |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1346 eltstring = CONSP (elt) ? XCAR (elt) : elt; |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1347 tail = XCDR (tail); |
284 | 1348 } |
82403
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1349 else if (type == obarray_table) |
284 | 1350 { |
58908
e1f3effbdccb
(Fall_completions): Add var `zero' and use it in loop.
Richard M. Stallman <rms@gnu.org>
parents:
58896
diff
changeset
|
1351 if (!EQ (bucket, zero)) |
284 | 1352 { |
74666
3f3a13d1c7ce
(Ftry_completion): Check that obarray buckets are symbols.
Juanma Barranquero <lekktu@gmail.com>
parents:
74649
diff
changeset
|
1353 if (!SYMBOLP (bucket)) |
3f3a13d1c7ce
(Ftry_completion): Check that obarray buckets are symbols.
Juanma Barranquero <lekktu@gmail.com>
parents:
74649
diff
changeset
|
1354 error ("Bad data in guts of obarray"); |
284 | 1355 elt = bucket; |
60210
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1356 eltstring = elt; |
284 | 1357 if (XSYMBOL (bucket)->next) |
1358 XSETSYMBOL (bucket, XSYMBOL (bucket)->next); | |
1359 else | |
9316
5f7cfbdef872
(read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents:
9183
diff
changeset
|
1360 XSETFASTINT (bucket, 0); |
284 | 1361 } |
1362 else if (++index >= obsize) | |
1363 break; | |
1364 else | |
1365 { | |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1366 bucket = XVECTOR (collection)->contents[index]; |
284 | 1367 continue; |
1368 } | |
1369 } | |
82403
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1370 else /* if (type == hash_table) */ |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1371 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1372 while (index < HASH_TABLE_SIZE (XHASH_TABLE (collection)) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1373 && NILP (HASH_HASH (XHASH_TABLE (collection), index))) |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1374 index++; |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1375 if (index >= HASH_TABLE_SIZE (XHASH_TABLE (collection))) |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1376 break; |
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1377 else |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1378 elt = eltstring = HASH_KEY (XHASH_TABLE (collection), index++); |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1379 } |
284 | 1380 |
1381 /* Is this element a possible completion? */ | |
1382 | |
60210
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1383 if (SYMBOLP (eltstring)) |
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1384 eltstring = Fsymbol_name (eltstring); |
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1385 |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
1386 if (STRINGP (eltstring) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1387 && SCHARS (string) <= SCHARS (eltstring) |
58908
e1f3effbdccb
(Fall_completions): Add var `zero' and use it in loop.
Richard M. Stallman <rms@gnu.org>
parents:
58896
diff
changeset
|
1388 && (tem = Fcompare_strings (eltstring, zero, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1389 make_number (SCHARS (string)), |
58908
e1f3effbdccb
(Fall_completions): Add var `zero' and use it in loop.
Richard M. Stallman <rms@gnu.org>
parents:
58896
diff
changeset
|
1390 string, zero, Qnil, |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1391 completion_ignore_case ? Qt : Qnil), |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1392 EQ (Qt, tem))) |
284 | 1393 { |
1394 /* Yes. */ | |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1395 Lisp_Object regexps; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1396 |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1397 /* Ignore this element if it fails to match all the regexps. */ |
56167
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1398 { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1399 for (regexps = Vcompletion_regexp_list; CONSP (regexps); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1400 regexps = XCDR (regexps)) |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1401 { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1402 if (bindcount < 0) { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1403 bindcount = SPECPDL_INDEX (); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1404 specbind (Qcase_fold_search, |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1405 completion_ignore_case ? Qt : Qnil); |
56087
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1406 } |
56167
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1407 tem = Fstring_match (XCAR (regexps), eltstring, zero); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1408 if (NILP (tem)) |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1409 break; |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1410 } |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1411 if (CONSP (regexps)) |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1412 continue; |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1413 } |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1414 |
284 | 1415 /* Ignore this element if there is a predicate |
1416 and the predicate doesn't like it. */ | |
1417 | |
14083
3ac9d27214e4
(Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
13775
diff
changeset
|
1418 if (!NILP (predicate)) |
284 | 1419 { |
14083
3ac9d27214e4
(Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
13775
diff
changeset
|
1420 if (EQ (predicate, Qcommandp)) |
44939
d4ace8c553e4
(Fall_completions, Ftry_completion): New arg to Fcommandp.
Richard M. Stallman <rms@gnu.org>
parents:
44469
diff
changeset
|
1421 tem = Fcommandp (elt, Qnil); |
284 | 1422 else |
1423 { | |
82403
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1424 if (bindcount >= 0) |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1425 { |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1426 unbind_to (bindcount, Qnil); |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1427 bindcount = -1; |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1428 } |
284 | 1429 GCPRO4 (tail, string, eltstring, bestmatch); |
82403
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1430 tem = (type == hash_table |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1431 ? call2 (predicate, elt, |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1432 HASH_VALUE (XHASH_TABLE (collection), |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1433 index - 1)) |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1434 : call1 (predicate, elt)); |
284 | 1435 UNGCPRO; |
1436 } | |
488 | 1437 if (NILP (tem)) continue; |
284 | 1438 } |
1439 | |
1440 /* Update computation of how much all possible completions match */ | |
1441 | |
488 | 1442 if (NILP (bestmatch)) |
20584
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
1443 { |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1444 matchcount = 1; |
20584
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
1445 bestmatch = eltstring; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1446 bestmatchsize = SCHARS (eltstring); |
20584
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
1447 } |
284 | 1448 else |
1449 { | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1450 compare = min (bestmatchsize, SCHARS (eltstring)); |
58908
e1f3effbdccb
(Fall_completions): Add var `zero' and use it in loop.
Richard M. Stallman <rms@gnu.org>
parents:
58896
diff
changeset
|
1451 tem = Fcompare_strings (bestmatch, zero, |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1452 make_number (compare), |
58908
e1f3effbdccb
(Fall_completions): Add var `zero' and use it in loop.
Richard M. Stallman <rms@gnu.org>
parents:
58896
diff
changeset
|
1453 eltstring, zero, |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1454 make_number (compare), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1455 completion_ignore_case ? Qt : Qnil); |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1456 if (EQ (tem, Qt)) |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1457 matchsize = compare; |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1458 else if (XINT (tem) < 0) |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1459 matchsize = - XINT (tem) - 1; |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1460 else |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1461 matchsize = XINT (tem) - 1; |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1462 |
330 | 1463 if (matchsize < 0) |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1464 /* When can this happen ? -stef */ |
330 | 1465 matchsize = compare; |
1466 if (completion_ignore_case) | |
1467 { | |
1468 /* If this is an exact match except for case, | |
1469 use it as the best match rather than one that is not an | |
1470 exact match. This way, we get the case pattern | |
1471 of the actual match. */ | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1472 if ((matchsize == SCHARS (eltstring) |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1473 && matchsize < SCHARS (bestmatch)) |
330 | 1474 || |
1475 /* If there is more than one exact match ignoring case, | |
1476 and one of them is exact including case, | |
1477 prefer that one. */ | |
1478 /* If there is no exact match ignoring case, | |
1479 prefer a match that does not change the case | |
1480 of the input. */ | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1481 ((matchsize == SCHARS (eltstring)) |
330 | 1482 == |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1483 (matchsize == SCHARS (bestmatch)) |
58908
e1f3effbdccb
(Fall_completions): Add var `zero' and use it in loop.
Richard M. Stallman <rms@gnu.org>
parents:
58896
diff
changeset
|
1484 && (tem = Fcompare_strings (eltstring, zero, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1485 make_number (SCHARS (string)), |
58908
e1f3effbdccb
(Fall_completions): Add var `zero' and use it in loop.
Richard M. Stallman <rms@gnu.org>
parents:
58896
diff
changeset
|
1486 string, zero, |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1487 Qnil, |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1488 Qnil), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1489 EQ (Qt, tem)) |
58908
e1f3effbdccb
(Fall_completions): Add var `zero' and use it in loop.
Richard M. Stallman <rms@gnu.org>
parents:
58896
diff
changeset
|
1490 && (tem = Fcompare_strings (bestmatch, zero, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1491 make_number (SCHARS (string)), |
58908
e1f3effbdccb
(Fall_completions): Add var `zero' and use it in loop.
Richard M. Stallman <rms@gnu.org>
parents:
58896
diff
changeset
|
1492 string, zero, |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1493 Qnil, |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1494 Qnil), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1495 ! EQ (Qt, tem)))) |
330 | 1496 bestmatch = eltstring; |
1497 } | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1498 if (bestmatchsize != SCHARS (eltstring) |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1499 || bestmatchsize != matchsize) |
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1500 /* Don't count the same string multiple times. */ |
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1501 matchcount++; |
330 | 1502 bestmatchsize = matchsize; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1503 if (matchsize <= SCHARS (string) |
76384
24884385912f
(Ftry_completion): Don't short circuit if completion-ignore-case is
Chong Yidong <cyd@stupidchicken.com>
parents:
76369
diff
changeset
|
1504 /* If completion-ignore-case is non-nil, don't |
24884385912f
(Ftry_completion): Don't short circuit if completion-ignore-case is
Chong Yidong <cyd@stupidchicken.com>
parents:
76369
diff
changeset
|
1505 short-circuit because we want to find the best |
24884385912f
(Ftry_completion): Don't short circuit if completion-ignore-case is
Chong Yidong <cyd@stupidchicken.com>
parents:
76369
diff
changeset
|
1506 possible match *including* case differences. */ |
24884385912f
(Ftry_completion): Don't short circuit if completion-ignore-case is
Chong Yidong <cyd@stupidchicken.com>
parents:
76369
diff
changeset
|
1507 && !completion_ignore_case |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1508 && matchcount > 1) |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1509 /* No need to look any further. */ |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1510 break; |
284 | 1511 } |
1512 } | |
1513 } | |
1514 | |
56167
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1515 if (bindcount >= 0) { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1516 unbind_to (bindcount, Qnil); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1517 bindcount = -1; |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1518 } |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1519 |
488 | 1520 if (NILP (bestmatch)) |
284 | 1521 return Qnil; /* No completions found */ |
330 | 1522 /* If we are ignoring case, and there is no exact match, |
1523 and no additional text was supplied, | |
1524 don't change the case of what the user typed. */ | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1525 if (completion_ignore_case && bestmatchsize == SCHARS (string) |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1526 && SCHARS (bestmatch) > bestmatchsize) |
21854
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1527 return minibuf_conform_representation (string, bestmatch); |
330 | 1528 |
1529 /* Return t if the supplied string is an exact match (counting case); | |
1530 it does not require any change to be made. */ | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1531 if (matchcount == 1 && bestmatchsize == SCHARS (string) |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1532 && (tem = Fcompare_strings (bestmatch, make_number (0), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1533 make_number (bestmatchsize), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1534 string, make_number (0), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1535 make_number (bestmatchsize), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1536 Qnil), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1537 EQ (Qt, tem))) |
284 | 1538 return Qt; |
1539 | |
9316
5f7cfbdef872
(read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents:
9183
diff
changeset
|
1540 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
|
1541 XSETFASTINT (end, bestmatchsize); /* all completions agree */ |
284 | 1542 return Fsubstring (bestmatch, zero, end); |
1543 } | |
1544 | |
10173
6a4f5fc9d3f9
(Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents:
10086
diff
changeset
|
1545 DEFUN ("all-completions", Fall_completions, Sall_completions, 2, 4, 0, |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1546 doc: /* Search for partial matches to STRING in COLLECTION. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1547 Test each of the possible completions specified by COLLECTION |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1548 to see if it begins with STRING. The possible completions may be |
60210
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1549 strings or symbols. Symbols are converted to strings before testing, |
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1550 see `symbol-name'. |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1551 The value is a list of all the possible completions that match STRING. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1552 |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1553 If COLLECTION is an alist, the keys (cars of elements) are the |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1554 possible completions. If an element is not a cons cell, then the |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1555 element itself is the possible completion. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1556 If COLLECTION is a hash-table, all the keys that are strings or symbols |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1557 are the possible completions. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1558 If COLLECTION is an obarray, the names of all symbols in the obarray |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1559 are the possible completions. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1560 |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1561 COLLECTION can also be a function to do the completion itself. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1562 It receives three arguments: the values STRING, PREDICATE and t. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1563 Whatever it returns becomes the value of `all-completions'. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1564 |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1565 If optional third argument PREDICATE is non-nil, |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1566 it is used to test each possible match. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1567 The match is a candidate only if PREDICATE returns non-nil. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1568 The argument given to PREDICATE is the alist element |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1569 or the symbol from the obarray. If COLLECTION is a hash-table, |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1570 predicate is called with two arguments: the key and the value. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1571 Additionally to this predicate, `completion-regexp-list' |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1572 is used to further constrain the set of candidates. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1573 |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1574 If the optional fourth argument HIDE-SPACES is non-nil, |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1575 strings in COLLECTION that start with a space |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1576 are ignored unless STRING itself starts with a space. */) |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1577 (string, collection, predicate, hide_spaces) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1578 Lisp_Object string, collection, predicate, hide_spaces; |
284 | 1579 { |
1580 Lisp_Object tail, elt, eltstring; | |
1581 Lisp_Object allmatches; | |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1582 int type = HASH_TABLE_P (collection) ? 3 |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1583 : VECTORP (collection) ? 2 |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1584 : NILP (collection) || (CONSP (collection) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1585 && (!SYMBOLP (XCAR (collection)) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1586 || NILP (XCAR (collection)))); |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31140
diff
changeset
|
1587 int index = 0, obsize = 0; |
56167
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1588 int bindcount = -1; |
58908
e1f3effbdccb
(Fall_completions): Add var `zero' and use it in loop.
Richard M. Stallman <rms@gnu.org>
parents:
58896
diff
changeset
|
1589 Lisp_Object bucket, tem, zero; |
284 | 1590 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
1591 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40403
diff
changeset
|
1592 CHECK_STRING (string); |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1593 if (type == 0) |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1594 return call3 (collection, string, predicate, Qt); |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31140
diff
changeset
|
1595 allmatches = bucket = Qnil; |
58908
e1f3effbdccb
(Fall_completions): Add var `zero' and use it in loop.
Richard M. Stallman <rms@gnu.org>
parents:
58896
diff
changeset
|
1596 zero = make_number (0); |
284 | 1597 |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1598 /* If COLLECTION is not a list, set TAIL just for gc pro. */ |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1599 tail = collection; |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1600 if (type == 2) |
284 | 1601 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1602 obsize = XVECTOR (collection)->size; |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1603 bucket = XVECTOR (collection)->contents[index]; |
284 | 1604 } |
1605 | |
1606 while (1) | |
1607 { | |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1608 /* Get the next element of the alist, obarray, or hash-table. */ |
284 | 1609 /* Exit the loop if the elements are all used up. */ |
1610 /* elt gets the alist element or symbol. | |
1611 eltstring gets the name to check as a completion. */ | |
1612 | |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1613 if (type == 1) |
284 | 1614 { |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1615 if (!CONSP (tail)) |
284 | 1616 break; |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1617 elt = XCAR (tail); |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1618 eltstring = CONSP (elt) ? XCAR (elt) : elt; |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1619 tail = XCDR (tail); |
284 | 1620 } |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1621 else if (type == 2) |
284 | 1622 { |
58908
e1f3effbdccb
(Fall_completions): Add var `zero' and use it in loop.
Richard M. Stallman <rms@gnu.org>
parents:
58896
diff
changeset
|
1623 if (!EQ (bucket, zero)) |
284 | 1624 { |
1625 elt = bucket; | |
60210
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1626 eltstring = elt; |
284 | 1627 if (XSYMBOL (bucket)->next) |
1628 XSETSYMBOL (bucket, XSYMBOL (bucket)->next); | |
1629 else | |
9316
5f7cfbdef872
(read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents:
9183
diff
changeset
|
1630 XSETFASTINT (bucket, 0); |
284 | 1631 } |
1632 else if (++index >= obsize) | |
1633 break; | |
1634 else | |
1635 { | |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1636 bucket = XVECTOR (collection)->contents[index]; |
284 | 1637 continue; |
1638 } | |
1639 } | |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1640 else /* if (type == 3) */ |
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1641 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1642 while (index < HASH_TABLE_SIZE (XHASH_TABLE (collection)) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1643 && NILP (HASH_HASH (XHASH_TABLE (collection), index))) |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1644 index++; |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1645 if (index >= HASH_TABLE_SIZE (XHASH_TABLE (collection))) |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1646 break; |
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1647 else |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1648 elt = eltstring = HASH_KEY (XHASH_TABLE (collection), index++); |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1649 } |
284 | 1650 |
1651 /* Is this element a possible completion? */ | |
1652 | |
60210
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1653 if (SYMBOLP (eltstring)) |
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1654 eltstring = Fsymbol_name (eltstring); |
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1655 |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
1656 if (STRINGP (eltstring) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1657 && SCHARS (string) <= SCHARS (eltstring) |
10173
6a4f5fc9d3f9
(Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents:
10086
diff
changeset
|
1658 /* 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
|
1659 unless the input starts with space. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1660 && ((SBYTES (string) > 0 |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1661 && SREF (string, 0) == ' ') |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1662 || SREF (eltstring, 0) != ' ' |
10173
6a4f5fc9d3f9
(Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents:
10086
diff
changeset
|
1663 || NILP (hide_spaces)) |
58908
e1f3effbdccb
(Fall_completions): Add var `zero' and use it in loop.
Richard M. Stallman <rms@gnu.org>
parents:
58896
diff
changeset
|
1664 && (tem = Fcompare_strings (eltstring, zero, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1665 make_number (SCHARS (string)), |
58908
e1f3effbdccb
(Fall_completions): Add var `zero' and use it in loop.
Richard M. Stallman <rms@gnu.org>
parents:
58896
diff
changeset
|
1666 string, zero, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1667 make_number (SCHARS (string)), |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1668 completion_ignore_case ? Qt : Qnil), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1669 EQ (Qt, tem))) |
284 | 1670 { |
1671 /* Yes. */ | |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1672 Lisp_Object regexps; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1673 Lisp_Object zero; |
9316
5f7cfbdef872
(read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents:
9183
diff
changeset
|
1674 XSETFASTINT (zero, 0); |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1675 |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1676 /* Ignore this element if it fails to match all the regexps. */ |
56167
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1677 { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1678 for (regexps = Vcompletion_regexp_list; CONSP (regexps); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1679 regexps = XCDR (regexps)) |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1680 { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1681 if (bindcount < 0) { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1682 bindcount = SPECPDL_INDEX (); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1683 specbind (Qcase_fold_search, |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1684 completion_ignore_case ? Qt : Qnil); |
56087
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1685 } |
56167
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1686 tem = Fstring_match (XCAR (regexps), eltstring, zero); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1687 if (NILP (tem)) |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1688 break; |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1689 } |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1690 if (CONSP (regexps)) |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1691 continue; |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1692 } |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1693 |
284 | 1694 /* Ignore this element if there is a predicate |
1695 and the predicate doesn't like it. */ | |
1696 | |
14083
3ac9d27214e4
(Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
13775
diff
changeset
|
1697 if (!NILP (predicate)) |
284 | 1698 { |
14083
3ac9d27214e4
(Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
13775
diff
changeset
|
1699 if (EQ (predicate, Qcommandp)) |
44939
d4ace8c553e4
(Fall_completions, Ftry_completion): New arg to Fcommandp.
Richard M. Stallman <rms@gnu.org>
parents:
44469
diff
changeset
|
1700 tem = Fcommandp (elt, Qnil); |
284 | 1701 else |
1702 { | |
56167
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1703 if (bindcount >= 0) { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1704 unbind_to (bindcount, Qnil); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1705 bindcount = -1; |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1706 } |
284 | 1707 GCPRO4 (tail, eltstring, allmatches, string); |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1708 tem = type == 3 |
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1709 ? call2 (predicate, elt, |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1710 HASH_VALUE (XHASH_TABLE (collection), index - 1)) |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1711 : call1 (predicate, elt); |
284 | 1712 UNGCPRO; |
1713 } | |
488 | 1714 if (NILP (tem)) continue; |
284 | 1715 } |
1716 /* Ok => put it on the list. */ | |
1717 allmatches = Fcons (eltstring, allmatches); | |
1718 } | |
1719 } | |
1720 | |
56167
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1721 if (bindcount >= 0) { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1722 unbind_to (bindcount, Qnil); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1723 bindcount = -1; |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1724 } |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1725 |
284 | 1726 return Fnreverse (allmatches); |
1727 } | |
1728 | |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1729 DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 8, 0, |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1730 doc: /* Read a string in the minibuffer, with completion. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1731 PROMPT is a string to prompt with; normally it ends in a colon and a space. |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1732 COLLECTION can be a list of strings, an alist, an obarray or a hash table. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1733 COLLECTION can also be a function to do the completion itself. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1734 PREDICATE limits completion to a subset of COLLECTION. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1735 See `try-completion' and `all-completions' for more details |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1736 on completion, COLLECTION, and PREDICATE. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1737 |
81672
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
1738 REQUIRE-MATCH can take the following values: |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
1739 - t means that the user is not allowed to exit unless |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
1740 the input is (or completes to) an element of COLLECTION or is null. |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
1741 - nil means that the user can exit with any input. |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
1742 - `confirm-only' means that the user can exit with any input, but she will |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
1743 need to confirm her choice if the input is not an element of COLLECTION. |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
1744 - anything else behaves like t except that typing RET does not exit if it |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
1745 does non-null completion. |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
1746 |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1747 If the input is null, `completing-read' returns DEF, or an empty string |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1748 if DEF is nil, regardless of the value of REQUIRE-MATCH. |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1749 |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1750 If INITIAL-INPUT is non-nil, insert it in the minibuffer initially, |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1751 with point positioned at the end. |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1752 If it is (STRING . POSITION), the initial input is STRING, but point |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1753 is placed at _zero-indexed_ position POSITION in STRING. (*Note* |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1754 that this is different from `read-from-minibuffer' and related |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1755 functions, which use one-indexing for POSITION.) This feature is |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1756 deprecated--it is best to pass nil for INITIAL-INPUT and supply the |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1757 default value DEF instead. The user can yank the default value into |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1758 the minibuffer easily using \\[next-history-element]. |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1759 |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1760 HIST, if non-nil, specifies a history list and optionally the initial |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1761 position in the list. It can be a symbol, which is the history list |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1762 variable to use, or it can be a cons cell (HISTVAR . HISTPOS). In |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1763 that case, HISTVAR is the history list variable to use, and HISTPOS |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1764 is the initial position (the position in the list used by the |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1765 minibuffer history commands). For consistency, you should also |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1766 specify that element of the history as the value of |
55924
082785bed641
(Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
55795
diff
changeset
|
1767 INITIAL-INPUT. (This is the only case in which you should use |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1768 INITIAL-INPUT instead of DEF.) Positions are counted starting from |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1769 1 at the beginning of the list. The variable `history-length' |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1770 controls the maximum length of a history list. |
48727
62ad43be82d7
(Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
47620
diff
changeset
|
1771 |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1772 DEF, if non-nil, is the default value. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1773 |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1774 If INHERIT-INPUT-METHOD is non-nil, the minibuffer inherits |
42881 | 1775 the current input method and the setting of `enable-multibyte-characters'. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1776 |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1777 Completion ignores case if the ambient value of |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1778 `completion-ignore-case' is non-nil. */) |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1779 (prompt, collection, predicate, require_match, initial_input, hist, def, inherit_input_method) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1780 Lisp_Object prompt, collection, predicate, require_match, initial_input; |
26953
def8de0fb500
(Fcompleting_read): Rename arg INIT to INITIAL_INPUT.
Richard M. Stallman <rms@gnu.org>
parents:
26824
diff
changeset
|
1781 Lisp_Object hist, def, inherit_input_method; |
284 | 1782 { |
53312
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1783 Lisp_Object val, histvar, histpos, position; |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1784 Lisp_Object init; |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1785 int pos = 0; |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
1786 int count = SPECPDL_INDEX (); |
18862
2498c062473b
(Fcompleting_read): gcpro def.
Richard M. Stallman <rms@gnu.org>
parents:
18740
diff
changeset
|
1787 struct gcpro gcpro1; |
2498c062473b
(Fcompleting_read): gcpro def.
Richard M. Stallman <rms@gnu.org>
parents:
18740
diff
changeset
|
1788 |
53312
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1789 init = initial_input; |
18862
2498c062473b
(Fcompleting_read): gcpro def.
Richard M. Stallman <rms@gnu.org>
parents:
18740
diff
changeset
|
1790 GCPRO1 (def); |
2498c062473b
(Fcompleting_read): gcpro def.
Richard M. Stallman <rms@gnu.org>
parents:
18740
diff
changeset
|
1791 |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1792 specbind (Qminibuffer_completion_table, collection); |
14083
3ac9d27214e4
(Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
13775
diff
changeset
|
1793 specbind (Qminibuffer_completion_predicate, predicate); |
284 | 1794 specbind (Qminibuffer_completion_confirm, |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1795 EQ (require_match, Qt) ? Qnil : require_match); |
284 | 1796 last_exact_completion = Qnil; |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1797 |
53312
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1798 position = Qnil; |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1799 if (!NILP (init)) |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1800 { |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1801 if (CONSP (init)) |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1802 { |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1803 position = Fcdr (init); |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1804 init = Fcar (init); |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1805 } |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1806 CHECK_STRING (init); |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1807 if (!NILP (position)) |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1808 { |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1809 CHECK_NUMBER (position); |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1810 /* Convert to distance from end of input. */ |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1811 pos = XINT (position) - SCHARS (init); |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1812 } |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1813 } |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1814 |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
1815 if (SYMBOLP (hist)) |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1816 { |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1817 histvar = hist; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1818 histpos = Qnil; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1819 } |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1820 else |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1821 { |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1822 histvar = Fcar_safe (hist); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1823 histpos = Fcdr_safe (hist); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1824 } |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1825 if (NILP (histvar)) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1826 histvar = Qminibuffer_history; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1827 if (NILP (histpos)) |
9316
5f7cfbdef872
(read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents:
9183
diff
changeset
|
1828 XSETFASTINT (histpos, 0); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1829 |
488 | 1830 val = read_minibuf (NILP (require_match) |
67260
f5d06dd5ca9b
(Fcompleting_read): If Vminibuffer_completing_file_name is
Eli Zaretskii <eliz@gnu.org>
parents:
67132
diff
changeset
|
1831 ? (NILP (Vminibuffer_completing_file_name) |
75720
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
1832 || EQ (Vminibuffer_completing_file_name, Qlambda) |
67260
f5d06dd5ca9b
(Fcompleting_read): If Vminibuffer_completing_file_name is
Eli Zaretskii <eliz@gnu.org>
parents:
67132
diff
changeset
|
1833 ? Vminibuffer_local_completion_map |
f5d06dd5ca9b
(Fcompleting_read): If Vminibuffer_completing_file_name is
Eli Zaretskii <eliz@gnu.org>
parents:
67132
diff
changeset
|
1834 : Vminibuffer_local_filename_completion_map) |
f5d06dd5ca9b
(Fcompleting_read): If Vminibuffer_completing_file_name is
Eli Zaretskii <eliz@gnu.org>
parents:
67132
diff
changeset
|
1835 : (NILP (Vminibuffer_completing_file_name) |
75720
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
1836 || EQ (Vminibuffer_completing_file_name, Qlambda) |
67260
f5d06dd5ca9b
(Fcompleting_read): If Vminibuffer_completing_file_name is
Eli Zaretskii <eliz@gnu.org>
parents:
67132
diff
changeset
|
1837 ? Vminibuffer_local_must_match_map |
f5d06dd5ca9b
(Fcompleting_read): If Vminibuffer_completing_file_name is
Eli Zaretskii <eliz@gnu.org>
parents:
67132
diff
changeset
|
1838 : Vminibuffer_local_must_match_filename_map), |
53312
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1839 init, prompt, make_number (pos), 0, |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
1840 histvar, histpos, def, 0, |
70930
f3ddca90b6b1
(read_minibuf): Remove arg KEEP_ALL. Callers changed.
Juri Linkov <juri@jurta.org>
parents:
70499
diff
changeset
|
1841 !NILP (inherit_input_method)); |
20865
7a730831aa0e
(read_minibuf): If input is empty, return empty string.
Richard M. Stallman <rms@gnu.org>
parents:
20754
diff
changeset
|
1842 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1843 if (STRINGP (val) && SCHARS (val) == 0 && ! NILP (def)) |
85516
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
1844 val = CONSP (def) ? XCAR (def) : def; |
20865
7a730831aa0e
(read_minibuf): If input is empty, return empty string.
Richard M. Stallman <rms@gnu.org>
parents:
20754
diff
changeset
|
1845 |
18862
2498c062473b
(Fcompleting_read): gcpro def.
Richard M. Stallman <rms@gnu.org>
parents:
18740
diff
changeset
|
1846 RETURN_UNGCPRO (unbind_to (count, val)); |
284 | 1847 } |
1848 | |
1849 Lisp_Object Fminibuffer_completion_help (); | |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1850 Lisp_Object Fassoc_string (); |
9398
a8e59db60df6
(test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9316
diff
changeset
|
1851 |
a8e59db60df6
(test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9316
diff
changeset
|
1852 /* Test whether TXT is an exact completion. */ |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1853 DEFUN ("test-completion", Ftest_completion, Stest_completion, 2, 3, 0, |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1854 doc: /* Return non-nil if STRING is a valid completion. |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1855 Takes the same arguments as `all-completions' and `try-completion'. |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1856 If COLLECTION is a function, it is called with three arguments: |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1857 the values STRING, PREDICATE and `lambda'. */) |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1858 (string, collection, predicate) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1859 Lisp_Object string, collection, predicate; |
9398
a8e59db60df6
(test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9316
diff
changeset
|
1860 { |
53251
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1861 Lisp_Object regexps, tail, tem = Qnil; |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1862 int i = 0; |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1863 |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1864 CHECK_STRING (string); |
9398
a8e59db60df6
(test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9316
diff
changeset
|
1865 |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1866 if ((CONSP (collection) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1867 && (!SYMBOLP (XCAR (collection)) || NILP (XCAR (collection)))) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1868 || NILP (collection)) |
9398
a8e59db60df6
(test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9316
diff
changeset
|
1869 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1870 tem = Fassoc_string (string, collection, completion_ignore_case ? Qt : Qnil); |
64467
39ca630ac332
(Ftest_completion): Fix odd syntax in test.
Ken Raeburn <raeburn@raeburn.org>
parents:
64084
diff
changeset
|
1871 if (NILP (tem)) |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1872 return Qnil; |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1873 } |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1874 else if (VECTORP (collection)) |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1875 { |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1876 /* Bypass intern-soft as that loses for nil. */ |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1877 tem = oblookup (collection, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1878 SDATA (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1879 SCHARS (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1880 SBYTES (string)); |
9460
9f5fef5890c9
(test_completion): Fix reversed condition.
Karl Heuer <kwzh@gnu.org>
parents:
9398
diff
changeset
|
1881 if (!SYMBOLP (tem)) |
22034
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
1882 { |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1883 if (STRING_MULTIBYTE (string)) |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1884 string = Fstring_make_unibyte (string); |
22034
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
1885 else |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1886 string = Fstring_make_multibyte (string); |
22034
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
1887 |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1888 tem = oblookup (collection, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1889 SDATA (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1890 SCHARS (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1891 SBYTES (string)); |
22034
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
1892 } |
53251
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1893 |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1894 if (completion_ignore_case && !SYMBOLP (tem)) |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1895 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1896 for (i = XVECTOR (collection)->size - 1; i >= 0; i--) |
53251
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1897 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1898 tail = XVECTOR (collection)->contents[i]; |
53251
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1899 if (SYMBOLP (tail)) |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1900 while (1) |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1901 { |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1902 if (EQ((Fcompare_strings (string, make_number (0), Qnil, |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1903 Fsymbol_name (tail), |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1904 make_number (0) , Qnil, Qt)), |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1905 Qt)) |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1906 { |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1907 tem = tail; |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1908 break; |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1909 } |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1910 if (XSYMBOL (tail)->next == 0) |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1911 break; |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1912 XSETSYMBOL (tail, XSYMBOL (tail)->next); |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1913 } |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1914 } |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1915 } |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1916 |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1917 if (!SYMBOLP (tem)) |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1918 return Qnil; |
9398
a8e59db60df6
(test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9316
diff
changeset
|
1919 } |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1920 else if (HASH_TABLE_P (collection)) |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1921 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1922 struct Lisp_Hash_Table *h = XHASH_TABLE (collection); |
53251
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1923 i = hash_lookup (h, string, NULL); |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1924 if (i >= 0) |
53251
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1925 tem = HASH_KEY (h, i); |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1926 else |
53251
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1927 for (i = 0; i < HASH_TABLE_SIZE (h); ++i) |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1928 if (!NILP (HASH_HASH (h, i)) && |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1929 EQ (Fcompare_strings (string, make_number (0), Qnil, |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1930 HASH_KEY (h, i), make_number (0) , Qnil, |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1931 completion_ignore_case ? Qt : Qnil), |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1932 Qt)) |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1933 { |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1934 tem = HASH_KEY (h, i); |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1935 break; |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1936 } |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1937 if (!STRINGP (tem)) |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1938 return Qnil; |
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1939 } |
9398
a8e59db60df6
(test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9316
diff
changeset
|
1940 else |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1941 return call3 (collection, string, predicate, Qlambda); |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1942 |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1943 /* Reject this element if it fails to match all the regexps. */ |
56087
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1944 if (CONSP (Vcompletion_regexp_list)) |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1945 { |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1946 int count = SPECPDL_INDEX (); |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1947 specbind (Qcase_fold_search, completion_ignore_case ? Qt : Qnil); |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1948 for (regexps = Vcompletion_regexp_list; CONSP (regexps); |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1949 regexps = XCDR (regexps)) |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1950 { |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1951 if (NILP (Fstring_match (XCAR (regexps), |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1952 SYMBOLP (tem) ? string : tem, |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1953 Qnil))) |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1954 return unbind_to (count, Qnil); |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1955 } |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1956 unbind_to (count, Qnil); |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1957 } |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1958 |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1959 /* Finally, check the predicate. */ |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1960 if (!NILP (predicate)) |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1961 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1962 return HASH_TABLE_P (collection) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1963 ? call2 (predicate, tem, HASH_VALUE (XHASH_TABLE (collection), i)) |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1964 : call1 (predicate, tem); |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1965 } |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1966 else |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1967 return Qt; |
9398
a8e59db60df6
(test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9316
diff
changeset
|
1968 } |
284 | 1969 |
72613
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1970 DEFUN ("internal-complete-buffer", Finternal_complete_buffer, Sinternal_complete_buffer, 3, 3, 0, |
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1971 doc: /* Perform completion on buffer names. |
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1972 If the argument FLAG is nil, invoke `try-completion', if it's t, invoke |
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1973 `all-completions', otherwise invoke `test-completion'. |
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1974 |
73083
fcfd01b24e1e
(Finternal_complete_buffer, Fread_minibuffer, Fdisplay_completion_list):
Juanma Barranquero <lekktu@gmail.com>
parents:
72613
diff
changeset
|
1975 The arguments STRING and PREDICATE are as in `try-completion', |
72613
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1976 `all-completions', and `test-completion'. */) |
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1977 (string, predicate, flag) |
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1978 Lisp_Object string, predicate, flag; |
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1979 { |
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1980 if (NILP (flag)) |
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1981 return Ftry_completion (string, Vbuffer_alist, predicate); |
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1982 else if (EQ (flag, Qt)) |
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1983 return Fall_completions (string, Vbuffer_alist, predicate, Qt); |
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1984 else /* assume `lambda' */ |
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1985 return Ftest_completion (string, Vbuffer_alist, predicate); |
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1986 } |
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1987 |
284 | 1988 /* returns: |
1989 * 0 no possible completion | |
1990 * 1 was already an exact and unique completion | |
1991 * 3 was already an exact completion | |
1992 * 4 completed to an exact completion | |
1993 * 5 some completion happened | |
1994 * 6 no completion happened | |
1995 */ | |
1996 int | |
1997 do_completion () | |
1998 { | |
30684
8488e2964306
(do_completion): Don't consider a simple change of case as `completion'.
Miles Bader <miles@gnu.org>
parents:
28507
diff
changeset
|
1999 Lisp_Object completion, string, tem; |
284 | 2000 int completedp; |
2001 Lisp_Object last; | |
6689
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2002 struct gcpro gcpro1, gcpro2; |
284 | 2003 |
67618
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
2004 completion = Ftry_completion (Fminibuffer_completion_contents (), |
26059
2a7f35e0072b
(Fminibuffer_complete_and_exit): Supply value for new
Gerd Moellmann <gerd@gnu.org>
parents:
25836
diff
changeset
|
2005 Vminibuffer_completion_table, |
284 | 2006 Vminibuffer_completion_predicate); |
2007 last = last_exact_completion; | |
2008 last_exact_completion = Qnil; | |
2009 | |
7190
07c5d4989d9e
(do_completion): Initialize vars before gcpro.
Karl Heuer <kwzh@gnu.org>
parents:
7105
diff
changeset
|
2010 GCPRO2 (completion, last); |
07c5d4989d9e
(do_completion): Initialize vars before gcpro.
Karl Heuer <kwzh@gnu.org>
parents:
7105
diff
changeset
|
2011 |
488 | 2012 if (NILP (completion)) |
284 | 2013 { |
2014 bitch_at_user (); | |
50538
98fb19f9d8d3
(temp_echo_area_glyphs): Change the arg to Lisp
Kenichi Handa <handa@m17n.org>
parents:
49422
diff
changeset
|
2015 temp_echo_area_glyphs (build_string (" [No match]")); |
6689
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2016 UNGCPRO; |
284 | 2017 return 0; |
2018 } | |
2019 | |
2020 if (EQ (completion, Qt)) /* exact and unique match */ | |
6689
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2021 { |
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2022 UNGCPRO; |
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2023 return 1; |
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2024 } |
284 | 2025 |
67618
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
2026 string = Fminibuffer_completion_contents (); |
30684
8488e2964306
(do_completion): Don't consider a simple change of case as `completion'.
Miles Bader <miles@gnu.org>
parents:
28507
diff
changeset
|
2027 |
8488e2964306
(do_completion): Don't consider a simple change of case as `completion'.
Miles Bader <miles@gnu.org>
parents:
28507
diff
changeset
|
2028 /* COMPLETEDP should be true if some completion was done, which |
8488e2964306
(do_completion): Don't consider a simple change of case as `completion'.
Miles Bader <miles@gnu.org>
parents:
28507
diff
changeset
|
2029 doesn't include simply changing the case of the entered string. |
8488e2964306
(do_completion): Don't consider a simple change of case as `completion'.
Miles Bader <miles@gnu.org>
parents:
28507
diff
changeset
|
2030 However, for appearance, the string is rewritten if the case |
8488e2964306
(do_completion): Don't consider a simple change of case as `completion'.
Miles Bader <miles@gnu.org>
parents:
28507
diff
changeset
|
2031 changes. */ |
8488e2964306
(do_completion): Don't consider a simple change of case as `completion'.
Miles Bader <miles@gnu.org>
parents:
28507
diff
changeset
|
2032 tem = Fcompare_strings (completion, Qnil, Qnil, string, Qnil, Qnil, Qt); |
30938
2abe96ba751c
(do_completion): Use EQ instead of != to compare
Gerd Moellmann <gerd@gnu.org>
parents:
30684
diff
changeset
|
2033 completedp = !EQ (tem, Qt); |
30684
8488e2964306
(do_completion): Don't consider a simple change of case as `completion'.
Miles Bader <miles@gnu.org>
parents:
28507
diff
changeset
|
2034 |
31140
943b0b727bc4
(do_completion): Always use compare-string, not string-equal because
Kenichi Handa <handa@m17n.org>
parents:
31105
diff
changeset
|
2035 tem = Fcompare_strings (completion, Qnil, Qnil, string, Qnil, Qnil, Qnil); |
943b0b727bc4
(do_completion): Always use compare-string, not string-equal because
Kenichi Handa <handa@m17n.org>
parents:
31105
diff
changeset
|
2036 if (!EQ (tem, Qt)) |
30684
8488e2964306
(do_completion): Don't consider a simple change of case as `completion'.
Miles Bader <miles@gnu.org>
parents:
28507
diff
changeset
|
2037 /* Rewrite the user's input. */ |
284 | 2038 { |
46019
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2039 int prompt_end = XINT (Fminibuffer_prompt_end ()); |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2040 /* Some completion happened */ |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2041 |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2042 if (! NILP (Vminibuffer_completing_file_name) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2043 && SREF (completion, SBYTES (completion) - 1) == '/' |
46019
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2044 && PT < ZV |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2045 && FETCH_CHAR (PT_BYTE) == '/') |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2046 { |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2047 del_range (prompt_end, PT + 1); |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2048 } |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2049 else |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2050 del_range (prompt_end, PT); |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2051 |
284 | 2052 Finsert (1, &completion); |
30976
d5e13d726a9c
(do_completion): Try again if we rewrite the input string, but no
Miles Bader <miles@gnu.org>
parents:
30938
diff
changeset
|
2053 |
d5e13d726a9c
(do_completion): Try again if we rewrite the input string, but no
Miles Bader <miles@gnu.org>
parents:
30938
diff
changeset
|
2054 if (! completedp) |
d5e13d726a9c
(do_completion): Try again if we rewrite the input string, but no
Miles Bader <miles@gnu.org>
parents:
30938
diff
changeset
|
2055 /* The case of the string changed, but that's all. We're not |
d5e13d726a9c
(do_completion): Try again if we rewrite the input string, but no
Miles Bader <miles@gnu.org>
parents:
30938
diff
changeset
|
2056 sure whether this is a unique completion or not, so try again |
d5e13d726a9c
(do_completion): Try again if we rewrite the input string, but no
Miles Bader <miles@gnu.org>
parents:
30938
diff
changeset
|
2057 using the real case (this shouldn't recurse again, because |
d5e13d726a9c
(do_completion): Try again if we rewrite the input string, but no
Miles Bader <miles@gnu.org>
parents:
30938
diff
changeset
|
2058 the next time try-completion will return either `t' or the |
d5e13d726a9c
(do_completion): Try again if we rewrite the input string, but no
Miles Bader <miles@gnu.org>
parents:
30938
diff
changeset
|
2059 exact string). */ |
d5e13d726a9c
(do_completion): Try again if we rewrite the input string, but no
Miles Bader <miles@gnu.org>
parents:
30938
diff
changeset
|
2060 { |
d5e13d726a9c
(do_completion): Try again if we rewrite the input string, but no
Miles Bader <miles@gnu.org>
parents:
30938
diff
changeset
|
2061 UNGCPRO; |
d5e13d726a9c
(do_completion): Try again if we rewrite the input string, but no
Miles Bader <miles@gnu.org>
parents:
30938
diff
changeset
|
2062 return do_completion (); |
d5e13d726a9c
(do_completion): Try again if we rewrite the input string, but no
Miles Bader <miles@gnu.org>
parents:
30938
diff
changeset
|
2063 } |
284 | 2064 } |
2065 | |
2066 /* It did find a match. Do we match some possibility exactly now? */ | |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
2067 tem = Ftest_completion (Fminibuffer_contents (), |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
2068 Vminibuffer_completion_table, |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
2069 Vminibuffer_completion_predicate); |
488 | 2070 if (NILP (tem)) |
6689
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2071 { |
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2072 /* not an exact match */ |
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2073 UNGCPRO; |
284 | 2074 if (completedp) |
2075 return 5; | |
31105
0c34d4d76e65
(Vcompletion_auto_help): Renamed from `auto_help'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31102
diff
changeset
|
2076 else if (!NILP (Vcompletion_auto_help)) |
284 | 2077 Fminibuffer_completion_help (); |
2078 else | |
50538
98fb19f9d8d3
(temp_echo_area_glyphs): Change the arg to Lisp
Kenichi Handa <handa@m17n.org>
parents:
49422
diff
changeset
|
2079 temp_echo_area_glyphs (build_string (" [Next char not unique]")); |
284 | 2080 return 6; |
2081 } | |
2082 else if (completedp) | |
6689
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2083 { |
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2084 UNGCPRO; |
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2085 return 4; |
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2086 } |
284 | 2087 /* If the last exact completion and this one were the same, |
2088 it means we've already given a "Complete but not unique" | |
330 | 2089 message and the user's hit TAB again, so now we give him help. */ |
284 | 2090 last_exact_completion = completion; |
488 | 2091 if (!NILP (last)) |
284 | 2092 { |
67618
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
2093 tem = Fminibuffer_completion_contents (); |
488 | 2094 if (!NILP (Fequal (tem, last))) |
284 | 2095 Fminibuffer_completion_help (); |
2096 } | |
6689
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2097 UNGCPRO; |
284 | 2098 return 3; |
2099 } | |
6689
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2100 |
330 | 2101 /* Like assoc but assumes KEY is a string, and ignores case if appropriate. */ |
2102 | |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
2103 DEFUN ("assoc-string", Fassoc_string, Sassoc_string, 2, 3, 0, |
76042
c76aa2fa987a
(Fassoc_string): Doc fix. Allow symbol for KEY too.
Kim F. Storm <storm@cua.dk>
parents:
76027
diff
changeset
|
2104 doc: /* Like `assoc' but specifically for strings (and symbols). |
c76aa2fa987a
(Fassoc_string): Doc fix. Allow symbol for KEY too.
Kim F. Storm <storm@cua.dk>
parents:
76027
diff
changeset
|
2105 Symbols are converted to strings, and unibyte strings are converted to |
c76aa2fa987a
(Fassoc_string): Doc fix. Allow symbol for KEY too.
Kim F. Storm <storm@cua.dk>
parents:
76027
diff
changeset
|
2106 multibyte for comparison. |
c76aa2fa987a
(Fassoc_string): Doc fix. Allow symbol for KEY too.
Kim F. Storm <storm@cua.dk>
parents:
76027
diff
changeset
|
2107 Case is ignored if optional arg CASE-FOLD is non-nil. |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
2108 As opposed to `assoc', it will also match an entry consisting of a single |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
2109 string rather than a cons cell whose car is a string. */) |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
2110 (key, list, case_fold) |
330 | 2111 register Lisp_Object key; |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
2112 Lisp_Object list, case_fold; |
330 | 2113 { |
2114 register Lisp_Object tail; | |
2115 | |
76042
c76aa2fa987a
(Fassoc_string): Doc fix. Allow symbol for KEY too.
Kim F. Storm <storm@cua.dk>
parents:
76027
diff
changeset
|
2116 if (SYMBOLP (key)) |
c76aa2fa987a
(Fassoc_string): Doc fix. Allow symbol for KEY too.
Kim F. Storm <storm@cua.dk>
parents:
76027
diff
changeset
|
2117 key = Fsymbol_name (key); |
c76aa2fa987a
(Fassoc_string): Doc fix. Allow symbol for KEY too.
Kim F. Storm <storm@cua.dk>
parents:
76027
diff
changeset
|
2118 |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85333
diff
changeset
|
2119 for (tail = list; CONSP (tail); tail = XCDR (tail)) |
330 | 2120 { |
2121 register Lisp_Object elt, tem, thiscar; | |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85333
diff
changeset
|
2122 elt = XCAR (tail); |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
2123 thiscar = CONSP (elt) ? XCAR (elt) : elt; |
76027
c0a1f896395c
(Fassoc_string): Allow symbols as keys.
Kim F. Storm <storm@cua.dk>
parents:
75725
diff
changeset
|
2124 if (SYMBOLP (thiscar)) |
c0a1f896395c
(Fassoc_string): Allow symbols as keys.
Kim F. Storm <storm@cua.dk>
parents:
75725
diff
changeset
|
2125 thiscar = Fsymbol_name (thiscar); |
c0a1f896395c
(Fassoc_string): Allow symbols as keys.
Kim F. Storm <storm@cua.dk>
parents:
75725
diff
changeset
|
2126 else if (!STRINGP (thiscar)) |
330 | 2127 continue; |
22034
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
2128 tem = Fcompare_strings (thiscar, make_number (0), Qnil, |
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
2129 key, make_number (0), Qnil, |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
2130 case_fold); |
22034
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
2131 if (EQ (tem, Qt)) |
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
2132 return elt; |
330 | 2133 QUIT; |
2134 } | |
2135 return Qnil; | |
2136 } | |
284 | 2137 |
2138 DEFUN ("minibuffer-complete", Fminibuffer_complete, Sminibuffer_complete, 0, 0, "", | |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2139 doc: /* Complete the minibuffer contents as far as possible. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2140 Return nil if there is no valid completion, else t. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2141 If no characters can be completed, display a list of possible completions. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2142 If you repeat this command after it displayed such a list, |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2143 scroll the window of possible completions. */) |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2144 () |
284 | 2145 { |
6544
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2146 register int i; |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2147 Lisp_Object window, tem; |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2148 |
22969
1e29148859d4
(Fminibuffer_complete): this_command renamed to Vthis_command.
Richard M. Stallman <rms@gnu.org>
parents:
22657
diff
changeset
|
2149 /* If the previous command was not this, |
1e29148859d4
(Fminibuffer_complete): this_command renamed to Vthis_command.
Richard M. Stallman <rms@gnu.org>
parents:
22657
diff
changeset
|
2150 mark the completion buffer obsolete. */ |
1e29148859d4
(Fminibuffer_complete): this_command renamed to Vthis_command.
Richard M. Stallman <rms@gnu.org>
parents:
22657
diff
changeset
|
2151 if (! EQ (current_kboard->Vlast_command, Vthis_command)) |
6544
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2152 Vminibuf_scroll_window = Qnil; |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2153 |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2154 window = Vminibuf_scroll_window; |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2155 /* 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
|
2156 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
|
2157 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
|
2158 && !NILP (XBUFFER (XWINDOW (window)->buffer)->name)) |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2159 { |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2160 struct buffer *obuf = current_buffer; |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2161 |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2162 Fset_buffer (XWINDOW (window)->buffer); |
32772
5ce777c66565
(Fminibuffer_complete): Pass nil for FULLY argument to
Miles Bader <miles@gnu.org>
parents:
32714
diff
changeset
|
2163 tem = Fpos_visible_in_window_p (make_number (ZV), window, Qnil); |
6544
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2164 if (! NILP (tem)) |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2165 /* If end is in view, scroll up to the beginning. */ |
18740
db49bcffa9b2
(Fread_from_minibuffer): Remove extra get_keymap argument.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
2166 Fset_window_start (window, make_number (BEGV), Qnil); |
6544
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2167 else |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2168 /* Else scroll down one screen. */ |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2169 Fscroll_other_window (Qnil); |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2170 |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2171 set_buffer_internal (obuf); |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2172 return Qnil; |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2173 } |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2174 |
a84c4990fa36
(read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents:
6504
diff
changeset
|
2175 i = do_completion (); |
284 | 2176 switch (i) |
2177 { | |
2178 case 0: | |
2179 return Qnil; | |
2180 | |
2181 case 1: | |
28158
baf9bc49ab85
(Fminibuffer_complete): Set point to ZV if finding
Gerd Moellmann <gerd@gnu.org>
parents:
28025
diff
changeset
|
2182 if (PT != ZV) |
baf9bc49ab85
(Fminibuffer_complete): Set point to ZV if finding
Gerd Moellmann <gerd@gnu.org>
parents:
28025
diff
changeset
|
2183 Fgoto_char (make_number (ZV)); |
50538
98fb19f9d8d3
(temp_echo_area_glyphs): Change the arg to Lisp
Kenichi Handa <handa@m17n.org>
parents:
49422
diff
changeset
|
2184 temp_echo_area_glyphs (build_string (" [Sole completion]")); |
284 | 2185 break; |
2186 | |
2187 case 3: | |
28025
8e835dd4b3cf
(Fminibuffer_complete): Move point to ZV when input is
Gerd Moellmann <gerd@gnu.org>
parents:
27863
diff
changeset
|
2188 if (PT != ZV) |
8e835dd4b3cf
(Fminibuffer_complete): Move point to ZV when input is
Gerd Moellmann <gerd@gnu.org>
parents:
27863
diff
changeset
|
2189 Fgoto_char (make_number (ZV)); |
50538
98fb19f9d8d3
(temp_echo_area_glyphs): Change the arg to Lisp
Kenichi Handa <handa@m17n.org>
parents:
49422
diff
changeset
|
2190 temp_echo_area_glyphs (build_string (" [Complete, but not unique]")); |
284 | 2191 break; |
2192 } | |
2193 | |
2194 return Qt; | |
2195 } | |
10086
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2196 |
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2197 /* 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
|
2198 |
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2199 /* 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
|
2200 |
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2201 Lisp_Object |
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2202 complete_and_exit_1 () |
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2203 { |
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2204 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
|
2205 } |
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2206 |
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2207 /* 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
|
2208 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
|
2209 |
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2210 Lisp_Object |
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2211 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
|
2212 Lisp_Object ignore; |
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2213 { |
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2214 return make_number (1); |
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2215 } |
284 | 2216 |
60932
1d033a2c8af3
(Fminibuffer_complete_and_exit, Fself_insert_and_exit): Use Fexit_minibuffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60210
diff
changeset
|
2217 EXFUN (Fexit_minibuffer, 0) NO_RETURN; |
1d033a2c8af3
(Fminibuffer_complete_and_exit, Fself_insert_and_exit): Use Fexit_minibuffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60210
diff
changeset
|
2218 |
284 | 2219 DEFUN ("minibuffer-complete-and-exit", Fminibuffer_complete_and_exit, |
40987
d9b11436ac12
(Fminibuffer_complete_word): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
2220 Sminibuffer_complete_and_exit, 0, 0, "", |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2221 doc: /* If the minibuffer contents is a valid completion then exit. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2222 Otherwise try to complete it. If completion leads to a valid completion, |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2223 a repetition of this command will exit. */) |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2224 () |
284 | 2225 { |
2226 register int i; | |
67338
ea1fabf8e347
(Fminibuffer_complete_and_exit): Avoid dangerous side effects in NILP argument.
Ken Raeburn <raeburn@raeburn.org>
parents:
67260
diff
changeset
|
2227 Lisp_Object val, tem; |
284 | 2228 |
2229 /* Allow user to specify null string */ | |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
2230 if (XINT (Fminibuffer_prompt_end ()) == ZV) |
284 | 2231 goto exit; |
2232 | |
58363
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2233 val = Fminibuffer_contents (); |
67338
ea1fabf8e347
(Fminibuffer_complete_and_exit): Avoid dangerous side effects in NILP argument.
Ken Raeburn <raeburn@raeburn.org>
parents:
67260
diff
changeset
|
2234 tem = Ftest_completion (val, |
ea1fabf8e347
(Fminibuffer_complete_and_exit): Avoid dangerous side effects in NILP argument.
Ken Raeburn <raeburn@raeburn.org>
parents:
67260
diff
changeset
|
2235 Vminibuffer_completion_table, |
ea1fabf8e347
(Fminibuffer_complete_and_exit): Avoid dangerous side effects in NILP argument.
Ken Raeburn <raeburn@raeburn.org>
parents:
67260
diff
changeset
|
2236 Vminibuffer_completion_predicate); |
ea1fabf8e347
(Fminibuffer_complete_and_exit): Avoid dangerous side effects in NILP argument.
Ken Raeburn <raeburn@raeburn.org>
parents:
67260
diff
changeset
|
2237 if (!NILP (tem)) |
58363
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2238 { |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2239 if (completion_ignore_case) |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2240 { /* Fixup case of the field, if necessary. */ |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2241 Lisp_Object compl |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2242 = Ftry_completion (val, |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2243 Vminibuffer_completion_table, |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2244 Vminibuffer_completion_predicate); |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2245 if (STRINGP (compl) |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2246 /* If it weren't for this piece of paranoia, I'd replace |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2247 the whole thing with a call to do_completion. */ |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2248 && EQ (Flength (val), Flength (compl))) |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2249 { |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2250 del_range (XINT (Fminibuffer_prompt_end ()), ZV); |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2251 Finsert (1, &compl); |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2252 } |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2253 } |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2254 goto exit; |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2255 } |
f8ac0eb0faa3
(Fminibuffer_complete_and_exit):
Richard M. Stallman <rms@gnu.org>
parents:
58359
diff
changeset
|
2256 |
81672
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
2257 if (EQ (Vminibuffer_completion_confirm, intern ("confirm-only"))) |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
2258 { /* The user is permitted to exit with an input that's rejected |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
2259 by test-completion, but at the condition to confirm her choice. */ |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
2260 if (EQ (current_kboard->Vlast_command, Vthis_command)) |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
2261 goto exit; |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
2262 else |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
2263 { |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
2264 temp_echo_area_glyphs (build_string (" [Confirm]")); |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
2265 return Qnil; |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
2266 } |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
2267 } |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
2268 |
10086
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2269 /* Call do_completion, but ignore errors. */ |
46105
a6851d9363cd
(Fminibuffer_complete_and_exit): Move to end of buffer for completion.
Richard M. Stallman <rms@gnu.org>
parents:
46058
diff
changeset
|
2270 SET_PT (ZV); |
10086
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2271 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
|
2272 complete_and_exit_2); |
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2273 |
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2274 i = XFASTINT (val); |
284 | 2275 switch (i) |
2276 { | |
2277 case 1: | |
2278 case 3: | |
2279 goto exit; | |
2280 | |
2281 case 4: | |
488 | 2282 if (!NILP (Vminibuffer_completion_confirm)) |
284 | 2283 { |
50538
98fb19f9d8d3
(temp_echo_area_glyphs): Change the arg to Lisp
Kenichi Handa <handa@m17n.org>
parents:
49422
diff
changeset
|
2284 temp_echo_area_glyphs (build_string (" [Confirm]")); |
284 | 2285 return Qnil; |
2286 } | |
2287 else | |
2288 goto exit; | |
2289 | |
2290 default: | |
2291 return Qnil; | |
2292 } | |
2293 exit: | |
60932
1d033a2c8af3
(Fminibuffer_complete_and_exit, Fself_insert_and_exit): Use Fexit_minibuffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60210
diff
changeset
|
2294 return Fexit_minibuffer (); |
284 | 2295 /* NOTREACHED */ |
2296 } | |
2297 | |
2298 DEFUN ("minibuffer-complete-word", Fminibuffer_complete_word, Sminibuffer_complete_word, | |
40987
d9b11436ac12
(Fminibuffer_complete_word): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
2299 0, 0, "", |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2300 doc: /* Complete the minibuffer contents at most a single word. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2301 After one word is completed as much as possible, a space or hyphen |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2302 is added, provided that matches some possible completion. |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2303 Return nil if there is no valid completion, else t. */) |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2304 () |
284 | 2305 { |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2306 Lisp_Object completion, tem, tem1; |
20584
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
2307 register int i, i_byte; |
7672
c6d09116d66a
(Fminibuffer_complete_word): GCPRO completion and tem.
Karl Heuer <kwzh@gnu.org>
parents:
7307
diff
changeset
|
2308 struct gcpro gcpro1, gcpro2; |
46019
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2309 int prompt_end_charpos = XINT (Fminibuffer_prompt_end ()); |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
2310 |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
2311 /* 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
|
2312 hold onto a pointer to one of the strings thus made. */ |
284 | 2313 |
67618
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
2314 completion = Ftry_completion (Fminibuffer_completion_contents (), |
284 | 2315 Vminibuffer_completion_table, |
2316 Vminibuffer_completion_predicate); | |
488 | 2317 if (NILP (completion)) |
284 | 2318 { |
2319 bitch_at_user (); | |
50538
98fb19f9d8d3
(temp_echo_area_glyphs): Change the arg to Lisp
Kenichi Handa <handa@m17n.org>
parents:
49422
diff
changeset
|
2320 temp_echo_area_glyphs (build_string (" [No match]")); |
284 | 2321 return Qnil; |
2322 } | |
2323 if (EQ (completion, Qt)) | |
2324 return Qnil; | |
2325 | |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
2326 #if 0 /* How the below code used to look, for reference. */ |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
2327 tem = Fminibuffer_contents (); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2328 b = SDATA (tem); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2329 i = ZV - 1 - SCHARS (completion); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2330 p = SDATA (completion); |
284 | 2331 if (i > 0 || |
2332 0 <= scmp (b, p, ZV - 1)) | |
2333 { | |
2334 i = 1; | |
2335 /* Set buffer to longest match of buffer tail and completion head. */ | |
2336 while (0 <= scmp (b + i, p, ZV - 1 - i)) | |
2337 i++; | |
2338 del_range (1, i + 1); | |
2339 SET_PT (ZV); | |
2340 } | |
2341 #else /* Rewritten code */ | |
2342 { | |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2343 int buffer_nchars, completion_nchars; |
284 | 2344 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40403
diff
changeset
|
2345 CHECK_STRING (completion); |
67618
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
2346 tem = Fminibuffer_completion_contents (); |
7672
c6d09116d66a
(Fminibuffer_complete_word): GCPRO completion and tem.
Karl Heuer <kwzh@gnu.org>
parents:
7307
diff
changeset
|
2347 GCPRO2 (completion, tem); |
4641
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
2348 /* If reading a file name, |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
2349 expand any $ENVVAR refs in the buffer and in TEM. */ |
75725
55bd832be66b
Fix last change -- undo the following part of that change:
Kim F. Storm <storm@cua.dk>
parents:
75720
diff
changeset
|
2350 if (! NILP (Vminibuffer_completing_file_name)) |
4641
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
2351 { |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
2352 Lisp_Object substituted; |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
2353 substituted = Fsubstitute_in_file_name (tem); |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
2354 if (! EQ (substituted, tem)) |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
2355 { |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
2356 tem = substituted; |
46019
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2357 del_range (prompt_end_charpos, PT); |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2358 Finsert (1, &tem); |
4641
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
2359 } |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
2360 } |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2361 buffer_nchars = SCHARS (tem); /* # chars in what we completed. */ |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2362 completion_nchars = SCHARS (completion); |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2363 i = buffer_nchars - completion_nchars; |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2364 if (i > 0 |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2365 || |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2366 (tem1 = Fcompare_strings (tem, make_number (0), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2367 make_number (buffer_nchars), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2368 completion, make_number (0), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2369 make_number (buffer_nchars), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2370 completion_ignore_case ? Qt : Qnil), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2371 ! EQ (tem1, Qt))) |
284 | 2372 { |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2373 int start_pos; |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2374 |
46019
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2375 /* Make buffer (before point) contain the longest match |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2376 of TEM's tail and COMPLETION's head. */ |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2377 if (i <= 0) i = 1; |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2378 start_pos= i; |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2379 buffer_nchars -= i; |
22048
26a0c01f7551
(Fminibuffer_complete_word): Fix the string-comparison loop.
Richard M. Stallman <rms@gnu.org>
parents:
22038
diff
changeset
|
2380 while (i > 0) |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2381 { |
22048
26a0c01f7551
(Fminibuffer_complete_word): Fix the string-comparison loop.
Richard M. Stallman <rms@gnu.org>
parents:
22038
diff
changeset
|
2382 tem1 = Fcompare_strings (tem, make_number (start_pos), Qnil, |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2383 completion, make_number (0), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2384 make_number (buffer_nchars), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2385 completion_ignore_case ? Qt : Qnil); |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2386 start_pos++; |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2387 if (EQ (tem1, Qt)) |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2388 break; |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2389 i++; |
22048
26a0c01f7551
(Fminibuffer_complete_word): Fix the string-comparison loop.
Richard M. Stallman <rms@gnu.org>
parents:
22038
diff
changeset
|
2390 buffer_nchars--; |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
2391 } |
51039
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
2392 del_range (start_pos, start_pos + buffer_nchars); |
284 | 2393 } |
7672
c6d09116d66a
(Fminibuffer_complete_word): GCPRO completion and tem.
Karl Heuer <kwzh@gnu.org>
parents:
7307
diff
changeset
|
2394 UNGCPRO; |
284 | 2395 } |
2396 #endif /* Rewritten code */ | |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
2397 |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
2398 { |
26059
2a7f35e0072b
(Fminibuffer_complete_and_exit): Supply value for new
Gerd Moellmann <gerd@gnu.org>
parents:
25836
diff
changeset
|
2399 int prompt_end_bytepos; |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
2400 prompt_end_bytepos = CHAR_TO_BYTE (prompt_end_charpos); |
46019
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2401 i = PT - prompt_end_charpos; |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2402 i_byte = PT_BYTE - prompt_end_bytepos; |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
2403 } |
284 | 2404 |
2405 /* 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
|
2406 consider adding a space or a hyphen. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2407 if (i == SCHARS (completion)) |
284 | 2408 { |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
2409 GCPRO1 (completion); |
67618
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
2410 tem = Ftry_completion (concat2 (Fminibuffer_completion_contents (), |
46019
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2411 build_string (" ")), |
284 | 2412 Vminibuffer_completion_table, |
2413 Vminibuffer_completion_predicate); | |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
2414 UNGCPRO; |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
2415 |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
2416 if (STRINGP (tem)) |
284 | 2417 completion = tem; |
2418 else | |
2419 { | |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
2420 GCPRO1 (completion); |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
2421 tem = |
67618
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
2422 Ftry_completion (concat2 (Fminibuffer_completion_contents (), |
46019
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2423 build_string ("-")), |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
2424 Vminibuffer_completion_table, |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
2425 Vminibuffer_completion_predicate); |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
2426 UNGCPRO; |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
2427 |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
2428 if (STRINGP (tem)) |
284 | 2429 completion = tem; |
2430 } | |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
2431 } |
284 | 2432 |
2433 /* Now find first word-break in the stuff found by completion. | |
2434 i gets index in string of where to stop completing. */ | |
89483 | 2435 while (i_byte < SBYTES (completion)) |
89059
288b118954ca
(Fminibuffer_complete_word): Use the macro
Kenichi Handa <handa@m17n.org>
parents:
88830
diff
changeset
|
2436 { |
288b118954ca
(Fminibuffer_complete_word): Use the macro
Kenichi Handa <handa@m17n.org>
parents:
88830
diff
changeset
|
2437 int c; |
288b118954ca
(Fminibuffer_complete_word): Use the macro
Kenichi Handa <handa@m17n.org>
parents:
88830
diff
changeset
|
2438 |
288b118954ca
(Fminibuffer_complete_word): Use the macro
Kenichi Handa <handa@m17n.org>
parents:
88830
diff
changeset
|
2439 FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE (c, completion, i, i_byte); |
288b118954ca
(Fminibuffer_complete_word): Use the macro
Kenichi Handa <handa@m17n.org>
parents:
88830
diff
changeset
|
2440 if (SYNTAX (c) != Sword) |
288b118954ca
(Fminibuffer_complete_word): Use the macro
Kenichi Handa <handa@m17n.org>
parents:
88830
diff
changeset
|
2441 break; |
288b118954ca
(Fminibuffer_complete_word): Use the macro
Kenichi Handa <handa@m17n.org>
parents:
88830
diff
changeset
|
2442 } |
284 | 2443 |
2444 /* If got no characters, print help for user. */ | |
2445 | |
46019
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2446 if (i == PT - prompt_end_charpos) |
284 | 2447 { |
31105
0c34d4d76e65
(Vcompletion_auto_help): Renamed from `auto_help'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31102
diff
changeset
|
2448 if (!NILP (Vcompletion_auto_help)) |
284 | 2449 Fminibuffer_completion_help (); |
2450 return Qnil; | |
2451 } | |
2452 | |
2453 /* Otherwise insert in minibuffer the chars we got */ | |
2454 | |
46019
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2455 if (! NILP (Vminibuffer_completing_file_name) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2456 && SREF (completion, SBYTES (completion) - 1) == '/' |
46019
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2457 && PT < ZV |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2458 && FETCH_CHAR (PT_BYTE) == '/') |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2459 { |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2460 del_range (prompt_end_charpos, PT + 1); |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2461 } |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2462 else |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2463 del_range (prompt_end_charpos, PT); |
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
2464 |
20584
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
2465 insert_from_string (completion, 0, 0, i, i_byte, 1); |
284 | 2466 return Qt; |
2467 } | |
2468 | |
2469 DEFUN ("display-completion-list", Fdisplay_completion_list, Sdisplay_completion_list, | |
66114
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65758
diff
changeset
|
2470 1, 2, 0, |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2471 doc: /* Display the list of completions, COMPLETIONS, using `standard-output'. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2472 Each element may be just a symbol or string |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2473 or may be a list of two strings to be printed as if concatenated. |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2474 If it is a list of two strings, the first is the actual completion |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2475 alternative, the second serves as annotation. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2476 `standard-output' must be a buffer. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2477 The actual completion alternatives, as inserted, are given `mouse-face' |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2478 properties of `highlight'. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2479 At the end, this runs the normal hook `completion-setup-hook'. |
66237
eef44f16f6c3
(display_completion_list_1): New wrapper function
Kim F. Storm <storm@cua.dk>
parents:
66217
diff
changeset
|
2480 It can find the completion buffer in `standard-output'. |
eef44f16f6c3
(display_completion_list_1): New wrapper function
Kim F. Storm <storm@cua.dk>
parents:
66217
diff
changeset
|
2481 The optional second arg COMMON-SUBSTRING is a string. |
66400 | 2482 It is used to put faces, `completions-first-difference' and |
66217
a75cbd554fc1
(Fdisplay_completion_list): Doc fix.
Andreas Schwab <schwab@suse.de>
parents:
66114
diff
changeset
|
2483 `completions-common-part' on the completion buffer. The |
66114
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65758
diff
changeset
|
2484 `completions-common-part' face is put on the common substring |
73083
fcfd01b24e1e
(Finternal_complete_buffer, Fread_minibuffer, Fdisplay_completion_list):
Juanma Barranquero <lekktu@gmail.com>
parents:
72613
diff
changeset
|
2485 specified by COMMON-SUBSTRING. If COMMON-SUBSTRING is nil |
67618
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
2486 and the current buffer is not the minibuffer, the faces are not put. |
66237
eef44f16f6c3
(display_completion_list_1): New wrapper function
Kim F. Storm <storm@cua.dk>
parents:
66217
diff
changeset
|
2487 Internally, COMMON-SUBSTRING is bound to `completion-common-substring' |
66114
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65758
diff
changeset
|
2488 during running `completion-setup-hook'. */) |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65758
diff
changeset
|
2489 (completions, common_substring) |
284 | 2490 Lisp_Object completions; |
66114
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65758
diff
changeset
|
2491 Lisp_Object common_substring; |
284 | 2492 { |
12783
9e1a16d1ff73
(Fdisplay_completion_list): gcpro elt.
Richard M. Stallman <rms@gnu.org>
parents:
12631
diff
changeset
|
2493 Lisp_Object tail, elt; |
284 | 2494 register int i; |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
2495 int column = 0; |
66114
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65758
diff
changeset
|
2496 struct gcpro gcpro1, gcpro2, gcpro3; |
8314
e0f95bf90681
(Fdisplay_completion_list): gcpro `completions'.
Richard M. Stallman <rms@gnu.org>
parents:
8041
diff
changeset
|
2497 struct buffer *old = current_buffer; |
9903
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2498 int first = 1; |
8314
e0f95bf90681
(Fdisplay_completion_list): gcpro `completions'.
Richard M. Stallman <rms@gnu.org>
parents:
8041
diff
changeset
|
2499 |
e0f95bf90681
(Fdisplay_completion_list): gcpro `completions'.
Richard M. Stallman <rms@gnu.org>
parents:
8041
diff
changeset
|
2500 /* Note that (when it matters) every variable |
12783
9e1a16d1ff73
(Fdisplay_completion_list): gcpro elt.
Richard M. Stallman <rms@gnu.org>
parents:
12631
diff
changeset
|
2501 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
|
2502 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
|
2503 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
|
2504 elt = Qnil; |
66114
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65758
diff
changeset
|
2505 GCPRO3 (completions, elt, common_substring); |
8314
e0f95bf90681
(Fdisplay_completion_list): gcpro `completions'.
Richard M. Stallman <rms@gnu.org>
parents:
8041
diff
changeset
|
2506 |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
2507 if (BUFFERP (Vstandard_output)) |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
2508 set_buffer_internal (XBUFFER (Vstandard_output)); |
284 | 2509 |
488 | 2510 if (NILP (completions)) |
4102
dba3acd9972c
(Fdisplay_completion_list): Run completion-setup-hook.
Richard M. Stallman <rms@gnu.org>
parents:
3841
diff
changeset
|
2511 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
|
2512 -1); |
284 | 2513 else |
2514 { | |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
2515 write_string ("Possible completions are:", -1); |
67720
477912b55071
(Fdisplay_completion_list): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67618
diff
changeset
|
2516 for (tail = completions, i = 0; CONSP (tail); tail = XCDR (tail), i++) |
284 | 2517 { |
21854
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
2518 Lisp_Object tem, string; |
9903
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2519 int length; |
12978
88a47d611c4a
(Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents:
12783
diff
changeset
|
2520 Lisp_Object startpos, endpos; |
9903
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2521 |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31140
diff
changeset
|
2522 startpos = Qnil; |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31140
diff
changeset
|
2523 |
67720
477912b55071
(Fdisplay_completion_list): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67618
diff
changeset
|
2524 elt = XCAR (tail); |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2525 if (SYMBOLP (elt)) |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2526 elt = SYMBOL_NAME (elt); |
9903
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2527 /* Compute the length of this element. */ |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2528 if (CONSP (elt)) |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2529 { |
17375
b3227e0446cf
(scmp, Fdisplay_completion_list): Fix Lisp_Object/integer confusion.
Karl Heuer <kwzh@gnu.org>
parents:
17039
diff
changeset
|
2530 tem = XCAR (elt); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40403
diff
changeset
|
2531 CHECK_STRING (tem); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2532 length = SCHARS (tem); |
9903
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2533 |
17375
b3227e0446cf
(scmp, Fdisplay_completion_list): Fix Lisp_Object/integer confusion.
Karl Heuer <kwzh@gnu.org>
parents:
17039
diff
changeset
|
2534 tem = Fcar (XCDR (elt)); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40403
diff
changeset
|
2535 CHECK_STRING (tem); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2536 length += SCHARS (tem); |
9903
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2537 } |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2538 else |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2539 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40403
diff
changeset
|
2540 CHECK_STRING (elt); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2541 length = SCHARS (elt); |
9903
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2542 } |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2543 |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2544 /* 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
|
2545 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
|
2546 until after the text has been made. */ |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2547 |
12978
88a47d611c4a
(Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents:
12783
diff
changeset
|
2548 if (BUFFERP (Vstandard_output)) |
88a47d611c4a
(Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents:
12783
diff
changeset
|
2549 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
|
2550 |
9903
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2551 /* If the previous completion was very wide, |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2552 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
|
2553 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
|
2554 if (column > 33 || first |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2555 /* If this is really wide, don't put it second on a line. */ |
25738
4b5b9289f6d8
(read_minibuf): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25673
diff
changeset
|
2556 || (column > 0 && length > 45)) |
9903
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2557 { |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2558 Fterpri (Qnil); |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2559 column = 0; |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2560 } |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2561 /* Otherwise advance to column 35. */ |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2562 else |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
2563 { |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
2564 if (BUFFERP (Vstandard_output)) |
9903
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2565 { |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2566 tem = Findent_to (make_number (35), make_number (2)); |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
2567 |
9903
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2568 column = XINT (tem); |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2569 } |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
2570 else |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
2571 { |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
2572 do |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
2573 { |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
2574 write_string (" ", -1); |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
2575 column++; |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
2576 } |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
2577 while (column < 35); |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
2578 } |
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
2579 } |
9903
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2580 |
12978
88a47d611c4a
(Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents:
12783
diff
changeset
|
2581 if (BUFFERP (Vstandard_output)) |
88a47d611c4a
(Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents:
12783
diff
changeset
|
2582 { |
88a47d611c4a
(Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents:
12783
diff
changeset
|
2583 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
|
2584 Fset_text_properties (startpos, endpos, |
88a47d611c4a
(Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents:
12783
diff
changeset
|
2585 Qnil, Vstandard_output); |
88a47d611c4a
(Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents:
12783
diff
changeset
|
2586 } |
88a47d611c4a
(Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents:
12783
diff
changeset
|
2587 |
21854
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
2588 /* Output this element. |
22034
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
2589 If necessary, convert it to unibyte or to multibyte first. */ |
284 | 2590 if (CONSP (elt)) |
21854
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
2591 string = Fcar (elt); |
284 | 2592 else |
21854
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
2593 string = elt; |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
2594 if (NILP (current_buffer->enable_multibyte_characters) |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
2595 && STRING_MULTIBYTE (string)) |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
2596 string = Fstring_make_unibyte (string); |
22034
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
2597 else if (!NILP (current_buffer->enable_multibyte_characters) |
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
2598 && !STRING_MULTIBYTE (string)) |
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
2599 string = Fstring_make_multibyte (string); |
23448
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
2600 |
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
2601 if (BUFFERP (Vstandard_output)) |
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
2602 { |
23449 | 2603 XSETINT (startpos, BUF_PT (XBUFFER (Vstandard_output))); |
23448
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
2604 |
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
2605 Fprinc (string, Qnil); |
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
2606 |
23449 | 2607 XSETINT (endpos, BUF_PT (XBUFFER (Vstandard_output))); |
23448
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
2608 |
23449 | 2609 Fput_text_property (startpos, endpos, |
23448
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
2610 Qmouse_face, intern ("highlight"), |
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
2611 Vstandard_output); |
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
2612 } |
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
2613 else |
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
2614 { |
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
2615 Fprinc (string, Qnil); |
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
2616 } |
9903
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2617 |
21854
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
2618 /* Output the annotation for this element. */ |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
2619 if (CONSP (elt)) |
23449 | 2620 { |
2621 if (BUFFERP (Vstandard_output)) | |
2622 { | |
2623 XSETINT (startpos, BUF_PT (XBUFFER (Vstandard_output))); | |
2624 | |
2625 Fprinc (Fcar (Fcdr (elt)), Qnil); | |
2626 | |
2627 XSETINT (endpos, BUF_PT (XBUFFER (Vstandard_output))); | |
2628 | |
2629 Fset_text_properties (startpos, endpos, Qnil, | |
2630 Vstandard_output); | |
2631 } | |
2632 else | |
2633 { | |
2634 Fprinc (Fcar (Fcdr (elt)), Qnil); | |
2635 } | |
2636 } | |
2637 | |
21854
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
2638 |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
2639 /* Update COLUMN for what we have output. */ |
9903
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2640 column += length; |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2641 |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2642 /* 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
|
2643 that takes account of character widths. */ |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2644 if (BUFFERP (Vstandard_output)) |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
2645 { |
9903
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2646 tem = Fcurrent_column (); |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2647 column = XINT (tem); |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
2648 } |
9903
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2649 |
133888d97e98
(Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
9625
diff
changeset
|
2650 first = 0; |
284 | 2651 } |
2652 } | |
736
18b892513cb7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
2653 |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
2654 if (BUFFERP (Vstandard_output)) |
6161
4a1c5b2c005d
(Fdisplay_completion_list): Restore original buffer
Richard M. Stallman <rms@gnu.org>
parents:
5376
diff
changeset
|
2655 set_buffer_internal (old); |
4a1c5b2c005d
(Fdisplay_completion_list): Restore original buffer
Richard M. Stallman <rms@gnu.org>
parents:
5376
diff
changeset
|
2656 |
4102
dba3acd9972c
(Fdisplay_completion_list): Run completion-setup-hook.
Richard M. Stallman <rms@gnu.org>
parents:
3841
diff
changeset
|
2657 if (!NILP (Vrun_hooks)) |
66114
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65758
diff
changeset
|
2658 { |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65758
diff
changeset
|
2659 int count1 = SPECPDL_INDEX (); |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65758
diff
changeset
|
2660 |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65758
diff
changeset
|
2661 specbind (intern ("completion-common-substring"), common_substring); |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65758
diff
changeset
|
2662 call1 (Vrun_hooks, intern ("completion-setup-hook")); |
66237
eef44f16f6c3
(display_completion_list_1): New wrapper function
Kim F. Storm <storm@cua.dk>
parents:
66217
diff
changeset
|
2663 |
66114
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65758
diff
changeset
|
2664 unbind_to (count1, Qnil); |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65758
diff
changeset
|
2665 } |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65758
diff
changeset
|
2666 |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65758
diff
changeset
|
2667 UNGCPRO; |
4102
dba3acd9972c
(Fdisplay_completion_list): Run completion-setup-hook.
Richard M. Stallman <rms@gnu.org>
parents:
3841
diff
changeset
|
2668 |
284 | 2669 return Qnil; |
2670 } | |
2671 | |
66237
eef44f16f6c3
(display_completion_list_1): New wrapper function
Kim F. Storm <storm@cua.dk>
parents:
66217
diff
changeset
|
2672 |
eef44f16f6c3
(display_completion_list_1): New wrapper function
Kim F. Storm <storm@cua.dk>
parents:
66217
diff
changeset
|
2673 static Lisp_Object |
eef44f16f6c3
(display_completion_list_1): New wrapper function
Kim F. Storm <storm@cua.dk>
parents:
66217
diff
changeset
|
2674 display_completion_list_1 (list) |
eef44f16f6c3
(display_completion_list_1): New wrapper function
Kim F. Storm <storm@cua.dk>
parents:
66217
diff
changeset
|
2675 Lisp_Object list; |
eef44f16f6c3
(display_completion_list_1): New wrapper function
Kim F. Storm <storm@cua.dk>
parents:
66217
diff
changeset
|
2676 { |
67618
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
2677 return Fdisplay_completion_list (list, Qnil); |
66237
eef44f16f6c3
(display_completion_list_1): New wrapper function
Kim F. Storm <storm@cua.dk>
parents:
66217
diff
changeset
|
2678 } |
eef44f16f6c3
(display_completion_list_1): New wrapper function
Kim F. Storm <storm@cua.dk>
parents:
66217
diff
changeset
|
2679 |
284 | 2680 DEFUN ("minibuffer-completion-help", Fminibuffer_completion_help, Sminibuffer_completion_help, |
40987
d9b11436ac12
(Fminibuffer_complete_word): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
2681 0, 0, "", |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2682 doc: /* Display a list of possible completions of the current minibuffer contents. */) |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2683 () |
284 | 2684 { |
2685 Lisp_Object completions; | |
2686 | |
2687 message ("Making completion list..."); | |
67618
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
2688 completions = Fall_completions (Fminibuffer_completion_contents (), |
284 | 2689 Vminibuffer_completion_table, |
10173
6a4f5fc9d3f9
(Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents:
10086
diff
changeset
|
2690 Vminibuffer_completion_predicate, |
6a4f5fc9d3f9
(Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents:
10086
diff
changeset
|
2691 Qt); |
25354
2049a0c919a1
Remove conditional compilation on
Gerd Moellmann <gerd@gnu.org>
parents:
25014
diff
changeset
|
2692 clear_message (1, 0); |
284 | 2693 |
488 | 2694 if (NILP (completions)) |
284 | 2695 { |
2696 bitch_at_user (); | |
50538
98fb19f9d8d3
(temp_echo_area_glyphs): Change the arg to Lisp
Kenichi Handa <handa@m17n.org>
parents:
49422
diff
changeset
|
2697 temp_echo_area_glyphs (build_string (" [No completions]")); |
284 | 2698 } |
2699 else | |
67720
477912b55071
(Fdisplay_completion_list): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67618
diff
changeset
|
2700 { |
477912b55071
(Fdisplay_completion_list): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67618
diff
changeset
|
2701 /* Sort and remove duplicates. */ |
477912b55071
(Fdisplay_completion_list): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67618
diff
changeset
|
2702 Lisp_Object tmp = completions = Fsort (completions, Qstring_lessp); |
477912b55071
(Fdisplay_completion_list): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67618
diff
changeset
|
2703 while (CONSP (tmp)) |
477912b55071
(Fdisplay_completion_list): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67618
diff
changeset
|
2704 { |
477912b55071
(Fdisplay_completion_list): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67618
diff
changeset
|
2705 if (CONSP (XCDR (tmp)) |
477912b55071
(Fdisplay_completion_list): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67618
diff
changeset
|
2706 && !NILP (Fequal (XCAR (tmp), XCAR (XCDR (tmp))))) |
477912b55071
(Fdisplay_completion_list): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67618
diff
changeset
|
2707 XSETCDR (tmp, XCDR (XCDR (tmp))); |
477912b55071
(Fdisplay_completion_list): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67618
diff
changeset
|
2708 else |
477912b55071
(Fdisplay_completion_list): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67618
diff
changeset
|
2709 tmp = XCDR (tmp); |
477912b55071
(Fdisplay_completion_list): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67618
diff
changeset
|
2710 } |
477912b55071
(Fdisplay_completion_list): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67618
diff
changeset
|
2711 internal_with_output_to_temp_buffer ("*Completions*", |
477912b55071
(Fdisplay_completion_list): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67618
diff
changeset
|
2712 display_completion_list_1, |
477912b55071
(Fdisplay_completion_list): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67618
diff
changeset
|
2713 completions); |
477912b55071
(Fdisplay_completion_list): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67618
diff
changeset
|
2714 } |
284 | 2715 return Qnil; |
2716 } | |
2717 | |
2718 DEFUN ("self-insert-and-exit", Fself_insert_and_exit, Sself_insert_and_exit, 0, 0, "", | |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2719 doc: /* Terminate minibuffer input. */) |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2720 () |
284 | 2721 { |
88830
2bf7fdb1e66e
(Fminibuffer_complete_word): Remove unused var.
Dave Love <fx@gnu.org>
parents:
88351
diff
changeset
|
2722 if (CHARACTERP (last_command_char)) |
21529
8c50610fbb99
(Fself_insert_and_exit): Fix mixing of Lisp_Object and
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
2723 internal_self_insert (XINT (last_command_char), 0); |
284 | 2724 else |
2725 bitch_at_user (); | |
2726 | |
60932
1d033a2c8af3
(Fminibuffer_complete_and_exit, Fself_insert_and_exit): Use Fexit_minibuffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60210
diff
changeset
|
2727 return Fexit_minibuffer (); |
284 | 2728 } |
2729 | |
2730 DEFUN ("exit-minibuffer", Fexit_minibuffer, Sexit_minibuffer, 0, 0, "", | |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2731 doc: /* Terminate this minibuffer argument. */) |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2732 () |
284 | 2733 { |
60932
1d033a2c8af3
(Fminibuffer_complete_and_exit, Fself_insert_and_exit): Use Fexit_minibuffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60210
diff
changeset
|
2734 /* If the command that uses this has made modifications in the minibuffer, |
1d033a2c8af3
(Fminibuffer_complete_and_exit, Fself_insert_and_exit): Use Fexit_minibuffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60210
diff
changeset
|
2735 we don't want them to cause deactivation of the mark in the original |
1d033a2c8af3
(Fminibuffer_complete_and_exit, Fself_insert_and_exit): Use Fexit_minibuffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60210
diff
changeset
|
2736 buffer. |
1d033a2c8af3
(Fminibuffer_complete_and_exit, Fself_insert_and_exit): Use Fexit_minibuffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60210
diff
changeset
|
2737 A better solution would be to make deactivate-mark buffer-local |
1d033a2c8af3
(Fminibuffer_complete_and_exit, Fself_insert_and_exit): Use Fexit_minibuffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60210
diff
changeset
|
2738 (or to turn it into a list of buffers, ...), but in the mean time, |
1d033a2c8af3
(Fminibuffer_complete_and_exit, Fself_insert_and_exit): Use Fexit_minibuffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60210
diff
changeset
|
2739 this should do the trick in most cases. */ |
1d033a2c8af3
(Fminibuffer_complete_and_exit, Fself_insert_and_exit): Use Fexit_minibuffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60210
diff
changeset
|
2740 Vdeactivate_mark = Qnil; |
1d033a2c8af3
(Fminibuffer_complete_and_exit, Fself_insert_and_exit): Use Fexit_minibuffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60210
diff
changeset
|
2741 Fthrow (Qexit, Qnil); |
284 | 2742 } |
2743 | |
2744 DEFUN ("minibuffer-depth", Fminibuffer_depth, Sminibuffer_depth, 0, 0, 0, | |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2745 doc: /* Return current depth of activations of minibuffer, a nonnegative integer. */) |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2746 () |
284 | 2747 { |
2748 return make_number (minibuf_level); | |
2749 } | |
2750 | |
6590
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
2751 DEFUN ("minibuffer-prompt", Fminibuffer_prompt, Sminibuffer_prompt, 0, 0, 0, |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2752 doc: /* Return the prompt string of the currently-active minibuffer. |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2753 If no minibuffer is active, return nil. */) |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2754 () |
6590
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
2755 { |
7952
9e2e0fdd1710
(minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents:
7836
diff
changeset
|
2756 return Fcopy_sequence (minibuf_prompt); |
6590
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
2757 } |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
2758 |
284 | 2759 |
50538
98fb19f9d8d3
(temp_echo_area_glyphs): Change the arg to Lisp
Kenichi Handa <handa@m17n.org>
parents:
49422
diff
changeset
|
2760 /* Temporarily display STRING at the end of the current |
16991
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2761 minibuffer contents. This is used to display things like |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2762 "[No Match]" when the user requests a completion for a prefix |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2763 that has no possible completions, and other quick, unobtrusive |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2764 messages. */ |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2765 |
73316
3dc812144482
* minibuf.c (temp_echo_area_glyphs): Sit for
Chong Yidong <cyd@stupidchicken.com>
parents:
73083
diff
changeset
|
2766 extern Lisp_Object Vminibuffer_message_timeout; |
3dc812144482
* minibuf.c (temp_echo_area_glyphs): Sit for
Chong Yidong <cyd@stupidchicken.com>
parents:
73083
diff
changeset
|
2767 |
20302
5b3bc7f24d51
(read_minibuf_unwind): Fix return type and return nil.
Andreas Schwab <schwab@suse.de>
parents:
20075
diff
changeset
|
2768 void |
50538
98fb19f9d8d3
(temp_echo_area_glyphs): Change the arg to Lisp
Kenichi Handa <handa@m17n.org>
parents:
49422
diff
changeset
|
2769 temp_echo_area_glyphs (string) |
98fb19f9d8d3
(temp_echo_area_glyphs): Change the arg to Lisp
Kenichi Handa <handa@m17n.org>
parents:
49422
diff
changeset
|
2770 Lisp_Object string; |
16991
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2771 { |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2772 int osize = ZV; |
20532
7ffd3d9afeb4
(Fminibuffer_complete_word): Handle bytes vs characters
Richard M. Stallman <rms@gnu.org>
parents:
20523
diff
changeset
|
2773 int osize_byte = ZV_BYTE; |
16991
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2774 int opoint = PT; |
20532
7ffd3d9afeb4
(Fminibuffer_complete_word): Handle bytes vs characters
Richard M. Stallman <rms@gnu.org>
parents:
20523
diff
changeset
|
2775 int opoint_byte = PT_BYTE; |
16991
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2776 Lisp_Object oinhibit; |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2777 oinhibit = Vinhibit_quit; |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2778 |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2779 /* Clear out any old echo-area message to make way for our new thing. */ |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2780 message (0); |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2781 |
20532
7ffd3d9afeb4
(Fminibuffer_complete_word): Handle bytes vs characters
Richard M. Stallman <rms@gnu.org>
parents:
20523
diff
changeset
|
2782 SET_PT_BOTH (osize, osize_byte); |
50538
98fb19f9d8d3
(temp_echo_area_glyphs): Change the arg to Lisp
Kenichi Handa <handa@m17n.org>
parents:
49422
diff
changeset
|
2783 insert_from_string (string, 0, 0, SCHARS (string), SBYTES (string), 0); |
20532
7ffd3d9afeb4
(Fminibuffer_complete_word): Handle bytes vs characters
Richard M. Stallman <rms@gnu.org>
parents:
20523
diff
changeset
|
2784 SET_PT_BOTH (opoint, opoint_byte); |
16991
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2785 Vinhibit_quit = Qt; |
73316
3dc812144482
* minibuf.c (temp_echo_area_glyphs): Sit for
Chong Yidong <cyd@stupidchicken.com>
parents:
73083
diff
changeset
|
2786 |
3dc812144482
* minibuf.c (temp_echo_area_glyphs): Sit for
Chong Yidong <cyd@stupidchicken.com>
parents:
73083
diff
changeset
|
2787 if (NUMBERP (Vminibuffer_message_timeout)) |
73318
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
73316
diff
changeset
|
2788 sit_for (Vminibuffer_message_timeout, 0, 2); |
73316
3dc812144482
* minibuf.c (temp_echo_area_glyphs): Sit for
Chong Yidong <cyd@stupidchicken.com>
parents:
73083
diff
changeset
|
2789 else |
73318
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
73316
diff
changeset
|
2790 sit_for (Qt, 0, 2); |
73316
3dc812144482
* minibuf.c (temp_echo_area_glyphs): Sit for
Chong Yidong <cyd@stupidchicken.com>
parents:
73083
diff
changeset
|
2791 |
20981
0ce30e7ba2b8
Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents:
20921
diff
changeset
|
2792 del_range_both (osize, osize_byte, ZV, ZV_BYTE, 1); |
20532
7ffd3d9afeb4
(Fminibuffer_complete_word): Handle bytes vs characters
Richard M. Stallman <rms@gnu.org>
parents:
20523
diff
changeset
|
2793 SET_PT_BOTH (opoint, opoint_byte); |
16991
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2794 if (!NILP (Vquit_flag)) |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2795 { |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2796 Vquit_flag = Qnil; |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2797 Vunread_command_events = Fcons (make_number (quit_char), Qnil); |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2798 } |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2799 Vinhibit_quit = oinhibit; |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2800 } |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2801 |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2802 DEFUN ("minibuffer-message", Fminibuffer_message, Sminibuffer_message, |
40987
d9b11436ac12
(Fminibuffer_complete_word): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
2803 1, 1, 0, |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2804 doc: /* Temporarily display STRING at the end of the minibuffer. |
67869
ea017f365939
(Fminibuffer_message): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67720
diff
changeset
|
2805 The text is displayed for a period controlled by `minibuffer-message-timeout', |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2806 or until the next input event arrives, whichever comes first. */) |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2807 (string) |
16991
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2808 Lisp_Object string; |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2809 { |
49422
2123804d2bca
(Fminibuffer_message): Verify type of parameter.
Andreas Schwab <schwab@suse.de>
parents:
49194
diff
changeset
|
2810 CHECK_STRING (string); |
50538
98fb19f9d8d3
(temp_echo_area_glyphs): Change the arg to Lisp
Kenichi Handa <handa@m17n.org>
parents:
49422
diff
changeset
|
2811 temp_echo_area_glyphs (string); |
16991
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2812 return Qnil; |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2813 } |
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
2814 |
20302
5b3bc7f24d51
(read_minibuf_unwind): Fix return type and return nil.
Andreas Schwab <schwab@suse.de>
parents:
20075
diff
changeset
|
2815 void |
284 | 2816 init_minibuf_once () |
2817 { | |
2818 Vminibuffer_list = Qnil; | |
2819 staticpro (&Vminibuffer_list); | |
2820 } | |
2821 | |
20302
5b3bc7f24d51
(read_minibuf_unwind): Fix return type and return nil.
Andreas Schwab <schwab@suse.de>
parents:
20075
diff
changeset
|
2822 void |
284 | 2823 syms_of_minibuf () |
2824 { | |
2825 minibuf_level = 0; | |
7952
9e2e0fdd1710
(minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents:
7836
diff
changeset
|
2826 minibuf_prompt = Qnil; |
9e2e0fdd1710
(minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents:
7836
diff
changeset
|
2827 staticpro (&minibuf_prompt); |
9e2e0fdd1710
(minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents:
7836
diff
changeset
|
2828 |
9e2e0fdd1710
(minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents:
7836
diff
changeset
|
2829 minibuf_save_list = Qnil; |
9e2e0fdd1710
(minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents:
7836
diff
changeset
|
2830 staticpro (&minibuf_save_list); |
284 | 2831 |
79108
f197bd049c23
(Qcompletion_ignore_case): New Lisp_Object.
Glenn Morris <rgm@gnu.org>
parents:
78260
diff
changeset
|
2832 Qcompletion_ignore_case = intern ("completion-ignore-case"); |
f197bd049c23
(Qcompletion_ignore_case): New Lisp_Object.
Glenn Morris <rgm@gnu.org>
parents:
78260
diff
changeset
|
2833 staticpro (&Qcompletion_ignore_case); |
f197bd049c23
(Qcompletion_ignore_case): New Lisp_Object.
Glenn Morris <rgm@gnu.org>
parents:
78260
diff
changeset
|
2834 |
4641
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
2835 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
|
2836 staticpro (&Qread_file_name_internal); |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
2837 |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
2838 Qminibuffer_default = intern ("minibuffer-default"); |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
2839 staticpro (&Qminibuffer_default); |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
2840 Fset (Qminibuffer_default, Qnil); |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
2841 |
284 | 2842 Qminibuffer_completion_table = intern ("minibuffer-completion-table"); |
2843 staticpro (&Qminibuffer_completion_table); | |
2844 | |
2845 Qminibuffer_completion_confirm = intern ("minibuffer-completion-confirm"); | |
2846 staticpro (&Qminibuffer_completion_confirm); | |
2847 | |
2848 Qminibuffer_completion_predicate = intern ("minibuffer-completion-predicate"); | |
2849 staticpro (&Qminibuffer_completion_predicate); | |
2850 | |
6689
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2851 staticpro (&last_exact_completion); |
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2852 last_exact_completion = Qnil; |
2efd8c4eb9be
(do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
6590
diff
changeset
|
2853 |
284 | 2854 staticpro (&last_minibuf_string); |
2855 last_minibuf_string = Qnil; | |
2856 | |
2857 Quser_variable_p = intern ("user-variable-p"); | |
2858 staticpro (&Quser_variable_p); | |
2859 | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
2860 Qminibuffer_history = intern ("minibuffer-history"); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
2861 staticpro (&Qminibuffer_history); |
284 | 2862 |
22010
547e4c0a42c0
(Qbuffer_name_history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21854
diff
changeset
|
2863 Qbuffer_name_history = intern ("buffer-name-history"); |
547e4c0a42c0
(Qbuffer_name_history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21854
diff
changeset
|
2864 staticpro (&Qbuffer_name_history); |
22509
a57016ec7f14
(syms_of_minibuf): Initialize buffer-name-history.
Karl Heuer <kwzh@gnu.org>
parents:
22479
diff
changeset
|
2865 Fset (Qbuffer_name_history, Qnil); |
22010
547e4c0a42c0
(Qbuffer_name_history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21854
diff
changeset
|
2866 |
4550
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
2867 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
|
2868 staticpro (&Qminibuffer_setup_hook); |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
2869 |
6742
ef62a96ce830
(Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
6720
diff
changeset
|
2870 Qminibuffer_exit_hook = intern ("minibuffer-exit-hook"); |
ef62a96ce830
(Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
6720
diff
changeset
|
2871 staticpro (&Qminibuffer_exit_hook); |
ef62a96ce830
(Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
6720
diff
changeset
|
2872 |
15967
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
2873 Qhistory_length = intern ("history-length"); |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
2874 staticpro (&Qhistory_length); |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
2875 |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
2876 Qcurrent_input_method = intern ("current-input-method"); |
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
2877 staticpro (&Qcurrent_input_method); |
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
2878 |
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
2879 Qactivate_input_method = intern ("activate-input-method"); |
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
2880 staticpro (&Qactivate_input_method); |
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
2881 |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2882 Qcase_fold_search = intern ("case-fold-search"); |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2883 staticpro (&Qcase_fold_search); |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2884 |
73450
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
2885 Qread_expression_history = intern ("read-expression-history"); |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
2886 staticpro (&Qread_expression_history); |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
2887 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2888 DEFVAR_LISP ("read-buffer-function", &Vread_buffer_function, |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2889 doc: /* If this is non-nil, `read-buffer' does its work by calling this function. */); |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
2890 Vread_buffer_function = Qnil; |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
2891 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2892 DEFVAR_LISP ("minibuffer-setup-hook", &Vminibuffer_setup_hook, |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2893 doc: /* Normal hook run just after entry to minibuffer. */); |
4550
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
2894 Vminibuffer_setup_hook = Qnil; |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
2895 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2896 DEFVAR_LISP ("minibuffer-exit-hook", &Vminibuffer_exit_hook, |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2897 doc: /* Normal hook run just after exit from minibuffer. */); |
6742
ef62a96ce830
(Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
6720
diff
changeset
|
2898 Vminibuffer_exit_hook = Qnil; |
ef62a96ce830
(Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
6720
diff
changeset
|
2899 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2900 DEFVAR_LISP ("history-length", &Vhistory_length, |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2901 doc: /* *Maximum length for history lists before truncation takes place. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2902 A number means that length; t means infinite. Truncation takes place |
70499
088b163bf6e8
syms_of_minibuf) <history-length>: Fix typo in doc.
Juanma Barranquero <lekktu@gmail.com>
parents:
70353
diff
changeset
|
2903 just after a new element is inserted. Setting the `history-length' |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2904 property of a history variable overrides this default. */); |
15967
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
2905 XSETFASTINT (Vhistory_length, 30); |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
2906 |
57016
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
2907 DEFVAR_BOOL ("history-delete-duplicates", &history_delete_duplicates, |
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
2908 doc: /* *Non-nil means to delete duplicates in history. |
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
2909 If set to t when adding a new history element, all previous identical |
71120
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
2910 elements are deleted from the history list. */); |
57016
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
2911 history_delete_duplicates = 0; |
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
2912 |
71120
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
2913 DEFVAR_LISP ("history-add-new-input", &Vhistory_add_new_input, |
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
2914 doc: /* *Non-nil means to add new elements in history. |
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
2915 If set to nil, minibuffer reading functions don't add new elements to the |
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
2916 history list, so it is possible to do this afterwards by calling |
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
2917 `add-to-history' explicitly. */); |
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
2918 Vhistory_add_new_input = Qt; |
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
2919 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2920 DEFVAR_LISP ("completion-auto-help", &Vcompletion_auto_help, |
67132
e73d5d53ea0b
(syms_of_minibuf): Mention the extension of `completion-auto-help's meaning
Eli Zaretskii <eliz@gnu.org>
parents:
66400
diff
changeset
|
2921 doc: /* *Non-nil means automatically provide help for invalid completion input. |
e73d5d53ea0b
(syms_of_minibuf): Mention the extension of `completion-auto-help's meaning
Eli Zaretskii <eliz@gnu.org>
parents:
66400
diff
changeset
|
2922 Under Partial Completion mode, a non-nil, non-t value has a special meaning; |
e73d5d53ea0b
(syms_of_minibuf): Mention the extension of `completion-auto-help's meaning
Eli Zaretskii <eliz@gnu.org>
parents:
66400
diff
changeset
|
2923 see the doc string of `partial-completion-mode' for more details. */); |
31105
0c34d4d76e65
(Vcompletion_auto_help): Renamed from `auto_help'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31102
diff
changeset
|
2924 Vcompletion_auto_help = Qt; |
284 | 2925 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2926 DEFVAR_BOOL ("completion-ignore-case", &completion_ignore_case, |
56666
b676f8f12ae1
(syms_of_minibuf) <completion-ignore-case>: Doc fix.
John Paul Wallington <jpw@pobox.com>
parents:
56167
diff
changeset
|
2927 doc: /* Non-nil means don't consider case significant in completion. |
b676f8f12ae1
(syms_of_minibuf) <completion-ignore-case>: Doc fix.
John Paul Wallington <jpw@pobox.com>
parents:
56167
diff
changeset
|
2928 |
58207
4410b7cd84c4
(syms_of_minibuf) <completion-ignore-case>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57016
diff
changeset
|
2929 For file-name completion, the variable `read-file-name-completion-ignore-case' |
4410b7cd84c4
(syms_of_minibuf) <completion-ignore-case>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57016
diff
changeset
|
2930 controls the behavior, rather than this variable. */); |
284 | 2931 completion_ignore_case = 0; |
2932 | |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2933 DEFVAR_BOOL ("enable-recursive-minibuffers", &enable_recursive_minibuffers, |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2934 doc: /* *Non-nil means to allow minibuffer commands while in the minibuffer. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2935 This variable makes a difference whenever the minibuffer window is active. */); |
284 | 2936 enable_recursive_minibuffers = 0; |
2937 | |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2938 DEFVAR_LISP ("minibuffer-completion-table", &Vminibuffer_completion_table, |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2939 doc: /* Alist or obarray used for completion in the minibuffer. |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2940 This becomes the ALIST argument to `try-completion' and `all-completions'. |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2941 The value can also be a list of strings or a hash table. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2942 |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2943 The value may alternatively be a function, which is given three arguments: |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2944 STRING, the current buffer contents; |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2945 PREDICATE, the predicate for filtering possible matches; |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2946 CODE, which says what kind of things to do. |
74569
6d7e4ace438f
(syms_of_minibuf) <minibuffer-completion-table>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74006
diff
changeset
|
2947 CODE can be nil, t or `lambda': |
6d7e4ace438f
(syms_of_minibuf) <minibuffer-completion-table>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74006
diff
changeset
|
2948 nil -- return the best completion of STRING, or nil if there is none. |
6d7e4ace438f
(syms_of_minibuf) <minibuffer-completion-table>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74006
diff
changeset
|
2949 t -- return a list of all possible completions of STRING. |
6d7e4ace438f
(syms_of_minibuf) <minibuffer-completion-table>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74006
diff
changeset
|
2950 lambda -- return t if STRING is a valid completion as it stands. */); |
284 | 2951 Vminibuffer_completion_table = Qnil; |
2952 | |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2953 DEFVAR_LISP ("minibuffer-completion-predicate", &Vminibuffer_completion_predicate, |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2954 doc: /* Within call to `completing-read', this holds the PREDICATE argument. */); |
284 | 2955 Vminibuffer_completion_predicate = Qnil; |
2956 | |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2957 DEFVAR_LISP ("minibuffer-completion-confirm", &Vminibuffer_completion_confirm, |
43000
c16f32068114
(Fread_from_minibuffer, Fread_command, Fread_function)
Pavel Janík <Pavel@Janik.cz>
parents:
42881
diff
changeset
|
2958 doc: /* Non-nil means to demand confirmation of completion before exiting minibuffer. */); |
284 | 2959 Vminibuffer_completion_confirm = Qnil; |
2960 | |
22657
d19cd2986f18
(Vminibuffer_completing_file_name): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22509
diff
changeset
|
2961 DEFVAR_LISP ("minibuffer-completing-file-name", |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2962 &Vminibuffer_completing_file_name, |
75720
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
2963 doc: /* Non-nil and non-`lambda' means completing file names. */); |
22657
d19cd2986f18
(Vminibuffer_completing_file_name): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22509
diff
changeset
|
2964 Vminibuffer_completing_file_name = Qnil; |
d19cd2986f18
(Vminibuffer_completing_file_name): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22509
diff
changeset
|
2965 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2966 DEFVAR_LISP ("minibuffer-help-form", &Vminibuffer_help_form, |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2967 doc: /* Value that `help-form' takes on inside the minibuffer. */); |
284 | 2968 Vminibuffer_help_form = Qnil; |
2969 | |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2970 DEFVAR_LISP ("minibuffer-history-variable", &Vminibuffer_history_variable, |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2971 doc: /* History list symbol to add minibuffer values to. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2972 Each string of minibuffer input, as it appears on exit from the minibuffer, |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2973 is added with |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2974 (set minibuffer-history-variable |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2975 (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
|
2976 XSETFASTINT (Vminibuffer_history_variable, 0); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
2977 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2978 DEFVAR_LISP ("minibuffer-history-position", &Vminibuffer_history_position, |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2979 doc: /* Current position of redoing in the history list. */); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
2980 Vminibuffer_history_position = Qnil; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
2981 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2982 DEFVAR_BOOL ("minibuffer-auto-raise", &minibuffer_auto_raise, |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2983 doc: /* *Non-nil means entering the minibuffer raises the minibuffer's frame. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2984 Some uses of the echo area also raise that frame (since they use it too). */); |
5238
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
2985 minibuffer_auto_raise = 0; |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
2986 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2987 DEFVAR_LISP ("completion-regexp-list", &Vcompletion_regexp_list, |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2988 doc: /* List of regexps that should restrict possible completions. |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2989 The basic completion functions only consider a completion acceptable |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2990 if it matches all regular expressions in this list, with |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2991 `case-fold-search' bound to the value of `completion-ignore-case'. |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2992 See Info node `(elisp)Basic Completion', for a description of these |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2993 functions. */); |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
2994 Vcompletion_regexp_list = Qnil; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
2995 |
18444
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
2996 DEFVAR_BOOL ("minibuffer-allow-text-properties", |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2997 &minibuffer_allow_text_properties, |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2998 doc: /* Non-nil means `read-from-minibuffer' should not discard text properties. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2999 This also affects `read-string', but it does not affect `read-minibuffer', |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
3000 `read-no-blanks-input', or any of the functions that do minibuffer input |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
3001 with completion; they always discard text properties. */); |
18444
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
3002 minibuffer_allow_text_properties = 0; |
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
3003 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3004 DEFVAR_LISP ("minibuffer-prompt-properties", &Vminibuffer_prompt_properties, |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
3005 doc: /* Text properties that are added to minibuffer prompts. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
3006 These are in addition to the basic `field' property, and stickiness |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
3007 properties. */); |
33682
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
3008 /* We use `intern' here instead of Qread_only to avoid |
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
3009 initialization-order problems. */ |
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
3010 Vminibuffer_prompt_properties |
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
3011 = Fcons (intern ("read-only"), Fcons (Qt, Qnil)); |
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
3012 |
73450
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
3013 DEFVAR_LISP ("read-expression-map", &Vread_expression_map, |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
3014 doc: /* Minibuffer keymap used for reading Lisp expressions. */); |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
3015 Vread_expression_map = Qnil; |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
3016 |
14435
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
3017 defsubr (&Sset_minibuffer_window); |
284 | 3018 defsubr (&Sread_from_minibuffer); |
3019 defsubr (&Seval_minibuffer); | |
3020 defsubr (&Sread_minibuffer); | |
3021 defsubr (&Sread_string); | |
3022 defsubr (&Sread_command); | |
3023 defsubr (&Sread_variable); | |
72606
18e29ef6d5d7
(Finternal_complete_buffer): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71797
diff
changeset
|
3024 defsubr (&Sinternal_complete_buffer); |
284 | 3025 defsubr (&Sread_buffer); |
3026 defsubr (&Sread_no_blanks_input); | |
3027 defsubr (&Sminibuffer_depth); | |
6590
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
3028 defsubr (&Sminibuffer_prompt); |
284 | 3029 |
46877
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
3030 defsubr (&Sminibufferp); |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
3031 defsubr (&Sminibuffer_prompt_end); |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
3032 defsubr (&Sminibuffer_contents); |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
3033 defsubr (&Sminibuffer_contents_no_properties); |
67618
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
3034 defsubr (&Sminibuffer_completion_contents); |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
3035 defsubr (&Sdelete_minibuffer_contents); |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
3036 |
284 | 3037 defsubr (&Stry_completion); |
3038 defsubr (&Sall_completions); | |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
3039 defsubr (&Stest_completion); |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
3040 defsubr (&Sassoc_string); |
284 | 3041 defsubr (&Scompleting_read); |
3042 defsubr (&Sminibuffer_complete); | |
3043 defsubr (&Sminibuffer_complete_word); | |
3044 defsubr (&Sminibuffer_complete_and_exit); | |
3045 defsubr (&Sdisplay_completion_list); | |
3046 defsubr (&Sminibuffer_completion_help); | |
3047 | |
3048 defsubr (&Sself_insert_and_exit); | |
3049 defsubr (&Sexit_minibuffer); | |
3050 | |
16991
b33fd17a2873
(Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16640
diff
changeset
|
3051 defsubr (&Sminibuffer_message); |
284 | 3052 } |
3053 | |
20302
5b3bc7f24d51
(read_minibuf_unwind): Fix return type and return nil.
Andreas Schwab <schwab@suse.de>
parents:
20075
diff
changeset
|
3054 void |
284 | 3055 keys_of_minibuf () |
3056 { | |
3057 initial_define_key (Vminibuffer_local_map, Ctl ('g'), | |
3058 "abort-recursive-edit"); | |
3059 initial_define_key (Vminibuffer_local_map, Ctl ('m'), | |
3060 "exit-minibuffer"); | |
3061 initial_define_key (Vminibuffer_local_map, Ctl ('j'), | |
3062 "exit-minibuffer"); | |
3063 | |
3064 initial_define_key (Vminibuffer_local_ns_map, ' ', | |
3065 "exit-minibuffer"); | |
3066 initial_define_key (Vminibuffer_local_ns_map, '\t', | |
3067 "exit-minibuffer"); | |
3068 initial_define_key (Vminibuffer_local_ns_map, '?', | |
3069 "self-insert-and-exit"); | |
3070 | |
3071 initial_define_key (Vminibuffer_local_completion_map, '\t', | |
3072 "minibuffer-complete"); | |
3073 initial_define_key (Vminibuffer_local_completion_map, ' ', | |
3074 "minibuffer-complete-word"); | |
3075 initial_define_key (Vminibuffer_local_completion_map, '?', | |
3076 "minibuffer-completion-help"); | |
3077 | |
67349
8fd060c85b66
(keys_of_minibuf): Just unbind SPC in Vminibuffer_local_filename_completion_map
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67338
diff
changeset
|
3078 Fdefine_key (Vminibuffer_local_filename_completion_map, |
8fd060c85b66
(keys_of_minibuf): Just unbind SPC in Vminibuffer_local_filename_completion_map
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67338
diff
changeset
|
3079 build_string (" "), Qnil); |
67260
f5d06dd5ca9b
(Fcompleting_read): If Vminibuffer_completing_file_name is
Eli Zaretskii <eliz@gnu.org>
parents:
67132
diff
changeset
|
3080 |
284 | 3081 initial_define_key (Vminibuffer_local_must_match_map, Ctl ('m'), |
3082 "minibuffer-complete-and-exit"); | |
3083 initial_define_key (Vminibuffer_local_must_match_map, Ctl ('j'), | |
3084 "minibuffer-complete-and-exit"); | |
67260
f5d06dd5ca9b
(Fcompleting_read): If Vminibuffer_completing_file_name is
Eli Zaretskii <eliz@gnu.org>
parents:
67132
diff
changeset
|
3085 |
67498
30baecf371f9
(display_completion_list_1): Call `minibuffer_completion_contents'
Juri Linkov <juri@jurta.org>
parents:
67349
diff
changeset
|
3086 Fdefine_key (Vminibuffer_local_must_match_filename_map, |
30baecf371f9
(display_completion_list_1): Call `minibuffer_completion_contents'
Juri Linkov <juri@jurta.org>
parents:
67349
diff
changeset
|
3087 build_string (" "), Qnil); |
284 | 3088 } |
52401 | 3089 |
3090 /* arch-tag: 8f69b601-fba3-484c-a6dd-ceaee54a7a73 | |
3091 (do not change this comment) */ |