annotate src/minibuf.c @ 49194:f3184bd36737

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