annotate src/minibuf.c @ 43389:7f7c01afd770

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