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