Mercurial > emacs
annotate src/minibuf.c @ 95635:d573046f1742
*** empty log message ***
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sat, 07 Jun 2008 02:47:27 +0000 |
parents | d34a432d5863 |
children | a17231a1f8f8 |
rev | line source |
---|---|
284 | 1 /* Minibuffer input and completion. |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94629
diff
changeset
|
2 Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94629
diff
changeset
|
3 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94629
diff
changeset
|
4 2008 Free Software Foundation, Inc. |
284 | 5 |
6 This file is part of GNU Emacs. | |
7 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94629
diff
changeset
|
8 GNU Emacs is free software: you can redistribute it and/or modify |
284 | 9 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94629
diff
changeset
|
10 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94629
diff
changeset
|
11 (at your option) any later version. |
284 | 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 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94629
diff
changeset
|
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
284 | 20 |
21 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4641
diff
changeset
|
22 #include <config.h> |
25788
7796a636f039
(toplevel): Move include of stdio.h to other includes.
Gerd Moellmann <gerd@gnu.org>
parents:
25738
diff
changeset
|
23 #include <stdio.h> |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
24 |
284 | 25 #include "lisp.h" |
26 #include "commands.h" | |
27 #include "buffer.h" | |
88351
aac41b50c875
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43573
diff
changeset
|
28 #include "character.h" |
284 | 29 #include "dispextern.h" |
31102
6a0caa788013
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30976
diff
changeset
|
30 #include "keyboard.h" |
765 | 31 #include "frame.h" |
284 | 32 #include "window.h" |
33 #include "syntax.h" | |
34224
5a5d98ee4078
* minibuf.c: Include intervals.h.
Ken Raeburn <raeburn@raeburn.org>
parents:
33682
diff
changeset
|
34 #include "intervals.h" |
39697
0b986bb45526
Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
35 #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
|
36 #include "termhooks.h" |
284 | 37 |
6233
1e90a9197a2a
(temp_echo_area_glyphs): Use quit_char, not C-g.
Karl Heuer <kwzh@gnu.org>
parents:
6207
diff
changeset
|
38 extern int quit_char; |
1e90a9197a2a
(temp_echo_area_glyphs): Use quit_char, not C-g.
Karl Heuer <kwzh@gnu.org>
parents:
6207
diff
changeset
|
39 |
284 | 40 /* 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
|
41 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
|
42 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
|
43 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
|
44 minibuffer recursions are encountered. */ |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
45 |
284 | 46 Lisp_Object Vminibuffer_list; |
47 | |
7952
9e2e0fdd1710
(minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents:
7836
diff
changeset
|
48 /* 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
|
49 |
7952
9e2e0fdd1710
(minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents:
7836
diff
changeset
|
50 Lisp_Object minibuf_save_list; |
284 | 51 |
52 /* Depth in minibuffer invocations. */ | |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
53 |
284 | 54 int minibuf_level; |
55 | |
15967
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
56 /* 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
|
57 |
15967
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
58 Lisp_Object Qhistory_length, Vhistory_length; |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
59 |
57016
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
60 /* No duplicates in history. */ |
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
61 |
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
62 int history_delete_duplicates; |
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
63 |
71120
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
64 /* Non-nil means add new input to history. */ |
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
65 |
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
66 Lisp_Object Vhistory_add_new_input; |
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
67 |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
68 /* 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
|
69 |
284 | 70 Lisp_Object last_minibuf_string; |
71 | |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
72 /* Nonzero means let functions called when within a minibuffer |
284 | 73 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
|
74 |
284 | 75 int enable_recursive_minibuffers; |
76 | |
18444
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
77 /* Nonzero means don't ignore text properties |
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
78 in Fread_from_minibuffer. */ |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
79 |
18444
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
80 int minibuffer_allow_text_properties; |
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
81 |
284 | 82 /* help-form is bound to this while in the minibuffer. */ |
83 | |
84 Lisp_Object Vminibuffer_help_form; | |
85 | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
86 /* 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
|
87 |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
88 Lisp_Object Vminibuffer_history_variable; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
89 |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
90 /* 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
|
91 |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
92 Lisp_Object Vminibuffer_history_position; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
93 |
33682
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
94 /* Text properties that are added to minibuffer prompts. |
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
95 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
|
96 properties. */ |
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
97 |
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
98 Lisp_Object Vminibuffer_prompt_properties; |
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
99 |
22010
547e4c0a42c0
(Qbuffer_name_history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21854
diff
changeset
|
100 Lisp_Object Qminibuffer_history, Qbuffer_name_history; |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
101 |
4641
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
102 Lisp_Object Qread_file_name_internal; |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
103 |
6742
ef62a96ce830
(Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
6720
diff
changeset
|
104 /* 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
|
105 |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
106 Lisp_Object Qminibuffer_setup_hook, Vminibuffer_setup_hook; |
6742
ef62a96ce830
(Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
6720
diff
changeset
|
107 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
|
108 |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
109 /* 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
|
110 Lisp_Object Vread_buffer_function; |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
111 |
284 | 112 /* Nonzero means completion ignores case. */ |
113 | |
114 int completion_ignore_case; | |
79108
f197bd049c23
(Qcompletion_ignore_case): New Lisp_Object.
Glenn Morris <rgm@gnu.org>
parents:
78260
diff
changeset
|
115 Lisp_Object Qcompletion_ignore_case; |
284 | 116 |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
117 /* List of regexps that should restrict possible completions. */ |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
118 |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
119 Lisp_Object Vcompletion_regexp_list; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
120 |
5238
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
121 /* 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
|
122 is entered. */ |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
123 |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
124 int minibuffer_auto_raise; |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
125 |
73450
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
126 /* Keymap for reading expressions. */ |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
127 Lisp_Object Vread_expression_map; |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
128 |
75558
f7b5b15084ef
(read_minibuf): Save and clear Vminibuffer_completing_file_name.
Richard M. Stallman <rms@gnu.org>
parents:
75475
diff
changeset
|
129 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
|
130 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
|
131 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
|
132 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
|
133 |
23448
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
134 Lisp_Object Quser_variable_p; |
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
135 |
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
136 Lisp_Object Qminibuffer_default; |
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
137 |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
138 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
|
139 |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
140 Lisp_Object Qcase_fold_search; |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
141 |
73450
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
142 Lisp_Object Qread_expression_history; |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
143 |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
144 extern Lisp_Object Voverriding_local_map; |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
145 |
23448
84542af4b8d6
(Fdisplay_completion_list): Put on mouse-face properties.
Richard M. Stallman <rms@gnu.org>
parents:
22969
diff
changeset
|
146 extern Lisp_Object Qmouse_face; |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
147 |
26059
2a7f35e0072b
(Fminibuffer_complete_and_exit): Supply value for new
Gerd Moellmann <gerd@gnu.org>
parents:
25836
diff
changeset
|
148 extern Lisp_Object Qfield; |
284 | 149 |
13397
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
150 /* 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
|
151 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
|
152 or when a minibuffer exits. */ |
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
153 |
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
154 void |
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
155 choose_minibuf_frame () |
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
156 { |
25673
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
157 if (FRAMEP (selected_frame) |
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
158 && 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
|
159 && !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
|
160 { |
25673
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
161 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
|
162 Lisp_Object buffer; |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
163 |
13397
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
164 /* 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
|
165 window anymore. */ |
25673
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
166 if (NILP (sf->minibuffer_window)) |
13397
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
167 abort (); |
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
168 |
25673
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
169 /* 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
|
170 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
|
171 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
|
172 buffer = XWINDOW (minibuf_window)->buffer; |
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
173 if (BUFFERP (buffer)) |
51200
be76b5735f96
Update Fset_window_buffer usage.
Kim F. Storm <storm@cua.dk>
parents:
51048
diff
changeset
|
174 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
|
175 minibuf_window = sf->minibuffer_window; |
13397
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
176 } |
16475
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
177 |
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
178 /* 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
|
179 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
|
180 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
|
181 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
|
182 { |
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
183 Lisp_Object tail, frame; |
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
184 |
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
185 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
|
186 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
|
187 && !(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
|
188 && minibuf_level > 0)) |
16475
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
189 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
|
190 } |
13397
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
191 } |
14435
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
192 |
18904
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
193 Lisp_Object |
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
194 choose_minibuf_frame_1 (ignore) |
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
195 Lisp_Object ignore; |
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
196 { |
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
197 choose_minibuf_frame (); |
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
198 return Qnil; |
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
199 } |
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
200 |
14435
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
201 DEFUN ("set-minibuffer-window", Fset_minibuffer_window, |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
202 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
|
203 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
|
204 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
|
205 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
|
206 (window) |
14435
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
207 Lisp_Object window; |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
208 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40403
diff
changeset
|
209 CHECK_WINDOW (window); |
14435
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
210 if (! MINI_WINDOW_P (XWINDOW (window))) |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
211 error ("Window is not a minibuffer window"); |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
212 |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
213 minibuf_window = window; |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
214 |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
215 return window; |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
216 } |
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
217 |
13397
aac6ac5b87fd
(choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents:
13345
diff
changeset
|
218 |
284 | 219 /* Actual minibuffer invocation. */ |
220 | |
20584
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
221 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
|
222 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
|
223 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
|
224 Lisp_Object, Lisp_Object, |
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
225 int, Lisp_Object, |
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
226 Lisp_Object, Lisp_Object, |
70930
f3ddca90b6b1
(read_minibuf): Remove arg KEEP_ALL. Callers changed.
Juri Linkov <juri@jurta.org>
parents:
70499
diff
changeset
|
227 int, int)); |
26320 | 228 static Lisp_Object read_minibuf_noninteractive P_ ((Lisp_Object, Lisp_Object, |
229 Lisp_Object, Lisp_Object, | |
230 int, Lisp_Object, | |
231 Lisp_Object, Lisp_Object, | |
232 int, int)); | |
233 static Lisp_Object string_to_object P_ ((Lisp_Object, Lisp_Object)); | |
234 | |
235 | |
236 /* Read a Lisp object from VAL and return it. If VAL is an empty | |
237 string, and DEFALT is a string, read from DEFALT instead of VAL. */ | |
238 | |
239 static Lisp_Object | |
240 string_to_object (val, defalt) | |
241 Lisp_Object val, defalt; | |
242 { | |
243 struct gcpro gcpro1, gcpro2; | |
244 Lisp_Object expr_and_pos; | |
245 int pos; | |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
246 |
26320 | 247 GCPRO2 (val, defalt); |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
248 |
85516
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
249 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
|
250 { |
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
251 if (STRINGP (defalt)) |
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
252 val = defalt; |
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
253 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
|
254 val = XCAR (defalt); |
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
255 } |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
256 |
26320 | 257 expr_and_pos = Fread_from_string (val, Qnil, Qnil); |
258 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
|
259 if (pos != SCHARS (val)) |
26320 | 260 { |
261 /* Ignore trailing whitespace; any other trailing junk | |
262 is an error. */ | |
263 int i; | |
264 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
|
265 for (i = pos; i < SBYTES (val); i++) |
26320 | 266 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
267 int c = SREF (val, i); |
26320 | 268 if (c != ' ' && c != '\t' && c != '\n') |
269 error ("Trailing garbage following expression"); | |
270 } | |
271 } | |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
272 |
26320 | 273 val = Fcar (expr_and_pos); |
274 RETURN_UNGCPRO (val); | |
275 } | |
276 | |
277 | |
278 /* Like read_minibuf but reading from stdin. This function is called | |
279 from read_minibuf to do the job if noninteractive. */ | |
280 | |
281 static Lisp_Object | |
282 read_minibuf_noninteractive (map, initial, prompt, backup_n, expflag, | |
283 histvar, histpos, defalt, allow_props, | |
284 inherit_input_method) | |
285 Lisp_Object map; | |
286 Lisp_Object initial; | |
287 Lisp_Object prompt; | |
288 Lisp_Object backup_n; | |
289 int expflag; | |
290 Lisp_Object histvar; | |
291 Lisp_Object histpos; | |
292 Lisp_Object defalt; | |
293 int allow_props; | |
294 int inherit_input_method; | |
295 { | |
296 int size, len; | |
297 char *line, *s; | |
298 Lisp_Object val; | |
299 | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
300 fprintf (stdout, "%s", SDATA (prompt)); |
26320 | 301 fflush (stdout); |
302 | |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31140
diff
changeset
|
303 val = Qnil; |
26320 | 304 size = 100; |
305 len = 0; | |
306 line = (char *) xmalloc (size * sizeof *line); | |
307 while ((s = fgets (line + len, size - len, stdin)) != NULL | |
308 && (len = strlen (line), | |
309 len == size - 1 && line[len - 1] != '\n')) | |
310 { | |
311 size *= 2; | |
312 line = (char *) xrealloc (line, size); | |
313 } | |
314 | |
315 if (s) | |
316 { | |
317 len = strlen (line); | |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
318 |
26320 | 319 if (len > 0 && line[len - 1] == '\n') |
320 line[--len] = '\0'; | |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
321 |
26320 | 322 val = build_string (line); |
323 xfree (line); | |
324 } | |
325 else | |
326 { | |
327 xfree (line); | |
328 error ("Error reading from stdin"); | |
329 } | |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
330 |
26320 | 331 /* If Lisp form desired instead of string, parse it. */ |
332 if (expflag) | |
85516
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
333 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
|
334 |
26320 | 335 return val; |
336 } | |
46019
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
337 |
46877
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
338 DEFUN ("minibufferp", Fminibufferp, |
47620
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
339 Sminibufferp, 0, 1, 0, |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
340 doc: /* Return t if BUFFER is a minibuffer. |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
341 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
|
342 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
|
343 (buffer) |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
344 Lisp_Object buffer; |
46877
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
345 { |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
346 Lisp_Object tem; |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
347 |
47620
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
348 if (NILP (buffer)) |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
349 buffer = Fcurrent_buffer (); |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
350 else if (STRINGP (buffer)) |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
351 buffer = Fget_buffer (buffer); |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
352 else |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
353 CHECK_BUFFER (buffer); |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
354 |
d9332e0c9cb3
(Fminibufferp): Add an optional `buffer' argument.
John Paul Wallington <jpw@pobox.com>
parents:
46877
diff
changeset
|
355 tem = Fmemq (buffer, Vminibuffer_list); |
46877
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
356 return ! NILP (tem) ? Qt : Qnil; |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
357 } |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
358 |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
359 DEFUN ("minibuffer-prompt-end", Fminibuffer_prompt_end, |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
360 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
|
361 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
|
362 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
|
363 () |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
364 { |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
365 /* 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
|
366 Lisp_Object beg, end, tem; |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
367 beg = make_number (BEGV); |
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 tem = Fmemq (Fcurrent_buffer (), Vminibuffer_list); |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
370 if (NILP (tem)) |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
371 return beg; |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
372 |
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
373 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
|
374 |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
375 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
|
376 return beg; |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
377 else |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
378 return end; |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
379 } |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
380 |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
381 DEFUN ("minibuffer-contents", Fminibuffer_contents, |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
382 Sminibuffer_contents, 0, 0, 0, |
42881 | 383 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
|
384 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
|
385 () |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
386 { |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
387 int prompt_end = XINT (Fminibuffer_prompt_end ()); |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
388 return make_buffer_string (prompt_end, ZV, 1); |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
389 } |
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 DEFUN ("minibuffer-contents-no-properties", Fminibuffer_contents_no_properties, |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
392 Sminibuffer_contents_no_properties, 0, 0, 0, |
42881 | 393 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
|
394 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
|
395 () |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
396 { |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
397 int prompt_end = XINT (Fminibuffer_prompt_end ()); |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
398 return make_buffer_string (prompt_end, ZV, 0); |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
399 } |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
400 |
67618
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
401 DEFUN ("minibuffer-completion-contents", Fminibuffer_completion_contents, |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
402 Sminibuffer_completion_contents, 0, 0, 0, |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
403 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
|
404 That is what completion commands operate on. |
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. */) |
67618
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
406 () |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
407 { |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
408 int prompt_end = XINT (Fminibuffer_prompt_end ()); |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
409 if (PT < prompt_end) |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
410 error ("Cannot do completion in the prompt"); |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
411 return make_buffer_string (prompt_end, PT, 1); |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
412 } |
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
413 |
46019
8f82bf8a959e
(do_completion, Fminibuffer_complete_word)
Richard M. Stallman <rms@gnu.org>
parents:
45620
diff
changeset
|
414 |
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
|
415 /* 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
|
416 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
|
417 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
|
418 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
|
419 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
|
420 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
|
421 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
|
422 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
|
423 beginning of INITIAL if N <= 0. |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
424 |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
425 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
|
426 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
|
427 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
|
428 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
|
429 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
|
430 |
51039
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
431 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
|
432 |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
433 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
|
434 |
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
|
435 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
|
436 current input method. */ |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
437 |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
438 static Lisp_Object |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
439 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
|
440 histvar, histpos, defalt, allow_props, inherit_input_method) |
284 | 441 Lisp_Object map; |
442 Lisp_Object initial; | |
443 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
|
444 Lisp_Object backup_n; |
284 | 445 int expflag; |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
446 Lisp_Object histvar; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
447 Lisp_Object histpos; |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
448 Lisp_Object defalt; |
20584
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
449 int allow_props; |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
450 int inherit_input_method; |
284 | 451 { |
10249
a664a948dd55
(read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents:
10173
diff
changeset
|
452 Lisp_Object val; |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
453 int count = SPECPDL_INDEX (); |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
454 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
|
455 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
|
456 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
|
457 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
|
458 /* 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
|
459 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
|
460 |
67963
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
461 Lisp_Object empty_minibuf; |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
462 Lisp_Object dummy, frame; |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
463 |
40403
4d2b8d93aa27
(read_minibuf): Remove unused external declaration of variable
Pavel Janík <Pavel@Janik.cz>
parents:
39989
diff
changeset
|
464 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
|
465 extern Lisp_Object Qrear_nonsticky; |
10249
a664a948dd55
(read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents:
10173
diff
changeset
|
466 |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
467 specbind (Qminibuffer_default, defalt); |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
468 |
75720
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
469 /* 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
|
470 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
|
471 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
|
472 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
|
473 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
|
474 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
|
475 Vminibuffer_completing_file_name = Qnil; |
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
476 |
93074
620496d91e55
* w32fns.c (hourglass_timer, hourglass_hwnd): New variables.
Jason Rumney <jasonr@gnu.org>
parents:
91327
diff
changeset
|
477 #ifdef HAVE_WINDOW_SYSTEM |
36255
1890bad59762
Use display_hourglass_p, start_hourglass,
Gerd Moellmann <gerd@gnu.org>
parents:
34224
diff
changeset
|
478 if (display_hourglass_p) |
1890bad59762
Use display_hourglass_p, start_hourglass,
Gerd Moellmann <gerd@gnu.org>
parents:
34224
diff
changeset
|
479 cancel_hourglass (); |
27863
30eebaedce93
(read_minibuf): Cancel busy-cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
27697
diff
changeset
|
480 #endif |
10818
8c81853b2679
(read_minibuf): Make sure the display is locked.
Karl Heuer <kwzh@gnu.org>
parents:
10619
diff
changeset
|
481 |
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
|
482 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
|
483 { |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
484 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
|
485 { |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
486 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
|
487 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
|
488 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
|
489 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
|
490 { |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
491 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
|
492 /* 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
|
493 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
|
494 /* 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
|
495 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
|
496 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
|
497 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
|
498 } |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
499 } |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
500 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
|
501 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
|
502 } |
10249
a664a948dd55
(read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents:
10173
diff
changeset
|
503 val = Qnil; |
14969
ea072e2f75f8
(read_minibuf): GCPRO ambient_dir.
Richard M. Stallman <rms@gnu.org>
parents:
14952
diff
changeset
|
504 ambient_dir = current_buffer->directory; |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
505 input_method = Qnil; |
19561
7e13891b6f22
(read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents:
19545
diff
changeset
|
506 enable_multibyte = Qnil; |
14969
ea072e2f75f8
(read_minibuf): GCPRO ambient_dir.
Richard M. Stallman <rms@gnu.org>
parents:
14952
diff
changeset
|
507 |
10249
a664a948dd55
(read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents:
10173
diff
changeset
|
508 /* 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
|
509 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
|
510 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
|
511 GCPRO5 (map, initial, val, ambient_dir, input_method); |
284 | 512 |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
513 if (!STRINGP (prompt)) |
81280
d27a83277a4b
(read_minibuf): Use empty_unibyte_string.
Juanma Barranquero <lekktu@gmail.com>
parents:
77326
diff
changeset
|
514 prompt = empty_unibyte_string; |
284 | 515 |
516 if (!enable_recursive_minibuffers | |
16180
9b0180c495ff
(read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
517 && minibuf_level > 0) |
9b0180c495ff
(read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
518 { |
9b0180c495ff
(read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
519 if (EQ (selected_window, minibuf_window)) |
9b0180c495ff
(read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
520 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
|
521 else |
9b0180c495ff
(read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
522 /* 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
|
523 Fthrow (Qexit, |
9b0180c495ff
(read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
524 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
|
525 } |
284 | 526 |
70353
ecf86801649d
(read_minibuf): Don't use read_minibuf_noninteractive
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
527 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
|
528 { |
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
|
529 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
|
530 make_number (pos), |
36530
c98e0f6d63f2
(read_minibuf): Clean up the binding stack if
Gerd Moellmann <gerd@gnu.org>
parents:
36255
diff
changeset
|
531 expflag, histvar, histpos, defalt, |
c98e0f6d63f2
(read_minibuf): Clean up the binding stack if
Gerd Moellmann <gerd@gnu.org>
parents:
36255
diff
changeset
|
532 allow_props, inherit_input_method); |
51781
bd0acf8d5f97
(read_minibuf): UNGCPRO before returning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51200
diff
changeset
|
533 UNGCPRO; |
36530
c98e0f6d63f2
(read_minibuf): Clean up the binding stack if
Gerd Moellmann <gerd@gnu.org>
parents:
36255
diff
changeset
|
534 return unbind_to (count, val); |
c98e0f6d63f2
(read_minibuf): Clean up the binding stack if
Gerd Moellmann <gerd@gnu.org>
parents:
36255
diff
changeset
|
535 } |
26320 | 536 |
14952
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
537 /* Choose the minibuffer window and frame, and take action on them. */ |
284 | 538 |
12631
ab75fc26058e
(read_minibuf): Call choose_minibuffer_frame.
Richard M. Stallman <rms@gnu.org>
parents:
12164
diff
changeset
|
539 choose_minibuf_frame (); |
ab75fc26058e
(read_minibuf): Call choose_minibuffer_frame.
Richard M. Stallman <rms@gnu.org>
parents:
12164
diff
changeset
|
540 |
18904
1ff8b0bca025
(choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18862
diff
changeset
|
541 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
|
542 |
284 | 543 record_unwind_protect (Fset_window_configuration, |
345 | 544 Fcurrent_window_configuration (Qnil)); |
545 | |
765 | 546 /* If the minibuffer window is on a different frame, save that |
547 frame's configuration too. */ | |
8899
81103c53aa59
(read_minibuf): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8872
diff
changeset
|
548 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
|
549 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
|
550 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
|
551 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
|
552 |
a74524e1c961
(read_minibuf): Make minibuffer frame visible when minibuffer activated.
Karl Heuer <kwzh@gnu.org>
parents:
6235
diff
changeset
|
553 /* 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
|
554 make it visible now. */ |
a74524e1c961
(read_minibuf): Make minibuffer frame visible when minibuffer activated.
Karl Heuer <kwzh@gnu.org>
parents:
6235
diff
changeset
|
555 Fmake_frame_visible (mini_frame); |
a74524e1c961
(read_minibuf): Make minibuffer frame visible when minibuffer activated.
Karl Heuer <kwzh@gnu.org>
parents:
6235
diff
changeset
|
556 |
5238
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
557 if (minibuffer_auto_raise) |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
558 Fraise_frame (mini_frame); |
284 | 559 |
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
|
560 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
|
561 |
14952
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
562 /* 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
|
563 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
|
564 |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
565 /* 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
|
566 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
|
567 specpdl slots. */ |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
568 minibuf_save_list |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
569 = 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
|
570 Fcons (minibuf_window, |
75720
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
571 minibuf_save_list)); |
14952
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
572 minibuf_save_list |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
573 = Fcons (minibuf_prompt, |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
574 Fcons (make_number (minibuf_prompt_width), |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
575 Fcons (Vhelp_form, |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
576 Fcons (Vcurrent_prefix_arg, |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
577 Fcons (Vminibuffer_history_position, |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
578 Fcons (Vminibuffer_history_variable, |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
579 minibuf_save_list)))))); |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
580 |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
581 record_unwind_protect (read_minibuf_unwind, Qnil); |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
582 minibuf_level++; |
55795
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
583 /* 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
|
584 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
|
585 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
|
586 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
|
587 signals an error. --Stef */ |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
588 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
|
589 |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
590 /* 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
|
591 |
25658
a9f38bb7f815
(read_minibuf_unwind): Call resize_mini_window with
Gerd Moellmann <gerd@gnu.org>
parents:
25612
diff
changeset
|
592 minibuf_prompt_width = 0; |
14952
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
593 minibuf_prompt = Fcopy_sequence (prompt); |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
594 Vminibuffer_history_position = histpos; |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
595 Vminibuffer_history_variable = histvar; |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
596 Vhelp_form = Vminibuffer_help_form; |
75720
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
597 /* 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
|
598 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
|
599 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
|
600 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
|
601 "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
|
602 if (!NILP (Vminibuffer_completing_file_name)) |
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
603 Vminibuffer_completing_file_name = Qlambda; |
14952
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
604 |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
605 if (inherit_input_method) |
19561
7e13891b6f22
(read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents:
19545
diff
changeset
|
606 { |
43000
c16f32068114
(Fread_from_minibuffer, Fread_command, Fread_function)
Pavel Janík <Pavel@Janik.cz>
parents:
42881
diff
changeset
|
607 /* `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
|
608 INPUT_METHOD before changing the current buffer. */ |
7e13891b6f22
(read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents:
19545
diff
changeset
|
609 input_method = Fsymbol_value (Qcurrent_input_method); |
7e13891b6f22
(read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents:
19545
diff
changeset
|
610 enable_multibyte = current_buffer->enable_multibyte_characters; |
7e13891b6f22
(read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents:
19545
diff
changeset
|
611 } |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
612 |
14952
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
613 /* Switch to the minibuffer. */ |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
614 |
17387
b0d63d297969
(read_minibuf): Get the string from the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
17375
diff
changeset
|
615 minibuffer = get_minibuffer (minibuf_level); |
b0d63d297969
(read_minibuf): Get the string from the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
17375
diff
changeset
|
616 Fset_buffer (minibuffer); |
1593
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
617 |
67869
ea017f365939
(Fminibuffer_message): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67720
diff
changeset
|
618 /* If appropriate, copy enable-multibyte-characters into the minibuffer. */ |
ea017f365939
(Fminibuffer_message): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67720
diff
changeset
|
619 if (inherit_input_method) |
ea017f365939
(Fminibuffer_message): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67720
diff
changeset
|
620 current_buffer->enable_multibyte_characters = enable_multibyte; |
ea017f365939
(Fminibuffer_message): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67720
diff
changeset
|
621 |
1593
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
622 /* 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
|
623 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
|
624 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
|
625 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
|
626 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
|
627 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
|
628 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
|
629 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
|
630 if (STRINGP (ambient_dir)) |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
631 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
|
632 else |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
633 { |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
634 Lisp_Object buf_list; |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
635 |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
636 for (buf_list = Vbuffer_alist; |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
637 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
|
638 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
|
639 { |
6504
c867b9af8de4
(read_minibuf): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6472
diff
changeset
|
640 Lisp_Object other_buf; |
1593
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
641 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26059
diff
changeset
|
642 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
|
643 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
|
644 { |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
645 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
|
646 break; |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
647 } |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
648 } |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
649 } |
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
650 |
25673
b8bc6e792b2f
(choose_minibuf_frame): Don't try to set the
Gerd Moellmann <gerd@gnu.org>
parents:
25658
diff
changeset
|
651 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
|
652 Fredirect_frame_focus (selected_frame, mini_frame); |
358 | 653 |
284 | 654 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
|
655 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
|
656 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
|
657 |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
658 /* 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
|
659 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
|
660 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
|
661 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
|
662 |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
663 FOR_EACH_FRAME (dummy, frame) |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
664 { |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
665 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
|
666 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
|
667 |
68261
380cef0ff139
(read_minibuf): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
67963
diff
changeset
|
668 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
|
669 && !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
|
670 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
|
671 } |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
672 |
5261f735431a
(read_minibuf): Clear out all other minibuffer windows.
Richard M. Stallman <rms@gnu.org>
parents:
67869
diff
changeset
|
673 /* Display this minibuffer in the proper window. */ |
51200
be76b5735f96
Update Fset_window_buffer usage.
Kim F. Storm <storm@cua.dk>
parents:
51048
diff
changeset
|
674 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
|
675 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
|
676 XSETFASTINT (XWINDOW (minibuf_window)->hscroll, 0); |
284 | 677 |
14952
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
678 Fmake_local_variable (Qprint_escape_newlines); |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
679 print_escape_newlines = 1; |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
680 |
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
681 /* 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
|
682 { |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46224
diff
changeset
|
683 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
|
684 specbind (Qinhibit_read_only, Qt); |
39248
51b411c7b689
(read_minibuf): Bind inhibit-modification-hooks to t,
Gerd Moellmann <gerd@gnu.org>
parents:
38166
diff
changeset
|
685 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
|
686 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
|
687 |
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
688 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
|
689 && ! 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
|
690 minibuf_prompt = Fstring_make_multibyte (minibuf_prompt); |
77326
58d40e42dfe4
(Fminibuffer_contents, Fminibuffer_contents_no_properties,
Juanma Barranquero <lekktu@gmail.com>
parents:
76384
diff
changeset
|
691 |
76369
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
692 /* 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
|
693 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
|
694 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
|
695 { |
488516b0de0a
(read_minibuf): Bind inhibit-read-only a bit longer so as
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76042
diff
changeset
|
696 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
|
697 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
|
698 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
|
699 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
|
700 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
|
701 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
|
702 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
|
703 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
|
704 } |
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 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
|
706 } |
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
707 |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
708 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
|
709 |
14952
cb48d9a50ebc
(read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents:
14667
diff
changeset
|
710 /* Put in the initial input. */ |
488 | 711 if (!NILP (initial)) |
284 | 712 { |
713 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
|
714 Fforward_char (make_number (pos)); |
284 | 715 } |
716 | |
25354
2049a0c919a1
Remove conditional compilation on
Gerd Moellmann <gerd@gnu.org>
parents:
25014
diff
changeset
|
717 clear_message (1, 1); |
284 | 718 current_buffer->keymap = map; |
719 | |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
720 /* 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
|
721 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
|
722 call1 (Qactivate_input_method, input_method); |
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
723 |
4550
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
724 /* 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
|
725 (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
|
726 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
|
727 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
|
728 && !NILP (Vrun_hooks)) |
4550
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
729 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
|
730 |
33088
9d03916282c9
(read_minibuf): Reset the undo history just before starting the recursive-edit.
Miles Bader <miles@gnu.org>
parents:
32988
diff
changeset
|
731 /* 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
|
732 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
|
733 |
284 | 734 recursive_edit_1 (); |
735 | |
736 /* If cursor is on the minibuffer line, | |
737 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
|
738 if (XWINDOW (minibuf_window)->cursor.vpos >= 0 |
284 | 739 && !noninteractive) |
740 { | |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
741 XWINDOW (minibuf_window)->cursor.hpos = 0; |
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
742 XWINDOW (minibuf_window)->cursor.x = 0; |
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
743 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
|
744 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
|
745 { |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
53364
diff
changeset
|
746 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
|
747 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
|
748 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
|
749 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
|
750 } |
284 | 751 } |
752 | |
18444
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
753 /* 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
|
754 Fset_buffer (minibuffer); |
27611
d9295615b99f
(read_minibuf_noninteractive): Remove undeclared gcpro1, gcpro2.
Dave Love <fx@gnu.org>
parents:
27284
diff
changeset
|
755 if (allow_props) |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
756 val = Fminibuffer_contents (); |
27611
d9295615b99f
(read_minibuf_noninteractive): Remove undeclared gcpro1, gcpro2.
Dave Love <fx@gnu.org>
parents:
27284
diff
changeset
|
757 else |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
758 val = Fminibuffer_contents_no_properties (); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
759 |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
760 /* 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
|
761 |
4824
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
762 last_minibuf_string = val; |
eaf67474339b
(Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents:
4775
diff
changeset
|
763 |
51039
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
764 /* 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
|
765 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
|
766 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
|
767 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
|
768 histstring = defalt; |
85516
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
769 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
|
770 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
|
771 else |
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
772 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
|
773 |
e7e3f38afa3e
(read_minibuf): If buffer is empty, record the default in the history.
Richard M. Stallman <rms@gnu.org>
parents:
50538
diff
changeset
|
774 /* 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
|
775 if (!NILP (Vhistory_add_new_input) |
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
776 && 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
|
777 && !NILP (histstring)) |
9615
f696aae6c5e0
(read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9583
diff
changeset
|
778 { |
f696aae6c5e0
(read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9583
diff
changeset
|
779 /* 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
|
780 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
|
781 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
|
782 |
2b0e6a1e7fb9
(read_minibuf): If history list var is void, make it nil.
Richard M. Stallman <rms@gnu.org>
parents:
22048
diff
changeset
|
783 /* If variable is unbound, make it nil. */ |
95107
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
784 |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
785 histval = find_symbol_value (Vminibuffer_history_variable); |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
786 if (EQ (histval, Qunbound)) |
22137
2b0e6a1e7fb9
(read_minibuf): If history list var is void, make it nil.
Richard M. Stallman <rms@gnu.org>
parents:
22048
diff
changeset
|
787 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
|
788 |
9615
f696aae6c5e0
(read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9583
diff
changeset
|
789 /* 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
|
790 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
|
791 |
9615
f696aae6c5e0
(read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9583
diff
changeset
|
792 if (NILP (histval) |
f696aae6c5e0
(read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9583
diff
changeset
|
793 || (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
|
794 /* 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
|
795 && (NILP (Fequal (histstring, Fcar (histval)))))) |
15967
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
796 { |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
797 Lisp_Object length; |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
798 |
57016
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
799 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
|
800 histval = Fcons (histstring, histval); |
15967
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
801 Fset (Vminibuffer_history_variable, histval); |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
802 |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
803 /* Truncate if requested. */ |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
804 length = Fget (Vminibuffer_history_variable, Qhistory_length); |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
805 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
|
806 if (INTEGERP (length)) |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
807 { |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
808 if (XINT (length) <= 0) |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
809 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
|
810 else |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
811 { |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
812 Lisp_Object temp; |
15967
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
813 |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
814 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
|
815 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
|
816 } |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
817 } |
15967
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
818 } |
9615
f696aae6c5e0
(read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9583
diff
changeset
|
819 } |
f696aae6c5e0
(read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9583
diff
changeset
|
820 |
5069
47cc31b47402
(read_minibuf): History list always gets strings,
Richard M. Stallman <rms@gnu.org>
parents:
4824
diff
changeset
|
821 /* 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
|
822 if (expflag) |
26320 | 823 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
|
824 |
10249
a664a948dd55
(read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents:
10173
diff
changeset
|
825 /* The appropriate frame will get selected |
a664a948dd55
(read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents:
10173
diff
changeset
|
826 in set-window-configuration. */ |
51781
bd0acf8d5f97
(read_minibuf): UNGCPRO before returning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51200
diff
changeset
|
827 UNGCPRO; |
bd0acf8d5f97
(read_minibuf): UNGCPRO before returning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51200
diff
changeset
|
828 return unbind_to (count, val); |
284 | 829 } |
830 | |
831 /* Return a buffer to be used as the minibuffer at depth `depth'. | |
832 depth = 0 is the lowest allowed argument, and that is the value | |
833 used for nonrecursive minibuffer invocations */ | |
834 | |
835 Lisp_Object | |
836 get_minibuffer (depth) | |
837 int depth; | |
838 { | |
839 Lisp_Object tail, num, buf; | |
6235
d93350e9d2bc
(get_minibuffer): Make name buffer large enough.
Karl Heuer <kwzh@gnu.org>
parents:
6234
diff
changeset
|
840 char name[24]; |
284 | 841 extern Lisp_Object nconc2 (); |
842 | |
9316
5f7cfbdef872
(read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents:
9183
diff
changeset
|
843 XSETFASTINT (num, depth); |
284 | 844 tail = Fnthcdr (num, Vminibuffer_list); |
488 | 845 if (NILP (tail)) |
284 | 846 { |
847 tail = Fcons (Qnil, Qnil); | |
848 Vminibuffer_list = nconc2 (Vminibuffer_list, tail); | |
849 } | |
850 buf = Fcar (tail); | |
488 | 851 if (NILP (buf) || NILP (XBUFFER (buf)->name)) |
284 | 852 { |
853 sprintf (name, " *Minibuf-%d*", depth); | |
854 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
|
855 |
7c4519722020
Thu Sep 17 15:51:18 1992 Jim Blandy (jimb@pogo.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1010
diff
changeset
|
856 /* 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
|
857 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
|
858 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
|
859 |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39966
diff
changeset
|
860 XSETCAR (tail, buf); |
284 | 861 } |
862 else | |
8872
0f20e5e19ed6
(get_minibuffer): Call Fkill_all_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8790
diff
changeset
|
863 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
864 int count = SPECPDL_INDEX (); |
52005
3e9cb0aeebe1
(get_minibuffer): Be careful when calling `reset_buffer'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51781
diff
changeset
|
865 /* `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
|
866 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
|
867 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
|
868 them any more. */ |
52014
292d2d0762b8
(get_minibuffer): Use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52005
diff
changeset
|
869 delete_all_overlays (XBUFFER (buf)); |
292d2d0762b8
(get_minibuffer): Use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52005
diff
changeset
|
870 reset_buffer (XBUFFER (buf)); |
9001
69f0ae06bcdf
(Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8899
diff
changeset
|
871 record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); |
69f0ae06bcdf
(Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8899
diff
changeset
|
872 Fset_buffer (buf); |
69f0ae06bcdf
(Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8899
diff
changeset
|
873 Fkill_all_local_variables (); |
69f0ae06bcdf
(Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8899
diff
changeset
|
874 unbind_to (count, Qnil); |
8872
0f20e5e19ed6
(get_minibuffer): Call Fkill_all_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8790
diff
changeset
|
875 } |
1593
a3862c6dfcd0
* minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents:
1568
diff
changeset
|
876 |
284 | 877 return buf; |
878 } | |
879 | |
55795
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
880 static Lisp_Object |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
881 run_exit_minibuf_hook (data) |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
882 Lisp_Object data; |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
883 { |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
884 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
|
885 && !NILP (Vrun_hooks)) |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
886 safe_run_hooks (Qminibuffer_exit_hook); |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
887 |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
888 return Qnil; |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
889 } |
1e94f291a19c
(run_exit_minibuf_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53827
diff
changeset
|
890 |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
891 /* 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
|
892 not, and it restores the current window, buffer, etc. */ |
284 | 893 |
20302
5b3bc7f24d51
(read_minibuf_unwind): Fix return type and return nil.
Andreas Schwab <schwab@suse.de>
parents:
20075
diff
changeset
|
894 static Lisp_Object |
358 | 895 read_minibuf_unwind (data) |
896 Lisp_Object data; | |
284 | 897 { |
9049
522a9e03ca05
(read_minibuf_unwind): Preserve Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
9001
diff
changeset
|
898 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
|
899 Lisp_Object window; |
9049
522a9e03ca05
(read_minibuf_unwind): Preserve Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
9001
diff
changeset
|
900 |
14667
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
901 /* 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
|
902 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
|
903 minibuf_level--; |
9049
522a9e03ca05
(read_minibuf_unwind): Preserve Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
9001
diff
changeset
|
904 |
14667
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
905 window = minibuf_window; |
25014
1c522baf1a3c
(read_minibuf): Reset echo message strings to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
24918
diff
changeset
|
906 /* 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
|
907 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
|
908 Fset_buffer (XWINDOW (window)->buffer); |
284 | 909 |
14667
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
910 /* 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
|
911 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
|
912 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
|
913 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
|
914 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
|
915 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
|
916 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
|
917 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
|
918 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
|
919 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
|
920 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
|
921 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
|
922 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
|
923 Voverriding_local_map = Fcar (minibuf_save_list); |
0f6b7b33340a
(read_minibuf): Save Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
10859
diff
changeset
|
924 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
|
925 #if 0 |
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
926 temp = Fcar (minibuf_save_list); |
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
927 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
|
928 minibuf_window = temp; |
2602c284eb11
(read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents:
16265
diff
changeset
|
929 #endif |
12631
ab75fc26058e
(read_minibuf): Call choose_minibuffer_frame.
Richard M. Stallman <rms@gnu.org>
parents:
12164
diff
changeset
|
930 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
|
931 |
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
932 /* 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
|
933 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
934 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
|
935 /* 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
|
936 specbind (Qinhibit_read_only, Qt); |
39250
5921e30bf534
(read_minibuf_unwind): Bind inhibit-modification-hooks.
Gerd Moellmann <gerd@gnu.org>
parents:
39248
diff
changeset
|
937 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
|
938 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
|
939 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
|
940 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
|
941 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
|
942 } |
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
943 |
25516
866049050d67
(read_minibuf_unwind): Resize mini-window when
Gerd Moellmann <gerd@gnu.org>
parents:
25478
diff
changeset
|
944 /* 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
|
945 mini-window back to its normal size. */ |
866049050d67
(read_minibuf_unwind): Resize mini-window when
Gerd Moellmann <gerd@gnu.org>
parents:
25478
diff
changeset
|
946 if (minibuf_level == 0) |
25658
a9f38bb7f815
(read_minibuf_unwind): Call resize_mini_window with
Gerd Moellmann <gerd@gnu.org>
parents:
25612
diff
changeset
|
947 resize_mini_window (XWINDOW (window), 0); |
25516
866049050d67
(read_minibuf_unwind): Resize mini-window when
Gerd Moellmann <gerd@gnu.org>
parents:
25478
diff
changeset
|
948 |
14667
3de266c52c9a
(read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
14435
diff
changeset
|
949 /* 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
|
950 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
|
951 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
|
952 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
|
953 return Qnil; |
284 | 954 } |
955 | |
1010
b6a67ffc7536
* minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents:
967
diff
changeset
|
956 |
70930
f3ddca90b6b1
(read_minibuf): Remove arg KEEP_ALL. Callers changed.
Juri Linkov <juri@jurta.org>
parents:
70499
diff
changeset
|
957 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
|
958 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
|
959 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
|
960 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
|
961 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
|
962 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
|
963 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
|
964 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
|
965 and return that object: |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
966 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
|
967 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
|
968 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
|
969 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
|
970 (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
|
971 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
|
972 history commands. For consistency, you should also specify that |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
973 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
|
974 are counted starting from 1 at the beginning of the list. |
94528
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
975 Sixth arg DEFAULT-VALUE is the default value or the list of default values. |
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
976 If non-nil, it is available for history commands, and as the value |
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
977 (or the first element of the list of default values) to return |
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
978 if the user enters the empty string. But, unless READ is non-nil, |
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
979 `read-from-minibuffer' does NOT return DEFAULT-VALUE if the user enters |
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
980 empty input! It returns the empty string. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
981 Seventh arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits |
42881 | 982 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
|
983 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
|
984 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
|
985 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
|
986 |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
987 The remainder of this documentation string describes the |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
988 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
|
989 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
|
990 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
|
991 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
|
992 However, if INITIAL-CONTENTS is \(STRING . POSITION), the initial |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
993 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
|
994 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
|
995 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
|
996 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
|
997 and some related functions, which use zero-indexing for POSITION. */) |
75060 | 998 (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
|
999 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
|
1000 Lisp_Object inherit_input_method; |
284 | 1001 { |
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
|
1002 Lisp_Object histvar, histpos, val; |
17805
f1625c2d3db9
(Fread_from_minibuffer): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
17737
diff
changeset
|
1003 struct gcpro gcpro1; |
f1625c2d3db9
(Fread_from_minibuffer): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
17737
diff
changeset
|
1004 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40403
diff
changeset
|
1005 CHECK_STRING (prompt); |
488 | 1006 if (NILP (keymap)) |
284 | 1007 keymap = Vminibuffer_local_map; |
1008 else | |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32772
diff
changeset
|
1009 keymap = get_keymap (keymap, 1, 0); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1010 |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
1011 if (SYMBOLP (hist)) |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1012 { |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1013 histvar = hist; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1014 histpos = Qnil; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1015 } |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1016 else |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1017 { |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1018 histvar = Fcar_safe (hist); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1019 histpos = Fcdr_safe (hist); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1020 } |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1021 if (NILP (histvar)) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1022 histvar = Qminibuffer_history; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1023 if (NILP (histpos)) |
9316
5f7cfbdef872
(read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents:
9183
diff
changeset
|
1024 XSETFASTINT (histpos, 0); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1025 |
17805
f1625c2d3db9
(Fread_from_minibuffer): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
17737
diff
changeset
|
1026 GCPRO1 (default_value); |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
1027 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
|
1028 Qnil, !NILP (read), |
18444
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
1029 histvar, histpos, default_value, |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
1030 minibuffer_allow_text_properties, |
70930
f3ddca90b6b1
(read_minibuf): Remove arg KEEP_ALL. Callers changed.
Juri Linkov <juri@jurta.org>
parents:
70499
diff
changeset
|
1031 !NILP (inherit_input_method)); |
17805
f1625c2d3db9
(Fread_from_minibuffer): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
17737
diff
changeset
|
1032 UNGCPRO; |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
1033 return val; |
284 | 1034 } |
1035 | |
1036 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
|
1037 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
|
1038 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
|
1039 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
|
1040 \(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
|
1041 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
|
1042 (prompt, initial_contents) |
284 | 1043 Lisp_Object prompt, initial_contents; |
1044 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40403
diff
changeset
|
1045 CHECK_STRING (prompt); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1046 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
|
1047 prompt, Qnil, 1, Qminibuffer_history, |
70930
f3ddca90b6b1
(read_minibuf): Remove arg KEEP_ALL. Callers changed.
Juri Linkov <juri@jurta.org>
parents:
70499
diff
changeset
|
1048 make_number (0), Qnil, 0, 0); |
284 | 1049 } |
1050 | |
1051 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
|
1052 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
|
1053 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
|
1054 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
|
1055 \(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
|
1056 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
|
1057 (prompt, initial_contents) |
284 | 1058 Lisp_Object prompt, initial_contents; |
1059 { | |
73450
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
1060 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
|
1061 prompt, Qnil, 1, Qread_expression_history, |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
1062 make_number (0), Qnil, 0, 0)); |
284 | 1063 } |
1064 | |
1065 /* Functions that use the minibuffer to read various things. */ | |
1066 | |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
1067 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
|
1068 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
|
1069 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
|
1070 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
|
1071 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
|
1072 documentation string of that function for details. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1073 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
|
1074 and optionally the initial position in the list. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1075 See `read-from-minibuffer' for details of HISTORY argument. |
94528
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
1076 Fourth arg DEFAULT-VALUE is the default value or the list of default values. |
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
1077 If non-nil, it is used for history commands, and as the value (or the first |
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
1078 element of the list of default values) to return if the user enters the |
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
1079 empty string. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1080 Fifth arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits |
42881 | 1081 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
|
1082 (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
|
1083 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
|
1084 Lisp_Object inherit_input_method; |
284 | 1085 { |
20865
7a730831aa0e
(read_minibuf): If input is empty, return empty string.
Richard M. Stallman <rms@gnu.org>
parents:
20754
diff
changeset
|
1086 Lisp_Object val; |
7a730831aa0e
(read_minibuf): If input is empty, return empty string.
Richard M. Stallman <rms@gnu.org>
parents:
20754
diff
changeset
|
1087 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
|
1088 Qnil, history, default_value, |
70930
f3ddca90b6b1
(read_minibuf): Remove arg KEEP_ALL. Callers changed.
Juri Linkov <juri@jurta.org>
parents:
70499
diff
changeset
|
1089 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
|
1090 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
|
1091 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
|
1092 return val; |
284 | 1093 } |
1094 | |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
1095 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
|
1096 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
|
1097 Prompt with PROMPT. Whitespace terminates the input. If INITIAL is |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1098 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
|
1099 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
|
1100 \(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
|
1101 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
|
1102 not useful in this function.) |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1103 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
|
1104 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
|
1105 (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
|
1106 Lisp_Object prompt, initial, inherit_input_method; |
284 | 1107 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40403
diff
changeset
|
1108 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
|
1109 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
|
1110 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
|
1111 !NILP (inherit_input_method)); |
284 | 1112 } |
1113 | |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
1114 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
|
1115 doc: /* Read the name of a command and return as a symbol. |
94528
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
1116 Prompt with PROMPT. By default, return DEFAULT-VALUE or its first element |
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
1117 if it is a list. */) |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1118 (prompt, default_value) |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
1119 Lisp_Object prompt, default_value; |
284 | 1120 { |
20478
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1121 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
|
1122 |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1123 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
|
1124 default_string = Qnil; |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1125 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
|
1126 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
|
1127 else |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1128 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
|
1129 |
20478
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1130 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
|
1131 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
|
1132 if (NILP (name)) |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1133 return name; |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1134 return Fintern (name, Qnil); |
284 | 1135 } |
1136 | |
1137 #ifdef NOTDEF | |
1138 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
|
1139 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
|
1140 Prompt with PROMPT. */) |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
1141 (prompt) |
284 | 1142 Lisp_Object prompt; |
1143 { | |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
1144 return Fintern (Fcompleting_read (prompt, Vobarray, Qfboundp, Qt, Qnil, Qnil, Qnil, Qnil), |
284 | 1145 Qnil); |
1146 } | |
1147 #endif /* NOTDEF */ | |
1148 | |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
1149 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
|
1150 doc: /* Read the name of a user variable and return it as a symbol. |
94528
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
1151 Prompt with PROMPT. By default, return DEFAULT-VALUE or its first element |
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
1152 if it is a list. |
49106
f9342d2eaa31
(Fread_variable): Doc fix.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48727
diff
changeset
|
1153 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
|
1154 (prompt, default_value) |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
1155 Lisp_Object prompt, default_value; |
284 | 1156 { |
20478
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1157 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
|
1158 |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1159 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
|
1160 default_string = Qnil; |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1161 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
|
1162 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
|
1163 else |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1164 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
|
1165 |
20478
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1166 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
|
1167 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
|
1168 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
|
1169 if (NILP (name)) |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1170 return name; |
d14360d1f6ed
(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
Richard M. Stallman <rms@gnu.org>
parents:
20468
diff
changeset
|
1171 return Fintern (name, Qnil); |
284 | 1172 } |
1173 | |
1174 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
|
1175 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
|
1176 Prompt with PROMPT. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1177 Optional second arg DEF is value to return if user enters an empty line. |
94528
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
1178 If DEF is a list of default values, return its first element. |
43000
c16f32068114
(Fread_from_minibuffer, Fread_command, Fread_function)
Pavel Janík <Pavel@Janik.cz>
parents:
42881
diff
changeset
|
1179 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
|
1180 only existing buffer names are allowed. |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1181 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
|
1182 (prompt, def, require_match) |
284 | 1183 Lisp_Object prompt, def, require_match; |
1184 { | |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1185 Lisp_Object args[4]; |
65758
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1186 unsigned char *s; |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1187 int len; |
45620
1ae71892eb5f
(read_minibuf): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45408
diff
changeset
|
1188 |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
1189 if (BUFFERP (def)) |
284 | 1190 def = XBUFFER (def)->name; |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1191 |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1192 if (NILP (Vread_buffer_function)) |
284 | 1193 { |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1194 if (!NILP (def)) |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1195 { |
65758
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1196 /* 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
|
1197 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
|
1198 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
|
1199 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
|
1200 are then added back using Fformat. */ |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1201 |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1202 if (STRINGP (prompt)) |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1203 { |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1204 s = SDATA (prompt); |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1205 len = strlen (s); |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1206 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
|
1207 len = len - 2; |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1208 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
|
1209 len--; |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1210 |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1211 prompt = make_specified_string (s, -1, len, |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1212 STRING_MULTIBYTE (prompt)); |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1213 } |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1214 |
028c8f536edb
(High-Level Completion): Explain that the prompt
Romain Francoise <romain@orebokech.com>
parents:
65457
diff
changeset
|
1215 args[0] = build_string ("%s (default %s): "); |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1216 args[1] = prompt; |
85516
6260015b7802
Allow minibuffer default to be a list of default values.
Juri Linkov <juri@jurta.org>
parents:
85372
diff
changeset
|
1217 args[2] = CONSP (def) ? XCAR (def) : def; |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1218 prompt = Fformat (3, args); |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1219 } |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1220 |
72606
18e29ef6d5d7
(Finternal_complete_buffer): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71797
diff
changeset
|
1221 return Fcompleting_read (prompt, intern ("internal-complete-buffer"), |
18e29ef6d5d7
(Finternal_complete_buffer): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71797
diff
changeset
|
1222 Qnil, require_match, Qnil, Qbuffer_name_history, |
22010
547e4c0a42c0
(Qbuffer_name_history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21854
diff
changeset
|
1223 def, Qnil); |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1224 } |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1225 else |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1226 { |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1227 args[0] = Vread_buffer_function; |
284 | 1228 args[1] = prompt; |
1229 args[2] = def; | |
20468
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1230 args[3] = require_match; |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
1231 return Ffuncall(4, args); |
284 | 1232 } |
1233 } | |
1234 | |
21854
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1235 static Lisp_Object |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1236 minibuf_conform_representation (string, basis) |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1237 Lisp_Object string, basis; |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1238 { |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1239 if (STRING_MULTIBYTE (string) == STRING_MULTIBYTE (basis)) |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1240 return string; |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1241 |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1242 if (STRING_MULTIBYTE (string)) |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1243 return Fstring_make_unibyte (string); |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1244 else |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1245 return Fstring_make_multibyte (string); |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1246 } |
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1247 |
284 | 1248 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
|
1249 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
|
1250 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
|
1251 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
|
1252 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
|
1253 see `symbol-name'. |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1254 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
|
1255 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
|
1256 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
|
1257 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
|
1258 |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1259 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
|
1260 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
|
1261 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
|
1262 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
|
1263 are the possible completions. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1264 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
|
1265 are the possible completions. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1266 |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1267 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
|
1268 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
|
1269 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
|
1270 |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1271 If optional third argument PREDICATE is non-nil, |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1272 it is used to test each possible match. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1273 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
|
1274 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
|
1275 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
|
1276 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
|
1277 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
|
1278 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
|
1279 (string, collection, predicate) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1280 Lisp_Object string, collection, predicate; |
284 | 1281 { |
1282 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
|
1283 /* Size in bytes of BESTMATCH. */ |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31140
diff
changeset
|
1284 int bestmatchsize = 0; |
20584
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
1285 /* These are in bytes, too. */ |
284 | 1286 int compare, matchsize; |
82403
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1287 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
|
1288 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
|
1289 : VECTORP (collection) ? obarray_table |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1290 : ((NILP (collection) |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1291 || (CONSP (collection) |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1292 && (!SYMBOLP (XCAR (collection)) |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1293 || NILP (XCAR (collection))))) |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1294 ? list_table : function_table)); |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31140
diff
changeset
|
1295 int index = 0, obsize = 0; |
284 | 1296 int matchcount = 0; |
56167
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1297 int bindcount = -1; |
284 | 1298 Lisp_Object bucket, zero, end, tem; |
1299 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; | |
1300 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40403
diff
changeset
|
1301 CHECK_STRING (string); |
82403
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1302 if (type == function_table) |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1303 return call3 (collection, string, predicate, Qnil); |
284 | 1304 |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31140
diff
changeset
|
1305 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
|
1306 zero = make_number (0); |
284 | 1307 |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1308 /* 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
|
1309 tail = collection; |
82403
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1310 if (type == obarray_table) |
284 | 1311 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1312 collection = check_obarray (collection); |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1313 obsize = XVECTOR (collection)->size; |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1314 bucket = XVECTOR (collection)->contents[index]; |
284 | 1315 } |
1316 | |
1317 while (1) | |
1318 { | |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1319 /* Get the next element of the alist, obarray, or hash-table. */ |
284 | 1320 /* Exit the loop if the elements are all used up. */ |
1321 /* elt gets the alist element or symbol. | |
1322 eltstring gets the name to check as a completion. */ | |
1323 | |
82403
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1324 if (type == list_table) |
284 | 1325 { |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1326 if (!CONSP (tail)) |
284 | 1327 break; |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1328 elt = XCAR (tail); |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1329 eltstring = CONSP (elt) ? XCAR (elt) : elt; |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1330 tail = XCDR (tail); |
284 | 1331 } |
82403
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1332 else if (type == obarray_table) |
284 | 1333 { |
58908
e1f3effbdccb
(Fall_completions): Add var `zero' and use it in loop.
Richard M. Stallman <rms@gnu.org>
parents:
58896
diff
changeset
|
1334 if (!EQ (bucket, zero)) |
284 | 1335 { |
74666
3f3a13d1c7ce
(Ftry_completion): Check that obarray buckets are symbols.
Juanma Barranquero <lekktu@gmail.com>
parents:
74649
diff
changeset
|
1336 if (!SYMBOLP (bucket)) |
3f3a13d1c7ce
(Ftry_completion): Check that obarray buckets are symbols.
Juanma Barranquero <lekktu@gmail.com>
parents:
74649
diff
changeset
|
1337 error ("Bad data in guts of obarray"); |
284 | 1338 elt = bucket; |
60210
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1339 eltstring = elt; |
284 | 1340 if (XSYMBOL (bucket)->next) |
1341 XSETSYMBOL (bucket, XSYMBOL (bucket)->next); | |
1342 else | |
9316
5f7cfbdef872
(read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents:
9183
diff
changeset
|
1343 XSETFASTINT (bucket, 0); |
284 | 1344 } |
1345 else if (++index >= obsize) | |
1346 break; | |
1347 else | |
1348 { | |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1349 bucket = XVECTOR (collection)->contents[index]; |
284 | 1350 continue; |
1351 } | |
1352 } | |
82403
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1353 else /* if (type == hash_table) */ |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1354 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1355 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
|
1356 && 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
|
1357 index++; |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1358 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
|
1359 break; |
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1360 else |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1361 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
|
1362 } |
284 | 1363 |
1364 /* Is this element a possible completion? */ | |
1365 | |
60210
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1366 if (SYMBOLP (eltstring)) |
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1367 eltstring = Fsymbol_name (eltstring); |
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1368 |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
1369 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
|
1370 && 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
|
1371 && (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
|
1372 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
|
1373 string, zero, Qnil, |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1374 completion_ignore_case ? Qt : Qnil), |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1375 EQ (Qt, tem))) |
284 | 1376 { |
1377 /* Yes. */ | |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1378 Lisp_Object regexps; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1379 |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1380 /* 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
|
1381 { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1382 for (regexps = Vcompletion_regexp_list; CONSP (regexps); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1383 regexps = XCDR (regexps)) |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1384 { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1385 if (bindcount < 0) { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1386 bindcount = SPECPDL_INDEX (); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1387 specbind (Qcase_fold_search, |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1388 completion_ignore_case ? Qt : Qnil); |
56087
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1389 } |
56167
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1390 tem = Fstring_match (XCAR (regexps), eltstring, zero); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1391 if (NILP (tem)) |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1392 break; |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1393 } |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1394 if (CONSP (regexps)) |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1395 continue; |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1396 } |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1397 |
284 | 1398 /* Ignore this element if there is a predicate |
1399 and the predicate doesn't like it. */ | |
1400 | |
14083
3ac9d27214e4
(Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
13775
diff
changeset
|
1401 if (!NILP (predicate)) |
284 | 1402 { |
14083
3ac9d27214e4
(Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
13775
diff
changeset
|
1403 if (EQ (predicate, Qcommandp)) |
44939
d4ace8c553e4
(Fall_completions, Ftry_completion): New arg to Fcommandp.
Richard M. Stallman <rms@gnu.org>
parents:
44469
diff
changeset
|
1404 tem = Fcommandp (elt, Qnil); |
284 | 1405 else |
1406 { | |
82403
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1407 if (bindcount >= 0) |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1408 { |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1409 unbind_to (bindcount, Qnil); |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1410 bindcount = -1; |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1411 } |
284 | 1412 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
|
1413 tem = (type == hash_table |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1414 ? call2 (predicate, elt, |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1415 HASH_VALUE (XHASH_TABLE (collection), |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1416 index - 1)) |
9f1e0c774487
(Fall_completions): Use enum for type of table.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
1417 : call1 (predicate, elt)); |
284 | 1418 UNGCPRO; |
1419 } | |
488 | 1420 if (NILP (tem)) continue; |
284 | 1421 } |
1422 | |
1423 /* Update computation of how much all possible completions match */ | |
1424 | |
488 | 1425 if (NILP (bestmatch)) |
20584
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
1426 { |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1427 matchcount = 1; |
20584
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
1428 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
|
1429 bestmatchsize = SCHARS (eltstring); |
20584
24e567feaf18
(test_completion): Pass both kinds of size to oblookup.
Richard M. Stallman <rms@gnu.org>
parents:
20570
diff
changeset
|
1430 } |
284 | 1431 else |
1432 { | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1433 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
|
1434 tem = Fcompare_strings (bestmatch, zero, |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1435 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
|
1436 eltstring, zero, |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1437 make_number (compare), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1438 completion_ignore_case ? Qt : Qnil); |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1439 if (EQ (tem, Qt)) |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1440 matchsize = compare; |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1441 else if (XINT (tem) < 0) |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1442 matchsize = - XINT (tem) - 1; |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1443 else |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1444 matchsize = XINT (tem) - 1; |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1445 |
330 | 1446 if (completion_ignore_case) |
1447 { | |
1448 /* If this is an exact match except for case, | |
1449 use it as the best match rather than one that is not an | |
1450 exact match. This way, we get the case pattern | |
1451 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
|
1452 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
|
1453 && matchsize < SCHARS (bestmatch)) |
330 | 1454 || |
1455 /* If there is more than one exact match ignoring case, | |
1456 and one of them is exact including case, | |
1457 prefer that one. */ | |
1458 /* If there is no exact match ignoring case, | |
1459 prefer a match that does not change the case | |
1460 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
|
1461 ((matchsize == SCHARS (eltstring)) |
330 | 1462 == |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1463 (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
|
1464 && (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
|
1465 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
|
1466 string, zero, |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1467 Qnil, |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1468 Qnil), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1469 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
|
1470 && (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
|
1471 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
|
1472 string, zero, |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1473 Qnil, |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1474 Qnil), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1475 ! EQ (Qt, tem)))) |
330 | 1476 bestmatch = eltstring; |
1477 } | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1478 if (bestmatchsize != SCHARS (eltstring) |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1479 || bestmatchsize != matchsize) |
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1480 /* 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
|
1481 matchcount++; |
330 | 1482 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
|
1483 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
|
1484 /* 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
|
1485 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
|
1486 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
|
1487 && !completion_ignore_case |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1488 && matchcount > 1) |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1489 /* No need to look any further. */ |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1490 break; |
284 | 1491 } |
1492 } | |
1493 } | |
1494 | |
56167
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1495 if (bindcount >= 0) { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1496 unbind_to (bindcount, Qnil); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1497 bindcount = -1; |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1498 } |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1499 |
488 | 1500 if (NILP (bestmatch)) |
284 | 1501 return Qnil; /* No completions found */ |
330 | 1502 /* If we are ignoring case, and there is no exact match, |
1503 and no additional text was supplied, | |
1504 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
|
1505 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
|
1506 && SCHARS (bestmatch) > bestmatchsize) |
21854
67719e401cce
(minibuf_conform_representation): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21672
diff
changeset
|
1507 return minibuf_conform_representation (string, bestmatch); |
330 | 1508 |
1509 /* Return t if the supplied string is an exact match (counting case); | |
1510 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
|
1511 if (matchcount == 1 && bestmatchsize == SCHARS (string) |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1512 && (tem = Fcompare_strings (bestmatch, make_number (0), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1513 make_number (bestmatchsize), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1514 string, make_number (0), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1515 make_number (bestmatchsize), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1516 Qnil), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1517 EQ (Qt, tem))) |
284 | 1518 return Qt; |
1519 | |
9316
5f7cfbdef872
(read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents:
9183
diff
changeset
|
1520 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
|
1521 XSETFASTINT (end, bestmatchsize); /* all completions agree */ |
284 | 1522 return Fsubstring (bestmatch, zero, end); |
1523 } | |
1524 | |
10173
6a4f5fc9d3f9
(Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents:
10086
diff
changeset
|
1525 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
|
1526 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
|
1527 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
|
1528 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
|
1529 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
|
1530 see `symbol-name'. |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1531 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
|
1532 |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1533 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
|
1534 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
|
1535 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
|
1536 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
|
1537 are the possible completions. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1538 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
|
1539 are the possible completions. |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1540 |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1541 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
|
1542 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
|
1543 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
|
1544 |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1545 If optional third argument PREDICATE is non-nil, |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1546 it is used to test each possible match. |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1547 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
|
1548 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
|
1549 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
|
1550 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
|
1551 Additionally to this predicate, `completion-regexp-list' |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1552 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
|
1553 |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1554 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
|
1555 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
|
1556 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
|
1557 (string, collection, predicate, hide_spaces) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1558 Lisp_Object string, collection, predicate, hide_spaces; |
284 | 1559 { |
1560 Lisp_Object tail, elt, eltstring; | |
1561 Lisp_Object allmatches; | |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1562 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
|
1563 : VECTORP (collection) ? 2 |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1564 : NILP (collection) || (CONSP (collection) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1565 && (!SYMBOLP (XCAR (collection)) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1566 || NILP (XCAR (collection)))); |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31140
diff
changeset
|
1567 int index = 0, obsize = 0; |
56167
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1568 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
|
1569 Lisp_Object bucket, tem, zero; |
284 | 1570 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
1571 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40403
diff
changeset
|
1572 CHECK_STRING (string); |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1573 if (type == 0) |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1574 return call3 (collection, string, predicate, Qt); |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31140
diff
changeset
|
1575 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
|
1576 zero = make_number (0); |
284 | 1577 |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1578 /* 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
|
1579 tail = collection; |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1580 if (type == 2) |
284 | 1581 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1582 obsize = XVECTOR (collection)->size; |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1583 bucket = XVECTOR (collection)->contents[index]; |
284 | 1584 } |
1585 | |
1586 while (1) | |
1587 { | |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1588 /* Get the next element of the alist, obarray, or hash-table. */ |
284 | 1589 /* Exit the loop if the elements are all used up. */ |
1590 /* elt gets the alist element or symbol. | |
1591 eltstring gets the name to check as a completion. */ | |
1592 | |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1593 if (type == 1) |
284 | 1594 { |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1595 if (!CONSP (tail)) |
284 | 1596 break; |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1597 elt = XCAR (tail); |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1598 eltstring = CONSP (elt) ? XCAR (elt) : elt; |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1599 tail = XCDR (tail); |
284 | 1600 } |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1601 else if (type == 2) |
284 | 1602 { |
58908
e1f3effbdccb
(Fall_completions): Add var `zero' and use it in loop.
Richard M. Stallman <rms@gnu.org>
parents:
58896
diff
changeset
|
1603 if (!EQ (bucket, zero)) |
284 | 1604 { |
1605 elt = bucket; | |
60210
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1606 eltstring = elt; |
284 | 1607 if (XSYMBOL (bucket)->next) |
1608 XSETSYMBOL (bucket, XSYMBOL (bucket)->next); | |
1609 else | |
9316
5f7cfbdef872
(read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents:
9183
diff
changeset
|
1610 XSETFASTINT (bucket, 0); |
284 | 1611 } |
1612 else if (++index >= obsize) | |
1613 break; | |
1614 else | |
1615 { | |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1616 bucket = XVECTOR (collection)->contents[index]; |
284 | 1617 continue; |
1618 } | |
1619 } | |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1620 else /* if (type == 3) */ |
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1621 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1622 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
|
1623 && 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
|
1624 index++; |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1625 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
|
1626 break; |
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1627 else |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1628 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
|
1629 } |
284 | 1630 |
1631 /* Is this element a possible completion? */ | |
1632 | |
60210
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1633 if (SYMBOLP (eltstring)) |
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1634 eltstring = Fsymbol_name (eltstring); |
469c72af5168
(Ftry_completion, Fall_completions): Allow both string
Kim F. Storm <storm@cua.dk>
parents:
58908
diff
changeset
|
1635 |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
1636 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
|
1637 && SCHARS (string) <= SCHARS (eltstring) |
10173
6a4f5fc9d3f9
(Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents:
10086
diff
changeset
|
1638 /* 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
|
1639 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
|
1640 && ((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
|
1641 && 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
|
1642 || SREF (eltstring, 0) != ' ' |
10173
6a4f5fc9d3f9
(Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents:
10086
diff
changeset
|
1643 || 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
|
1644 && (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
|
1645 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
|
1646 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
|
1647 make_number (SCHARS (string)), |
21672
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1648 completion_ignore_case ? Qt : Qnil), |
79703e781c0a
(Ftry_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
21529
diff
changeset
|
1649 EQ (Qt, tem))) |
284 | 1650 { |
1651 /* Yes. */ | |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1652 Lisp_Object regexps; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1653 Lisp_Object zero; |
9316
5f7cfbdef872
(read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents:
9183
diff
changeset
|
1654 XSETFASTINT (zero, 0); |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1655 |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1656 /* 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
|
1657 { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1658 for (regexps = Vcompletion_regexp_list; CONSP (regexps); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1659 regexps = XCDR (regexps)) |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1660 { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1661 if (bindcount < 0) { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1662 bindcount = SPECPDL_INDEX (); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1663 specbind (Qcase_fold_search, |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1664 completion_ignore_case ? Qt : Qnil); |
56087
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1665 } |
56167
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1666 tem = Fstring_match (XCAR (regexps), eltstring, zero); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1667 if (NILP (tem)) |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1668 break; |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1669 } |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1670 if (CONSP (regexps)) |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1671 continue; |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1672 } |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
1673 |
284 | 1674 /* Ignore this element if there is a predicate |
1675 and the predicate doesn't like it. */ | |
1676 | |
14083
3ac9d27214e4
(Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
13775
diff
changeset
|
1677 if (!NILP (predicate)) |
284 | 1678 { |
14083
3ac9d27214e4
(Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
13775
diff
changeset
|
1679 if (EQ (predicate, Qcommandp)) |
44939
d4ace8c553e4
(Fall_completions, Ftry_completion): New arg to Fcommandp.
Richard M. Stallman <rms@gnu.org>
parents:
44469
diff
changeset
|
1680 tem = Fcommandp (elt, Qnil); |
284 | 1681 else |
1682 { | |
56167
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1683 if (bindcount >= 0) { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1684 unbind_to (bindcount, Qnil); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1685 bindcount = -1; |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1686 } |
284 | 1687 GCPRO4 (tail, eltstring, allmatches, string); |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1688 tem = type == 3 |
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1689 ? call2 (predicate, elt, |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1690 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
|
1691 : call1 (predicate, elt); |
284 | 1692 UNGCPRO; |
1693 } | |
488 | 1694 if (NILP (tem)) continue; |
284 | 1695 } |
1696 /* Ok => put it on the list. */ | |
1697 allmatches = Fcons (eltstring, allmatches); | |
1698 } | |
1699 } | |
1700 | |
56167
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1701 if (bindcount >= 0) { |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1702 unbind_to (bindcount, Qnil); |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1703 bindcount = -1; |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1704 } |
ce63b548f490
(Ftry_completion, Fall_completions): Do lazy binding
David Kastrup <dak@gnu.org>
parents:
56087
diff
changeset
|
1705 |
284 | 1706 return Fnreverse (allmatches); |
1707 } | |
1708 | |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1709 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
|
1710 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
|
1711 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
|
1712 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
|
1713 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
|
1714 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
|
1715 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
|
1716 on completion, COLLECTION, and PREDICATE. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1717 |
81672
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
1718 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
|
1719 - 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
|
1720 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
|
1721 - 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
|
1722 - `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
|
1723 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
|
1724 - 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
|
1725 does non-null completion. |
3f6e5ebf9c3b
(Fcompleting_read): New value `confirm-only' for `require-match'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81280
diff
changeset
|
1726 |
94528
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
1727 If the input is null, `completing-read' returns DEF, or the first element |
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
1728 of the list of default values, or an empty string if DEF is nil, |
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
1729 regardless of the value of REQUIRE-MATCH. |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1730 |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1731 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
|
1732 with point positioned at the end. |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1733 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
|
1734 is placed at _zero-indexed_ position POSITION in STRING. (*Note* |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1735 that this is different from `read-from-minibuffer' and related |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1736 functions, which use one-indexing for POSITION.) This feature is |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1737 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
|
1738 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
|
1739 the minibuffer easily using \\[next-history-element]. |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1740 |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1741 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
|
1742 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
|
1743 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
|
1744 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
|
1745 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
|
1746 minibuffer history commands). For consistency, you should also |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1747 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
|
1748 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
|
1749 INITIAL-INPUT instead of DEF.) Positions are counted starting from |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1750 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
|
1751 controls the maximum length of a history list. |
48727
62ad43be82d7
(Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
47620
diff
changeset
|
1752 |
94528
ea7a33f062ae
(Fread_from_minibuffer, Fread_string, Fread_command)
Juri Linkov <juri@jurta.org>
parents:
94189
diff
changeset
|
1753 DEF, if non-nil, is the default value or the list of default values. |
39966
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1754 |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1755 If INHERIT-INPUT-METHOD is non-nil, the minibuffer inherits |
42881 | 1756 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
|
1757 |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
1758 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
|
1759 `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
|
1760 (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
|
1761 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
|
1762 Lisp_Object hist, def, inherit_input_method; |
284 | 1763 { |
53312
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1764 Lisp_Object val, histvar, histpos, position; |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1765 Lisp_Object init; |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1766 int pos = 0; |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
1767 int count = SPECPDL_INDEX (); |
18862
2498c062473b
(Fcompleting_read): gcpro def.
Richard M. Stallman <rms@gnu.org>
parents:
18740
diff
changeset
|
1768 struct gcpro gcpro1; |
2498c062473b
(Fcompleting_read): gcpro def.
Richard M. Stallman <rms@gnu.org>
parents:
18740
diff
changeset
|
1769 |
53312
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1770 init = initial_input; |
18862
2498c062473b
(Fcompleting_read): gcpro def.
Richard M. Stallman <rms@gnu.org>
parents:
18740
diff
changeset
|
1771 GCPRO1 (def); |
2498c062473b
(Fcompleting_read): gcpro def.
Richard M. Stallman <rms@gnu.org>
parents:
18740
diff
changeset
|
1772 |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1773 specbind (Qminibuffer_completion_table, collection); |
14083
3ac9d27214e4
(Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents:
13775
diff
changeset
|
1774 specbind (Qminibuffer_completion_predicate, predicate); |
284 | 1775 specbind (Qminibuffer_completion_confirm, |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1776 EQ (require_match, Qt) ? Qnil : require_match); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1777 |
53312
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1778 position = Qnil; |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1779 if (!NILP (init)) |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1780 { |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1781 if (CONSP (init)) |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1782 { |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1783 position = Fcdr (init); |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1784 init = Fcar (init); |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1785 } |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1786 CHECK_STRING (init); |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1787 if (!NILP (position)) |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1788 { |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1789 CHECK_NUMBER (position); |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1790 /* Convert to distance from end of input. */ |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1791 pos = XINT (position) - SCHARS (init); |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1792 } |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1793 } |
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1794 |
9120
ed766dfb4efe
(read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents:
9049
diff
changeset
|
1795 if (SYMBOLP (hist)) |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1796 { |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1797 histvar = hist; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1798 histpos = Qnil; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1799 } |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1800 else |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1801 { |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1802 histvar = Fcar_safe (hist); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1803 histpos = Fcdr_safe (hist); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1804 } |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1805 if (NILP (histvar)) |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1806 histvar = Qminibuffer_history; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1807 if (NILP (histpos)) |
9316
5f7cfbdef872
(read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents:
9183
diff
changeset
|
1808 XSETFASTINT (histpos, 0); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
1809 |
488 | 1810 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
|
1811 ? (NILP (Vminibuffer_completing_file_name) |
75720
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
1812 || 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
|
1813 ? Vminibuffer_local_completion_map |
f5d06dd5ca9b
(Fcompleting_read): If Vminibuffer_completing_file_name is
Eli Zaretskii <eliz@gnu.org>
parents:
67132
diff
changeset
|
1814 : Vminibuffer_local_filename_completion_map) |
f5d06dd5ca9b
(Fcompleting_read): If Vminibuffer_completing_file_name is
Eli Zaretskii <eliz@gnu.org>
parents:
67132
diff
changeset
|
1815 : (NILP (Vminibuffer_completing_file_name) |
75720
d93f8cf55f80
(read_minibuf): Fix 2007-01-30 change.
Kim F. Storm <storm@cua.dk>
parents:
75558
diff
changeset
|
1816 || 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
|
1817 ? Vminibuffer_local_must_match_map |
95575
d34a432d5863
* keymap.c (Vminibuffer_local_filename_must_match_map):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95188
diff
changeset
|
1818 : Vminibuffer_local_filename_must_match_map), |
53312
93fc4ea3546c
(Fcompleting_read): Undo previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53251
diff
changeset
|
1819 init, prompt, make_number (pos), 0, |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
1820 histvar, histpos, def, 0, |
70930
f3ddca90b6b1
(read_minibuf): Remove arg KEEP_ALL. Callers changed.
Juri Linkov <juri@jurta.org>
parents:
70499
diff
changeset
|
1821 !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
|
1822 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1823 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
|
1824 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
|
1825 |
18862
2498c062473b
(Fcompleting_read): gcpro def.
Richard M. Stallman <rms@gnu.org>
parents:
18740
diff
changeset
|
1826 RETURN_UNGCPRO (unbind_to (count, val)); |
284 | 1827 } |
1828 | |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1829 Lisp_Object Fassoc_string (); |
9398
a8e59db60df6
(test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9316
diff
changeset
|
1830 |
a8e59db60df6
(test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9316
diff
changeset
|
1831 /* Test whether TXT is an exact completion. */ |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1832 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
|
1833 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
|
1834 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
|
1835 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
|
1836 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
|
1837 (string, collection, predicate) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1838 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
|
1839 { |
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
|
1840 Lisp_Object regexps, tail, tem = Qnil; |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1841 int i = 0; |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1842 |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1843 CHECK_STRING (string); |
9398
a8e59db60df6
(test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9316
diff
changeset
|
1844 |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1845 if ((CONSP (collection) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1846 && (!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
|
1847 || NILP (collection)) |
9398
a8e59db60df6
(test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9316
diff
changeset
|
1848 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1849 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
|
1850 if (NILP (tem)) |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1851 return Qnil; |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1852 } |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1853 else if (VECTORP (collection)) |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1854 { |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1855 /* 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
|
1856 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
|
1857 SDATA (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1858 SCHARS (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1859 SBYTES (string)); |
9460
9f5fef5890c9
(test_completion): Fix reversed condition.
Karl Heuer <kwzh@gnu.org>
parents:
9398
diff
changeset
|
1860 if (!SYMBOLP (tem)) |
22034
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
1861 { |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1862 if (STRING_MULTIBYTE (string)) |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1863 string = Fstring_make_unibyte (string); |
22034
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
1864 else |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1865 string = Fstring_make_multibyte (string); |
22034
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
1866 |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1867 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
|
1868 SDATA (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1869 SCHARS (string), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1870 SBYTES (string)); |
22034
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
1871 } |
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
|
1872 |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1873 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
|
1874 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1875 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
|
1876 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1877 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
|
1878 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
|
1879 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
|
1880 { |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1881 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
|
1882 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
|
1883 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
|
1884 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
|
1885 { |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1886 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
|
1887 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
|
1888 } |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1889 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
|
1890 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
|
1891 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
|
1892 } |
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 } |
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 |
9bb418538a0f
(read_minibuf): Allow INITIAL to be a cons of a string and an integer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
1896 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
|
1897 return Qnil; |
9398
a8e59db60df6
(test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9316
diff
changeset
|
1898 } |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1899 else if (HASH_TABLE_P (collection)) |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1900 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1901 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
|
1902 i = hash_lookup (h, string, NULL); |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1903 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
|
1904 tem = HASH_KEY (h, i); |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1905 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
|
1906 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
|
1907 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
|
1908 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
|
1909 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
|
1910 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
|
1911 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
|
1912 { |
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 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
|
1914 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
|
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 if (!STRINGP (tem)) |
46224
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1917 return Qnil; |
98786eb38aed
(Ftry_completion, Fall_completions, Ftest_completion):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46105
diff
changeset
|
1918 } |
9398
a8e59db60df6
(test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9316
diff
changeset
|
1919 else |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1920 return call3 (collection, string, predicate, Qlambda); |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1921 |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1922 /* 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
|
1923 if (CONSP (Vcompletion_regexp_list)) |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1924 { |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1925 int count = SPECPDL_INDEX (); |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1926 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
|
1927 for (regexps = Vcompletion_regexp_list; CONSP (regexps); |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1928 regexps = XCDR (regexps)) |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1929 { |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1930 if (NILP (Fstring_match (XCAR (regexps), |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1931 SYMBOLP (tem) ? string : tem, |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1932 Qnil))) |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1933 return unbind_to (count, Qnil); |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1934 } |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1935 unbind_to (count, Qnil); |
3d12da599e18
(Ftry_completion, Fall_completions, Ftest_completion):
Andreas Schwab <schwab@suse.de>
parents:
55924
diff
changeset
|
1936 } |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1937 |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1938 /* Finally, check the predicate. */ |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1939 if (!NILP (predicate)) |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1940 { |
75475
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1941 return HASH_TABLE_P (collection) |
688a9d290d4d
(Ftry_completion, Fall_completions, Fcompleting_read, Ftest_completion):
Richard M. Stallman <rms@gnu.org>
parents:
75431
diff
changeset
|
1942 ? call2 (predicate, tem, HASH_VALUE (XHASH_TABLE (collection), i)) |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1943 : call1 (predicate, tem); |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
1944 } |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1945 else |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1946 return Qt; |
9398
a8e59db60df6
(test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9316
diff
changeset
|
1947 } |
284 | 1948 |
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
|
1949 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
|
1950 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
|
1951 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
|
1952 `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
|
1953 |
73083
fcfd01b24e1e
(Finternal_complete_buffer, Fread_minibuffer, Fdisplay_completion_list):
Juanma Barranquero <lekktu@gmail.com>
parents:
72613
diff
changeset
|
1954 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
|
1955 `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
|
1956 (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
|
1957 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
|
1958 { |
760e84d650e1
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Jan Djärv <jan.h.d@swipnet.se>
parents:
72606
diff
changeset
|
1959 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
|
1960 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
|
1961 else if (EQ (flag, Qt)) |
95107
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1962 { |
95108
2f0a4ded2809
(Finternal_complete_buffer): Typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95107
diff
changeset
|
1963 Lisp_Object res = Fall_completions (string, Vbuffer_alist, predicate, Qnil); |
95107
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1964 if (SCHARS (string) > 0) |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1965 return res; |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1966 else |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1967 { /* Strip out internal buffers. */ |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1968 Lisp_Object bufs = res; |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1969 /* First, look for a non-internal buffer in `res'. */ |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1970 while (CONSP (bufs) && SREF (XCAR (bufs), 0) == ' ') |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1971 bufs = XCDR (bufs); |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1972 if (NILP (bufs)) |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1973 /* All bufs in `res' are internal, so don't trip them out. */ |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1974 return res; |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1975 res = bufs; |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1976 while (CONSP (XCDR (bufs))) |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1977 if (SREF (XCAR (XCDR (bufs)), 0) == ' ') |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1978 XSETCDR (bufs, XCDR (XCDR (bufs))); |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1979 else |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1980 bufs = XCDR (bufs); |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1981 return res; |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1982 } |
ab4a75e53461
(Finternal_complete_buffer): Only strip out hidden buffers
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1983 } |
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
|
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 |
330 | 1988 /* Like assoc but assumes KEY is a string, and ignores case if appropriate. */ |
1989 | |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
1990 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
|
1991 doc: /* Like `assoc' but specifically for strings (and symbols). |
93745
e8f312e6ec32
(Fassoc_string): Tweak docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
93074
diff
changeset
|
1992 |
e8f312e6ec32
(Fassoc_string): Tweak docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
93074
diff
changeset
|
1993 This returns the first element of LIST whose car matches the string or |
e8f312e6ec32
(Fassoc_string): Tweak docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
93074
diff
changeset
|
1994 symbol KEY, or nil if no match exists. When performing the |
e8f312e6ec32
(Fassoc_string): Tweak docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
93074
diff
changeset
|
1995 comparison, symbols are first converted to strings, and unibyte |
e8f312e6ec32
(Fassoc_string): Tweak docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
93074
diff
changeset
|
1996 strings to multibyte. If the optional arg CASE-FOLD is non-nil, case |
e8f312e6ec32
(Fassoc_string): Tweak docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
93074
diff
changeset
|
1997 is ignored. |
e8f312e6ec32
(Fassoc_string): Tweak docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
93074
diff
changeset
|
1998 |
e8f312e6ec32
(Fassoc_string): Tweak docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
93074
diff
changeset
|
1999 Unlike `assoc', KEY can also match an entry in LIST consisting of a |
e8f312e6ec32
(Fassoc_string): Tweak docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
93074
diff
changeset
|
2000 single string, rather than a cons cell whose car is a string. */) |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
2001 (key, list, case_fold) |
330 | 2002 register Lisp_Object key; |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
2003 Lisp_Object list, case_fold; |
330 | 2004 { |
2005 register Lisp_Object tail; | |
2006 | |
76042
c76aa2fa987a
(Fassoc_string): Doc fix. Allow symbol for KEY too.
Kim F. Storm <storm@cua.dk>
parents:
76027
diff
changeset
|
2007 if (SYMBOLP (key)) |
c76aa2fa987a
(Fassoc_string): Doc fix. Allow symbol for KEY too.
Kim F. Storm <storm@cua.dk>
parents:
76027
diff
changeset
|
2008 key = Fsymbol_name (key); |
c76aa2fa987a
(Fassoc_string): Doc fix. Allow symbol for KEY too.
Kim F. Storm <storm@cua.dk>
parents:
76027
diff
changeset
|
2009 |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85333
diff
changeset
|
2010 for (tail = list; CONSP (tail); tail = XCDR (tail)) |
330 | 2011 { |
2012 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
|
2013 elt = XCAR (tail); |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
2014 thiscar = CONSP (elt) ? XCAR (elt) : elt; |
76027
c0a1f896395c
(Fassoc_string): Allow symbols as keys.
Kim F. Storm <storm@cua.dk>
parents:
75725
diff
changeset
|
2015 if (SYMBOLP (thiscar)) |
c0a1f896395c
(Fassoc_string): Allow symbols as keys.
Kim F. Storm <storm@cua.dk>
parents:
75725
diff
changeset
|
2016 thiscar = Fsymbol_name (thiscar); |
c0a1f896395c
(Fassoc_string): Allow symbols as keys.
Kim F. Storm <storm@cua.dk>
parents:
75725
diff
changeset
|
2017 else if (!STRINGP (thiscar)) |
330 | 2018 continue; |
22034
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
2019 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
|
2020 key, make_number (0), Qnil, |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
2021 case_fold); |
22034
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
2022 if (EQ (tem, Qt)) |
430908755560
(assoc_for_completion): Use Fcompare_strings.
Richard M. Stallman <rms@gnu.org>
parents:
22010
diff
changeset
|
2023 return elt; |
330 | 2024 QUIT; |
2025 } | |
2026 return Qnil; | |
2027 } | |
284 | 2028 |
10086
77b5eb8fc9e3
(Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents:
9903
diff
changeset
|
2029 |
284 | 2030 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
|
2031 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
|
2032 () |
284 | 2033 { |
2034 return make_number (minibuf_level); | |
2035 } | |
2036 | |
6590
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
2037 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
|
2038 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
|
2039 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
|
2040 () |
6590
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
2041 { |
7952
9e2e0fdd1710
(minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents:
7836
diff
changeset
|
2042 return Fcopy_sequence (minibuf_prompt); |
6590
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
2043 } |
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
2044 |
284 | 2045 |
20302
5b3bc7f24d51
(read_minibuf_unwind): Fix return type and return nil.
Andreas Schwab <schwab@suse.de>
parents:
20075
diff
changeset
|
2046 void |
284 | 2047 init_minibuf_once () |
2048 { | |
2049 Vminibuffer_list = Qnil; | |
2050 staticpro (&Vminibuffer_list); | |
2051 } | |
2052 | |
20302
5b3bc7f24d51
(read_minibuf_unwind): Fix return type and return nil.
Andreas Schwab <schwab@suse.de>
parents:
20075
diff
changeset
|
2053 void |
284 | 2054 syms_of_minibuf () |
2055 { | |
2056 minibuf_level = 0; | |
7952
9e2e0fdd1710
(minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents:
7836
diff
changeset
|
2057 minibuf_prompt = Qnil; |
9e2e0fdd1710
(minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents:
7836
diff
changeset
|
2058 staticpro (&minibuf_prompt); |
9e2e0fdd1710
(minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents:
7836
diff
changeset
|
2059 |
9e2e0fdd1710
(minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents:
7836
diff
changeset
|
2060 minibuf_save_list = Qnil; |
9e2e0fdd1710
(minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents:
7836
diff
changeset
|
2061 staticpro (&minibuf_save_list); |
284 | 2062 |
79108
f197bd049c23
(Qcompletion_ignore_case): New Lisp_Object.
Glenn Morris <rgm@gnu.org>
parents:
78260
diff
changeset
|
2063 Qcompletion_ignore_case = intern ("completion-ignore-case"); |
f197bd049c23
(Qcompletion_ignore_case): New Lisp_Object.
Glenn Morris <rgm@gnu.org>
parents:
78260
diff
changeset
|
2064 staticpro (&Qcompletion_ignore_case); |
f197bd049c23
(Qcompletion_ignore_case): New Lisp_Object.
Glenn Morris <rgm@gnu.org>
parents:
78260
diff
changeset
|
2065 |
4641
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
2066 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
|
2067 staticpro (&Qread_file_name_internal); |
9b8e20b21a66
(Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents:
4550
diff
changeset
|
2068 |
17737
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
2069 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
|
2070 staticpro (&Qminibuffer_default); |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
2071 Fset (Qminibuffer_default, Qnil); |
f79f2d6b119b
(Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
17387
diff
changeset
|
2072 |
284 | 2073 Qminibuffer_completion_table = intern ("minibuffer-completion-table"); |
2074 staticpro (&Qminibuffer_completion_table); | |
2075 | |
2076 Qminibuffer_completion_confirm = intern ("minibuffer-completion-confirm"); | |
2077 staticpro (&Qminibuffer_completion_confirm); | |
2078 | |
2079 Qminibuffer_completion_predicate = intern ("minibuffer-completion-predicate"); | |
2080 staticpro (&Qminibuffer_completion_predicate); | |
2081 | |
2082 staticpro (&last_minibuf_string); | |
2083 last_minibuf_string = Qnil; | |
2084 | |
2085 Quser_variable_p = intern ("user-variable-p"); | |
2086 staticpro (&Quser_variable_p); | |
2087 | |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
2088 Qminibuffer_history = intern ("minibuffer-history"); |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
2089 staticpro (&Qminibuffer_history); |
284 | 2090 |
22010
547e4c0a42c0
(Qbuffer_name_history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21854
diff
changeset
|
2091 Qbuffer_name_history = intern ("buffer-name-history"); |
547e4c0a42c0
(Qbuffer_name_history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21854
diff
changeset
|
2092 staticpro (&Qbuffer_name_history); |
22509
a57016ec7f14
(syms_of_minibuf): Initialize buffer-name-history.
Karl Heuer <kwzh@gnu.org>
parents:
22479
diff
changeset
|
2093 Fset (Qbuffer_name_history, Qnil); |
22010
547e4c0a42c0
(Qbuffer_name_history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21854
diff
changeset
|
2094 |
4550
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
2095 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
|
2096 staticpro (&Qminibuffer_setup_hook); |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
2097 |
6742
ef62a96ce830
(Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
6720
diff
changeset
|
2098 Qminibuffer_exit_hook = intern ("minibuffer-exit-hook"); |
ef62a96ce830
(Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
6720
diff
changeset
|
2099 staticpro (&Qminibuffer_exit_hook); |
ef62a96ce830
(Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
6720
diff
changeset
|
2100 |
15967
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
2101 Qhistory_length = intern ("history-length"); |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
2102 staticpro (&Qhistory_length); |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
2103 |
19545
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
2104 Qcurrent_input_method = intern ("current-input-method"); |
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
2105 staticpro (&Qcurrent_input_method); |
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
2106 |
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
2107 Qactivate_input_method = intern ("activate-input-method"); |
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
2108 staticpro (&Qactivate_input_method); |
a7f1c1acde93
(Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents:
19417
diff
changeset
|
2109 |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2110 Qcase_fold_search = intern ("case-fold-search"); |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2111 staticpro (&Qcase_fold_search); |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2112 |
73450
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
2113 Qread_expression_history = intern ("read-expression-history"); |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
2114 staticpro (&Qread_expression_history); |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
2115 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2116 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
|
2117 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
|
2118 Vread_buffer_function = Qnil; |
2fbad61cd5d0
(Vread_buffer_function): New var.
Karl Heuer <kwzh@gnu.org>
parents:
20302
diff
changeset
|
2119 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2120 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
|
2121 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
|
2122 Vminibuffer_setup_hook = Qnil; |
f189820e7ea7
(Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4102
diff
changeset
|
2123 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2124 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
|
2125 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
|
2126 Vminibuffer_exit_hook = Qnil; |
ef62a96ce830
(Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
6720
diff
changeset
|
2127 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2128 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
|
2129 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
|
2130 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
|
2131 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
|
2132 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
|
2133 XSETFASTINT (Vhistory_length, 30); |
b791ab74ff30
(Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
15835
diff
changeset
|
2134 |
57016
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
2135 DEFVAR_BOOL ("history-delete-duplicates", &history_delete_duplicates, |
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
2136 doc: /* *Non-nil means to delete duplicates in history. |
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
2137 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
|
2138 elements are deleted from the history list. */); |
57016
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
2139 history_delete_duplicates = 0; |
eda556d106c6
(history_delete_duplicates): New variable.
Juri Linkov <juri@jurta.org>
parents:
56666
diff
changeset
|
2140 |
71120
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
2141 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
|
2142 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
|
2143 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
|
2144 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
|
2145 `add-to-history' explicitly. */); |
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
2146 Vhistory_add_new_input = Qt; |
3c66cf4b4ded
(Vhistory_add_new_input): New variable.
Juri Linkov <juri@jurta.org>
parents:
70930
diff
changeset
|
2147 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2148 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
|
2149 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
|
2150 |
58207
4410b7cd84c4
(syms_of_minibuf) <completion-ignore-case>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57016
diff
changeset
|
2151 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
|
2152 controls the behavior, rather than this variable. */); |
284 | 2153 completion_ignore_case = 0; |
2154 | |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2155 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
|
2156 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
|
2157 This variable makes a difference whenever the minibuffer window is active. */); |
284 | 2158 enable_recursive_minibuffers = 0; |
2159 | |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2160 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
|
2161 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
|
2162 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
|
2163 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
|
2164 |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2165 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
|
2166 STRING, the current buffer contents; |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2167 PREDICATE, the predicate for filtering possible matches; |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2168 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
|
2169 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
|
2170 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
|
2171 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
|
2172 lambda -- return t if STRING is a valid completion as it stands. */); |
284 | 2173 Vminibuffer_completion_table = Qnil; |
2174 | |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2175 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
|
2176 doc: /* Within call to `completing-read', this holds the PREDICATE argument. */); |
284 | 2177 Vminibuffer_completion_predicate = Qnil; |
2178 | |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2179 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
|
2180 doc: /* Non-nil means to demand confirmation of completion before exiting minibuffer. */); |
284 | 2181 Vminibuffer_completion_confirm = Qnil; |
2182 | |
22657
d19cd2986f18
(Vminibuffer_completing_file_name): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22509
diff
changeset
|
2183 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
|
2184 &Vminibuffer_completing_file_name, |
94189
c1b4e330f616
(syms_of_minibuf) <minibuffer-completing-file-name>: Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93937
diff
changeset
|
2185 doc: /* Non-nil means completing file names. */); |
22657
d19cd2986f18
(Vminibuffer_completing_file_name): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22509
diff
changeset
|
2186 Vminibuffer_completing_file_name = Qnil; |
d19cd2986f18
(Vminibuffer_completing_file_name): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22509
diff
changeset
|
2187 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2188 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
|
2189 doc: /* Value that `help-form' takes on inside the minibuffer. */); |
284 | 2190 Vminibuffer_help_form = Qnil; |
2191 | |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2192 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
|
2193 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
|
2194 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
|
2195 is added with |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2196 (set minibuffer-history-variable |
1c2d486200f3
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39838
diff
changeset
|
2197 (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
|
2198 XSETFASTINT (Vminibuffer_history_variable, 0); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
2199 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2200 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
|
2201 doc: /* Current position of redoing in the history list. */); |
864
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
2202 Vminibuffer_history_position = Qnil; |
fe5f6b7c9727
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
765
diff
changeset
|
2203 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2204 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
|
2205 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
|
2206 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
|
2207 minibuffer_auto_raise = 0; |
63932e111cc5
(minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents:
5069
diff
changeset
|
2208 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2209 DEFVAR_LISP ("completion-regexp-list", &Vcompletion_regexp_list, |
53827
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2210 doc: /* List of regexps that should restrict possible completions. |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2211 The basic completion functions only consider a completion acceptable |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2212 if it matches all regular expressions in this list, with |
44d25617bd98
(Fminibufferp, Fread_from_minibuffer)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53364
diff
changeset
|
2213 `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
|
2214 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
|
2215 functions. */); |
6589
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
2216 Vcompletion_regexp_list = Qnil; |
764913e8463c
(Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents:
6544
diff
changeset
|
2217 |
18444
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
2218 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
|
2219 &minibuffer_allow_text_properties, |
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2220 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
|
2221 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
|
2222 `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
|
2223 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
|
2224 minibuffer_allow_text_properties = 0; |
825ff9e2e44e
(read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents:
17805
diff
changeset
|
2225 |
39989
c652433b7f2f
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
2226 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
|
2227 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
|
2228 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
|
2229 properties. */); |
33682
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
2230 /* 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
|
2231 initialization-order problems. */ |
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
2232 Vminibuffer_prompt_properties |
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
2233 = Fcons (intern ("read-only"), Fcons (Qt, Qnil)); |
ec99a5f4085e
(Vminibuffer_prompt_properties): New variable.
Miles Bader <miles@gnu.org>
parents:
33088
diff
changeset
|
2234 |
73450
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
2235 DEFVAR_LISP ("read-expression-map", &Vread_expression_map, |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
2236 doc: /* Minibuffer keymap used for reading Lisp expressions. */); |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
2237 Vread_expression_map = Qnil; |
726825bcce52
(Vread_expression_map): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
73318
diff
changeset
|
2238 |
14435
4f2ec5d39f00
(Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
2239 defsubr (&Sset_minibuffer_window); |
284 | 2240 defsubr (&Sread_from_minibuffer); |
2241 defsubr (&Seval_minibuffer); | |
2242 defsubr (&Sread_minibuffer); | |
2243 defsubr (&Sread_string); | |
2244 defsubr (&Sread_command); | |
2245 defsubr (&Sread_variable); | |
72606
18e29ef6d5d7
(Finternal_complete_buffer): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71797
diff
changeset
|
2246 defsubr (&Sinternal_complete_buffer); |
284 | 2247 defsubr (&Sread_buffer); |
2248 defsubr (&Sread_no_blanks_input); | |
2249 defsubr (&Sminibuffer_depth); | |
6590
2c66255e9469
(Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents:
6589
diff
changeset
|
2250 defsubr (&Sminibuffer_prompt); |
284 | 2251 |
46877
2ff0df63c873
(Fminibufferp): New function.
Richard M. Stallman <rms@gnu.org>
parents:
46473
diff
changeset
|
2252 defsubr (&Sminibufferp); |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
2253 defsubr (&Sminibuffer_prompt_end); |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
2254 defsubr (&Sminibuffer_contents); |
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
2255 defsubr (&Sminibuffer_contents_no_properties); |
67618
40cdd21343f8
(Fminibuffer_completion_contents): New Lisp function
Juri Linkov <juri@jurta.org>
parents:
67498
diff
changeset
|
2256 defsubr (&Sminibuffer_completion_contents); |
39595
d184cf4318ee
(Fminibuffer_prompt_end, Fminibuffer_contents)
Miles Bader <miles@gnu.org>
parents:
39581
diff
changeset
|
2257 |
284 | 2258 defsubr (&Stry_completion); |
2259 defsubr (&Sall_completions); | |
44469
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
2260 defsubr (&Stest_completion); |
f9a82a50692e
(read_minibuf): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43595
diff
changeset
|
2261 defsubr (&Sassoc_string); |
284 | 2262 defsubr (&Scompleting_read); |
2263 } | |
2264 | |
52401 | 2265 /* arch-tag: 8f69b601-fba3-484c-a6dd-ceaee54a7a73 |
2266 (do not change this comment) */ |