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