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