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