annotate src/minibuf.c @ 20339:b04c89d6c796

(strftime.o): No need to compile with -Dstrftime=emacs_strftime any more.
author Paul Eggert <eggert@twinsun.com>
date Mon, 24 Nov 1997 19:50:22 +0000
parents 5b3bc7f24d51
children 2fbad61cd5d0
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.
19728
6fad157cece4 (read_minibuf): Fix use of Ffboundp.
Richard M. Stallman <rms@gnu.org>
parents: 19672
diff changeset
2 Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997
6fad157cece4 (read_minibuf): Fix use of Ffboundp.
Richard M. Stallman <rms@gnu.org>
parents: 19672
diff changeset
3 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>
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
24 #include "lisp.h"
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
25 #include "commands.h"
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
26 #include "buffer.h"
17039
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
27 #include "charset.h"
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
28 #include "dispextern.h"
765
e4093444f9f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 737
diff changeset
29 #include "frame.h"
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
30 #include "window.h"
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
31 #include "syntax.h"
12164
f40837862599 (Fminibuffer_complete): Make last_command be kboard-local.
Karl Heuer <kwzh@gnu.org>
parents: 11346
diff changeset
32 #include "keyboard.h"
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
34 #define min(a, b) ((a) < (b) ? (a) : (b))
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
35
6233
1e90a9197a2a (temp_echo_area_glyphs): Use quit_char, not C-g.
Karl Heuer <kwzh@gnu.org>
parents: 6207
diff changeset
36 extern int quit_char;
1e90a9197a2a (temp_echo_area_glyphs): Use quit_char, not C-g.
Karl Heuer <kwzh@gnu.org>
parents: 6207
diff changeset
37
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
38 /* 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
39 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
40 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
41 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
42 minibuffer recursions are encountered. */
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
43 Lisp_Object Vminibuffer_list;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
44
7952
9e2e0fdd1710 (minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents: 7836
diff changeset
45 /* Data to remember during recursive minibuffer invocations */
9e2e0fdd1710 (minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents: 7836
diff changeset
46 Lisp_Object minibuf_save_list;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
47
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
48 /* Depth in minibuffer invocations. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
49 int minibuf_level;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
50
15967
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
51 /* Nonzero means display completion help for invalid input. */
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
52 int auto_help;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
53
15967
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
54 /* The maximum length of a minibuffer history. */
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
55 Lisp_Object Qhistory_length, Vhistory_length;
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
56
4824
eaf67474339b (Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents: 4775
diff changeset
57 /* Fread_minibuffer leaves the input here as a string. */
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
58 Lisp_Object last_minibuf_string;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
59
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
60 /* Nonzero means let functions called when within a minibuffer
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
61 invoke recursive minibuffers (to read arguments, or whatever) */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
62 int enable_recursive_minibuffers;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
63
18444
825ff9e2e44e (read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents: 17805
diff changeset
64 /* Nonzero means don't ignore text properties
825ff9e2e44e (read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents: 17805
diff changeset
65 in Fread_from_minibuffer. */
825ff9e2e44e (read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents: 17805
diff changeset
66 int minibuffer_allow_text_properties;
825ff9e2e44e (read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents: 17805
diff changeset
67
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
68 /* help-form is bound to this while in the minibuffer. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
69
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
70 Lisp_Object Vminibuffer_help_form;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
71
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
72 /* 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
73
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
74 Lisp_Object Vminibuffer_history_variable;
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
75
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
76 /* 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
77
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
78 Lisp_Object Vminibuffer_history_position;
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
79
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
80 Lisp_Object Qminibuffer_history;
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
81
4641
9b8e20b21a66 (Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents: 4550
diff changeset
82 Lisp_Object Qread_file_name_internal;
9b8e20b21a66 (Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents: 4550
diff changeset
83
6742
ef62a96ce830 (Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 6720
diff changeset
84 /* 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
85
f189820e7ea7 (Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 4102
diff changeset
86 Lisp_Object Qminibuffer_setup_hook, Vminibuffer_setup_hook;
6742
ef62a96ce830 (Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 6720
diff changeset
87 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
88
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
89 /* Nonzero means completion ignores case. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
90
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
91 int completion_ignore_case;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
92
6589
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
93 /* List of regexps that should restrict possible completions. */
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
94
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
95 Lisp_Object Vcompletion_regexp_list;
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
96
5238
63932e111cc5 (minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents: 5069
diff changeset
97 /* 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
98 is entered. */
63932e111cc5 (minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents: 5069
diff changeset
99
63932e111cc5 (minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents: 5069
diff changeset
100 int minibuffer_auto_raise;
63932e111cc5 (minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents: 5069
diff changeset
101
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
102 /* If last completion attempt reported "Complete but not unique"
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
103 then this is the string completed then; otherwise this is nil. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
104
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
105 static Lisp_Object last_exact_completion;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
106
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
107 Lisp_Object Quser_variable_p;
6544
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
108
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
109 Lisp_Object Qminibuffer_default;
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
110
6544
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
111 /* 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
112 when the minibuffer is selected. */
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
113 extern Lisp_Object Vminibuf_scroll_window;
11004
0f6b7b33340a (read_minibuf): Save Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents: 10859
diff changeset
114
0f6b7b33340a (read_minibuf): Save Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents: 10859
diff changeset
115 extern Lisp_Object Voverriding_local_map;
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
116
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
117 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
118
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
119
13397
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
120 /* 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
121 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
122 or when a minibuffer exits. */
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
123
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
124 void
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
125 choose_minibuf_frame ()
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
126 {
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
127 if (selected_frame != 0
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
128 && !EQ (minibuf_window, selected_frame->minibuffer_window))
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
129 {
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
130 /* 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
131 window anymore. */
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
132 if (NILP (selected_frame->minibuffer_window))
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
133 abort ();
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
134
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
135 Fset_window_buffer (selected_frame->minibuffer_window,
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
136 XWINDOW (minibuf_window)->buffer);
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
137 minibuf_window = selected_frame->minibuffer_window;
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
138 }
16475
2602c284eb11 (read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents: 16265
diff changeset
139
2602c284eb11 (read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents: 16265
diff changeset
140 /* 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
141 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
142 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
143 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
144 {
2602c284eb11 (read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents: 16265
diff changeset
145 Lisp_Object tail, frame;
2602c284eb11 (read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents: 16265
diff changeset
146
2602c284eb11 (read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents: 16265
diff changeset
147 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
148 if (MINI_WINDOW_P (XWINDOW (FRAME_SELECTED_WINDOW (XFRAME (frame))))
83d580ba04cf (choose_minibuf_frame): Don't change selected_frame's
Richard M. Stallman <rms@gnu.org>
parents: 16475
diff changeset
149 && !(XFRAME (frame) == selected_frame
83d580ba04cf (choose_minibuf_frame): Don't change selected_frame's
Richard M. Stallman <rms@gnu.org>
parents: 16475
diff changeset
150 && minibuf_level > 0))
16475
2602c284eb11 (read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents: 16265
diff changeset
151 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
152 }
13397
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
153 }
14435
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
154
18904
1ff8b0bca025 (choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18862
diff changeset
155 Lisp_Object
1ff8b0bca025 (choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18862
diff changeset
156 choose_minibuf_frame_1 (ignore)
1ff8b0bca025 (choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18862
diff changeset
157 Lisp_Object ignore;
1ff8b0bca025 (choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18862
diff changeset
158 {
1ff8b0bca025 (choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18862
diff changeset
159 choose_minibuf_frame ();
1ff8b0bca025 (choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18862
diff changeset
160 return Qnil;
1ff8b0bca025 (choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18862
diff changeset
161 }
1ff8b0bca025 (choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18862
diff changeset
162
14435
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
163 DEFUN ("set-minibuffer-window", Fset_minibuffer_window,
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
164 Sset_minibuffer_window, 1, 1, 0,
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
165 "Specify which minibuffer window to use for the minibuffer.\n\
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
166 This effects where the minibuffer is displayed if you put text in it\n\
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
167 without invoking the usual minibuffer commands.")
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
168 (window)
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
169 Lisp_Object window;
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
170 {
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
171 CHECK_WINDOW (window, 1);
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
172 if (! MINI_WINDOW_P (XWINDOW (window)))
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
173 error ("Window is not a minibuffer window");
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
174
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
175 minibuf_window = window;
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
176
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
177 return window;
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
178 }
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
179
13397
aac6ac5b87fd (choose_minibuf_frame): Moved here from frame.c.
Karl Heuer <kwzh@gnu.org>
parents: 13345
diff changeset
180
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
181 /* Actual minibuffer invocation. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
182
20302
5b3bc7f24d51 (read_minibuf_unwind): Fix return type and return nil.
Andreas Schwab <schwab@suse.de>
parents: 20075
diff changeset
183 static Lisp_Object read_minibuf_unwind ();
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
184 Lisp_Object get_minibuffer ();
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
185 static Lisp_Object read_minibuf ();
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
186
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
187 /* Read from the minibuffer using keymap MAP, initial contents INITIAL
866
ae5c412a32ec entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 864
diff changeset
188 (a string), putting point minus BACKUP_N chars from the end of INITIAL,
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
189 prompting with PROMPT (a string), using history list HISTVAR
866
ae5c412a32ec entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 864
diff changeset
190 with initial position HISTPOS. (BACKUP_N should be <= 0.)
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
191
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
192 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
193 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
194 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
195 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
196 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
197
18444
825ff9e2e44e (read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents: 17805
diff changeset
198 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
199
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
200 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
201
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
202 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
203 current input method. */
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
204
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
205 static Lisp_Object
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
206 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
207 histvar, histpos, defalt, allow_props, inherit_input_method)
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
208 Lisp_Object map;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
209 Lisp_Object initial;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
210 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
211 Lisp_Object backup_n;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
212 int expflag;
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
213 Lisp_Object histvar;
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
214 Lisp_Object histpos;
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
215 Lisp_Object defalt;
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
216 int inherit_input_method;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
217 {
10249
a664a948dd55 (read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents: 10173
diff changeset
218 Lisp_Object val;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
219 int count = specpdl_ptr - specpdl;
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
220 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
221 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
222 Lisp_Object enable_multibyte;
10249
a664a948dd55 (read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents: 10173
diff changeset
223
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
224 specbind (Qminibuffer_default, defalt);
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
225
11346
c174158fff45 Don't include keyboard.h.
Richard M. Stallman <rms@gnu.org>
parents: 11341
diff changeset
226 single_kboard_state ();
10818
8c81853b2679 (read_minibuf): Make sure the display is locked.
Karl Heuer <kwzh@gnu.org>
parents: 10619
diff changeset
227
10249
a664a948dd55 (read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents: 10173
diff changeset
228 val = Qnil;
14969
ea072e2f75f8 (read_minibuf): GCPRO ambient_dir.
Richard M. Stallman <rms@gnu.org>
parents: 14952
diff changeset
229 ambient_dir = current_buffer->directory;
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
230 input_method = Qnil;
19561
7e13891b6f22 (read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents: 19545
diff changeset
231 enable_multibyte = Qnil;
14969
ea072e2f75f8 (read_minibuf): GCPRO ambient_dir.
Richard M. Stallman <rms@gnu.org>
parents: 14952
diff changeset
232
10249
a664a948dd55 (read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents: 10173
diff changeset
233 /* 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
234 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
235 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
236 GCPRO5 (map, initial, val, ambient_dir, input_method);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
237
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
238 if (!STRINGP (prompt))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
239 prompt = build_string ("");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
240
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
241 if (!enable_recursive_minibuffers
16180
9b0180c495ff (read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
242 && minibuf_level > 0)
9b0180c495ff (read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
243 {
9b0180c495ff (read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
244 if (EQ (selected_window, minibuf_window))
9b0180c495ff (read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
245 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
246 else
9b0180c495ff (read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
247 /* 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
248 Fthrow (Qexit,
9b0180c495ff (read_minibuf): If not in minibuffer window,
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
249 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
250 }
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
251
14952
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
252 /* Choose the minibuffer window and frame, and take action on them. */
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
253
12631
ab75fc26058e (read_minibuf): Call choose_minibuffer_frame.
Richard M. Stallman <rms@gnu.org>
parents: 12164
diff changeset
254 choose_minibuf_frame ();
ab75fc26058e (read_minibuf): Call choose_minibuffer_frame.
Richard M. Stallman <rms@gnu.org>
parents: 12164
diff changeset
255
18904
1ff8b0bca025 (choose_minibuf_frame_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18862
diff changeset
256 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
257
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
258 record_unwind_protect (Fset_window_configuration,
345
8633e6928acc *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 330
diff changeset
259 Fcurrent_window_configuration (Qnil));
8633e6928acc *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 330
diff changeset
260
765
e4093444f9f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 737
diff changeset
261 /* If the minibuffer window is on a different frame, save that
e4093444f9f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 737
diff changeset
262 frame's configuration too. */
8899
81103c53aa59 (read_minibuf): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8872
diff changeset
263 mini_frame = WINDOW_FRAME (XWINDOW (minibuf_window));
765
e4093444f9f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 737
diff changeset
264 if (XFRAME (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
265 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
266 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
267
a74524e1c961 (read_minibuf): Make minibuffer frame visible when minibuffer activated.
Karl Heuer <kwzh@gnu.org>
parents: 6235
diff changeset
268 /* 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
269 make it visible now. */
a74524e1c961 (read_minibuf): Make minibuffer frame visible when minibuffer activated.
Karl Heuer <kwzh@gnu.org>
parents: 6235
diff changeset
270 Fmake_frame_visible (mini_frame);
a74524e1c961 (read_minibuf): Make minibuffer frame visible when minibuffer activated.
Karl Heuer <kwzh@gnu.org>
parents: 6235
diff changeset
271
5238
63932e111cc5 (minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents: 5069
diff changeset
272 if (minibuffer_auto_raise)
63932e111cc5 (minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents: 5069
diff changeset
273 Fraise_frame (mini_frame);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
274
14952
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
275 /* 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
276 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
277
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
278 /* 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
279 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
280 specpdl slots. */
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
281 minibuf_save_list
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
282 = Fcons (Voverriding_local_map,
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
283 Fcons (minibuf_window, minibuf_save_list));
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
284 minibuf_save_list
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
285 = Fcons (minibuf_prompt,
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
286 Fcons (make_number (minibuf_prompt_width),
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
287 Fcons (Vhelp_form,
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
288 Fcons (Vcurrent_prefix_arg,
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
289 Fcons (Vminibuffer_history_position,
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
290 Fcons (Vminibuffer_history_variable,
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
291 minibuf_save_list))))));
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
292
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
293 record_unwind_protect (read_minibuf_unwind, Qnil);
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
294 minibuf_level++;
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
295
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
296 /* 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
297
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
298 minibuf_prompt_width = 0; /* xdisp.c puts in the right value. */
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
299 minibuf_prompt = Fcopy_sequence (prompt);
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
300 Vminibuffer_history_position = histpos;
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
301 Vminibuffer_history_variable = histvar;
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
302 Vhelp_form = Vminibuffer_help_form;
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
303
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
304 if (inherit_input_method)
19561
7e13891b6f22 (read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents: 19545
diff changeset
305 {
7e13891b6f22 (read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents: 19545
diff changeset
306 /* `current-input-method' is buffer local. So, remeber it in
7e13891b6f22 (read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents: 19545
diff changeset
307 INPUT_METHOD before changing the current buffer. */
7e13891b6f22 (read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents: 19545
diff changeset
308 input_method = Fsymbol_value (Qcurrent_input_method);
7e13891b6f22 (read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents: 19545
diff changeset
309 enable_multibyte = current_buffer->enable_multibyte_characters;
7e13891b6f22 (read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents: 19545
diff changeset
310 }
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
311
14952
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
312 /* Switch to the minibuffer. */
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
313
17387
b0d63d297969 (read_minibuf): Get the string from the minibuffer
Richard M. Stallman <rms@gnu.org>
parents: 17375
diff changeset
314 minibuffer = get_minibuffer (minibuf_level);
b0d63d297969 (read_minibuf): Get the string from the minibuffer
Richard M. Stallman <rms@gnu.org>
parents: 17375
diff changeset
315 Fset_buffer (minibuffer);
1593
a3862c6dfcd0 * minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents: 1568
diff changeset
316
a3862c6dfcd0 * minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents: 1568
diff changeset
317 /* 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
318 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
319 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
320 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
321 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
322 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
323 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
324 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
325 if (STRINGP (ambient_dir))
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
326 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
327 else
a3862c6dfcd0 * minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents: 1568
diff changeset
328 {
a3862c6dfcd0 * minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents: 1568
diff changeset
329 Lisp_Object buf_list;
a3862c6dfcd0 * minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents: 1568
diff changeset
330
a3862c6dfcd0 * minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents: 1568
diff changeset
331 for (buf_list = Vbuffer_alist;
a3862c6dfcd0 * minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents: 1568
diff changeset
332 CONSP (buf_list);
a3862c6dfcd0 * minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents: 1568
diff changeset
333 buf_list = XCONS (buf_list)->cdr)
a3862c6dfcd0 * minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents: 1568
diff changeset
334 {
6504
c867b9af8de4 (read_minibuf): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6472
diff changeset
335 Lisp_Object other_buf;
1593
a3862c6dfcd0 * minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents: 1568
diff changeset
336
6504
c867b9af8de4 (read_minibuf): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6472
diff changeset
337 other_buf = XCONS (XCONS (buf_list)->car)->cdr;
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
338 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
339 {
a3862c6dfcd0 * minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents: 1568
diff changeset
340 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
341 break;
a3862c6dfcd0 * minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents: 1568
diff changeset
342 }
a3862c6dfcd0 * minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents: 1568
diff changeset
343 }
a3862c6dfcd0 * minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents: 1568
diff changeset
344 }
a3862c6dfcd0 * minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents: 1568
diff changeset
345
6472
7491cbb3d1a3 (read_minibuf): Don't redirect focus unless minibuf is on another frame.
Karl Heuer <kwzh@gnu.org>
parents: 6384
diff changeset
346 if (XFRAME (mini_frame) != selected_frame)
7491cbb3d1a3 (read_minibuf): Don't redirect focus unless minibuf is on another frame.
Karl Heuer <kwzh@gnu.org>
parents: 6384
diff changeset
347 Fredirect_frame_focus (Fselected_frame (), mini_frame);
358
71c9042fb90d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 345
diff changeset
348
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
349 Vminibuf_scroll_window = selected_window;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
350 Fset_window_buffer (minibuf_window, Fcurrent_buffer ());
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
351 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
352 XSETFASTINT (XWINDOW (minibuf_window)->hscroll, 0);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
353
14952
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
354 Fmake_local_variable (Qprint_escape_newlines);
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
355 print_escape_newlines = 1;
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
356
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
357 /* 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
358 {
3de266c52c9a (read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 14435
diff changeset
359 int count1 = 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
360 specbind (Qinhibit_read_only, Qt);
3de266c52c9a (read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 14435
diff changeset
361 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
362 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
363 }
3de266c52c9a (read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 14435
diff changeset
364
14952
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
365 /* Put in the initial input. */
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
366 if (!NILP (initial))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
367 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
368 Finsert (1, &initial);
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
369 if (!NILP (backup_n) && INTEGERP (backup_n))
17039
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
370 Fgoto_char (make_number (PT + XFASTINT (backup_n)));
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
371 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
372
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
373 echo_area_glyphs = 0;
7289
18940d9c3c4c (read_minibuf): Clear previous_echo_glyphs.
Richard M. Stallman <rms@gnu.org>
parents: 7198
diff changeset
374 /* This is in case the minibuffer-setup-hook calls Fsit_for. */
18940d9c3c4c (read_minibuf): Clear previous_echo_glyphs.
Richard M. Stallman <rms@gnu.org>
parents: 7198
diff changeset
375 previous_echo_glyphs = 0;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
376
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
377 current_buffer->keymap = map;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
378
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
379 /* 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
380 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
381 call1 (Qactivate_input_method, input_method);
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
382
19561
7e13891b6f22 (read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents: 19545
diff changeset
383 /* If appropriate, copy enable-multibyte-characters into the minibuffer. */
7e13891b6f22 (read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents: 19545
diff changeset
384 if (inherit_input_method)
19569
2f471f36f4f4 Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19561
diff changeset
385 current_buffer->enable_multibyte_characters = enable_multibyte;
19561
7e13891b6f22 (read_minibuf): Inherit enable-multibyte-characters
Richard M. Stallman <rms@gnu.org>
parents: 19545
diff changeset
386
4550
f189820e7ea7 (Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 4102
diff changeset
387 /* 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
388 (run-hooks would do nothing if it is empty,
14952
cb48d9a50ebc (read_minibuf): Rearrange operations, mainly putting
Richard M. Stallman <rms@gnu.org>
parents: 14667
diff changeset
389 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
390 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
391 && !NILP (Vrun_hooks))
4550
f189820e7ea7 (Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 4102
diff changeset
392 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
393
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
394 /* ??? MCC did redraw_screen here if switching screens. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
395 recursive_edit_1 ();
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
396
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
397 /* If cursor is on the minibuffer line,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
398 show the user we have exited by putting it in column 0. */
765
e4093444f9f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 737
diff changeset
399 if ((FRAME_CURSOR_Y (selected_frame)
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
400 >= XFASTINT (XWINDOW (minibuf_window)->top))
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
401 && !noninteractive)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
402 {
16265
85a90affc238 (read_minibuf): Use FRAME_LEFT_SCROLL_BAR_WIDTH
Richard M. Stallman <rms@gnu.org>
parents: 16237
diff changeset
403 FRAME_CURSOR_X (selected_frame)
85a90affc238 (read_minibuf): Use FRAME_LEFT_SCROLL_BAR_WIDTH
Richard M. Stallman <rms@gnu.org>
parents: 16237
diff changeset
404 = FRAME_LEFT_SCROLL_BAR_WIDTH (selected_frame);
765
e4093444f9f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 737
diff changeset
405 update_frame (selected_frame, 1, 1);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
406 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
407
18444
825ff9e2e44e (read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents: 17805
diff changeset
408 /* 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
409 Fset_buffer (minibuffer);
18444
825ff9e2e44e (read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents: 17805
diff changeset
410 val = make_buffer_string (1, Z, allow_props);
13775
beedfd49bc1b (read_minibuf): Pass PROPS arg to make_buffer_string.
Karl Heuer <kwzh@gnu.org>
parents: 13720
diff changeset
411 #if 0 /* make_buffer_string should handle the gap. */
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
412 bcopy (GAP_END_ADDR, XSTRING (val)->data + GPT - BEG, Z - GPT);
13775
beedfd49bc1b (read_minibuf): Pass PROPS arg to make_buffer_string.
Karl Heuer <kwzh@gnu.org>
parents: 13720
diff changeset
413 #endif
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
414
4824
eaf67474339b (Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents: 4775
diff changeset
415 /* 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
416
de449ef32afd (read_minibuf): Return DEFALT here, if minibuffer is empty.
Karl Heuer <kwzh@gnu.org>
parents: 19902
diff changeset
417 if (STRINGP (val) && XSTRING (val)->size == 0 && ! NILP (defalt))
de449ef32afd (read_minibuf): Return DEFALT here, if minibuffer is empty.
Karl Heuer <kwzh@gnu.org>
parents: 19902
diff changeset
418 val = defalt;
de449ef32afd (read_minibuf): Return DEFALT here, if minibuffer is empty.
Karl Heuer <kwzh@gnu.org>
parents: 19902
diff changeset
419
4824
eaf67474339b (Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents: 4775
diff changeset
420 last_minibuf_string = val;
eaf67474339b (Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents: 4775
diff changeset
421
9615
f696aae6c5e0 (read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9583
diff changeset
422 /* 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
423 if (XSTRING (val)->size != 0
f696aae6c5e0 (read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9583
diff changeset
424 && SYMBOLP (Vminibuffer_history_variable)
f696aae6c5e0 (read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9583
diff changeset
425 && ! EQ (XSYMBOL (Vminibuffer_history_variable)->value, Qunbound))
f696aae6c5e0 (read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9583
diff changeset
426 {
f696aae6c5e0 (read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9583
diff changeset
427 /* 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
428 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
429 Lisp_Object histval;
f696aae6c5e0 (read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9583
diff changeset
430 histval = Fsymbol_value (Vminibuffer_history_variable);
f696aae6c5e0 (read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9583
diff changeset
431
f696aae6c5e0 (read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9583
diff changeset
432 /* 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
433 values are unacceptable. We silently ignore these values. */
f696aae6c5e0 (read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9583
diff changeset
434 if (NILP (histval)
f696aae6c5e0 (read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9583
diff changeset
435 || (CONSP (histval)
f696aae6c5e0 (read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9583
diff changeset
436 && 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
437 {
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
438 Lisp_Object length;
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
439
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
440 histval = Fcons (last_minibuf_string, histval);
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
441 Fset (Vminibuffer_history_variable, histval);
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
442
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
443 /* Truncate if requested. */
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
444 length = Fget (Vminibuffer_history_variable, Qhistory_length);
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
445 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
446 if (INTEGERP (length))
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
447 {
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
448 if (XINT (length) <= 0)
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
449 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
450 else
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
451 {
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
452 Lisp_Object temp;
15967
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
453
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
454 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
455 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
456 }
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
457 }
15967
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
458 }
9615
f696aae6c5e0 (read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9583
diff changeset
459 }
f696aae6c5e0 (read_minibuf): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9583
diff changeset
460
5069
47cc31b47402 (read_minibuf): History list always gets strings,
Richard M. Stallman <rms@gnu.org>
parents: 4824
diff changeset
461 /* 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
462 if (expflag)
6384
5e8a442a836d (read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents: 6354
diff changeset
463 {
5e8a442a836d (read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents: 6354
diff changeset
464 Lisp_Object expr_and_pos;
5e8a442a836d (read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents: 6354
diff changeset
465 unsigned char *p;
5e8a442a836d (read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents: 6354
diff changeset
466
5e8a442a836d (read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents: 6354
diff changeset
467 expr_and_pos = Fread_from_string (val, Qnil, Qnil);
5e8a442a836d (read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents: 6354
diff changeset
468 /* Ignore trailing whitespace; any other trailing junk is an error. */
5e8a442a836d (read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents: 6354
diff changeset
469 for (p = XSTRING (val)->data + XINT (Fcdr (expr_and_pos)); *p; p++)
5e8a442a836d (read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents: 6354
diff changeset
470 if (*p != ' ' && *p != '\t' && *p != '\n')
5e8a442a836d (read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents: 6354
diff changeset
471 error ("Trailing garbage following expression");
5e8a442a836d (read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents: 6354
diff changeset
472 val = Fcar (expr_and_pos);
5e8a442a836d (read_minibuf): Disallow trailing junk.
Karl Heuer <kwzh@gnu.org>
parents: 6354
diff changeset
473 }
5069
47cc31b47402 (read_minibuf): History list always gets strings,
Richard M. Stallman <rms@gnu.org>
parents: 4824
diff changeset
474
10249
a664a948dd55 (read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents: 10173
diff changeset
475 /* The appropriate frame will get selected
a664a948dd55 (read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents: 10173
diff changeset
476 in set-window-configuration. */
a664a948dd55 (read_minibuf): GCPRO things.
Richard M. Stallman <rms@gnu.org>
parents: 10173
diff changeset
477 RETURN_UNGCPRO (unbind_to (count, val));
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
478 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
479
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
480 /* Return a buffer to be used as the minibuffer at depth `depth'.
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
481 depth = 0 is the lowest allowed argument, and that is the value
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
482 used for nonrecursive minibuffer invocations */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
483
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
484 Lisp_Object
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
485 get_minibuffer (depth)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
486 int depth;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
487 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
488 Lisp_Object tail, num, buf;
6235
d93350e9d2bc (get_minibuffer): Make name buffer large enough.
Karl Heuer <kwzh@gnu.org>
parents: 6234
diff changeset
489 char name[24];
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
490 extern Lisp_Object nconc2 ();
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
491
9316
5f7cfbdef872 (read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents: 9183
diff changeset
492 XSETFASTINT (num, depth);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
493 tail = Fnthcdr (num, Vminibuffer_list);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
494 if (NILP (tail))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
495 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
496 tail = Fcons (Qnil, Qnil);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
497 Vminibuffer_list = nconc2 (Vminibuffer_list, tail);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
498 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
499 buf = Fcar (tail);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
500 if (NILP (buf) || NILP (XBUFFER (buf)->name))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
501 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
502 sprintf (name, " *Minibuf-%d*", depth);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
503 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
504
7c4519722020 Thu Sep 17 15:51:18 1992 Jim Blandy (jimb@pogo.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents: 1010
diff changeset
505 /* 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
506 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
507 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
508
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
509 XCONS (tail)->car = buf;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
510 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
511 else
8872
0f20e5e19ed6 (get_minibuffer): Call Fkill_all_local_variables.
Richard M. Stallman <rms@gnu.org>
parents: 8790
diff changeset
512 {
9001
69f0ae06bcdf (Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8899
diff changeset
513 int count = specpdl_ptr - specpdl;
69f0ae06bcdf (Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8899
diff changeset
514
8872
0f20e5e19ed6 (get_minibuffer): Call Fkill_all_local_variables.
Richard M. Stallman <rms@gnu.org>
parents: 8790
diff changeset
515 reset_buffer (XBUFFER (buf));
9001
69f0ae06bcdf (Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8899
diff changeset
516 record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
69f0ae06bcdf (Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8899
diff changeset
517 Fset_buffer (buf);
69f0ae06bcdf (Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8899
diff changeset
518 Fkill_all_local_variables ();
69f0ae06bcdf (Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8899
diff changeset
519 unbind_to (count, Qnil);
8872
0f20e5e19ed6 (get_minibuffer): Call Fkill_all_local_variables.
Richard M. Stallman <rms@gnu.org>
parents: 8790
diff changeset
520 }
1593
a3862c6dfcd0 * minibuf.c (temp_echo_area_glyphs): Change reference to
Jim Blandy <jimb@redhat.com>
parents: 1568
diff changeset
521
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
522 return buf;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
523 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
524
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
525 /* This function is called on exiting minibuffer, whether normally or not,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
526 and it restores the current window, buffer, etc. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
527
20302
5b3bc7f24d51 (read_minibuf_unwind): Fix return type and return nil.
Andreas Schwab <schwab@suse.de>
parents: 20075
diff changeset
528 static Lisp_Object
358
71c9042fb90d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 345
diff changeset
529 read_minibuf_unwind (data)
71c9042fb90d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 345
diff changeset
530 Lisp_Object data;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
531 {
9049
522a9e03ca05 (read_minibuf_unwind): Preserve Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 9001
diff changeset
532 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
533 Lisp_Object window;
9049
522a9e03ca05 (read_minibuf_unwind): Preserve Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 9001
diff changeset
534
8001
1a6bff2bc0e7 (read_minibuf_unwind): Run Qminibuffer_exit_hook here.
Richard M. Stallman <rms@gnu.org>
parents: 7952
diff changeset
535 /* 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
536 so run the hook. */
1a6bff2bc0e7 (read_minibuf_unwind): Run Qminibuffer_exit_hook here.
Richard M. Stallman <rms@gnu.org>
parents: 7952
diff changeset
537 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
538 && !NILP (Vrun_hooks))
13081
eb159c99326b (read_minibuf_unwind): Use safe_run_hooks.
Richard M. Stallman <rms@gnu.org>
parents: 12978
diff changeset
539 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
540
14667
3de266c52c9a (read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 14435
diff changeset
541 /* 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
542 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
543 minibuf_level--;
9049
522a9e03ca05 (read_minibuf_unwind): Preserve Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 9001
diff changeset
544
14667
3de266c52c9a (read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 14435
diff changeset
545 window = minibuf_window;
3de266c52c9a (read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 14435
diff changeset
546 /* To keep things predictable, in case it matters, let's be in the minibuffer
3de266c52c9a (read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 14435
diff changeset
547 when we reset the relevant variables. */
3de266c52c9a (read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 14435
diff changeset
548 Fset_buffer (XWINDOW (window)->buffer);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
549
14667
3de266c52c9a (read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 14435
diff changeset
550 /* 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
551 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
552 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
553 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
554 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
555 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
556 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
557 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
558 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
559 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
560 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
561 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
562 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
563 Voverriding_local_map = Fcar (minibuf_save_list);
0f6b7b33340a (read_minibuf): Save Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents: 10859
diff changeset
564 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
565 #if 0
2602c284eb11 (read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents: 16265
diff changeset
566 temp = Fcar (minibuf_save_list);
2602c284eb11 (read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents: 16265
diff changeset
567 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
568 minibuf_window = temp;
2602c284eb11 (read_minibuf_unwind): Don't restore minibuf_window;
Richard M. Stallman <rms@gnu.org>
parents: 16265
diff changeset
569 #endif
12631
ab75fc26058e (read_minibuf): Call choose_minibuffer_frame.
Richard M. Stallman <rms@gnu.org>
parents: 12164
diff changeset
570 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
571
3de266c52c9a (read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 14435
diff changeset
572 /* 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
573 {
3de266c52c9a (read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 14435
diff changeset
574 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
575 /* 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
576 specbind (Qinhibit_read_only, Qt);
3de266c52c9a (read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 14435
diff changeset
577 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
578 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
579 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
580 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
581 }
3de266c52c9a (read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 14435
diff changeset
582
3de266c52c9a (read_minibuf): Bind inhibit-read-only to t around clearing the minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 14435
diff changeset
583 /* 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
584 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
585 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
586 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
587
5b3bc7f24d51 (read_minibuf_unwind): Fix return type and return nil.
Andreas Schwab <schwab@suse.de>
parents: 20075
diff changeset
588 return Qnil;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
589 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
590
1010
b6a67ffc7536 * minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents: 967
diff changeset
591
b6a67ffc7536 * minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents: 967
diff changeset
592 /* This comment supplies the doc string for read-from-minibuffer,
b6a67ffc7536 * minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents: 967
diff changeset
593 for make-docfile to see. We cannot put this in the real DEFUN
b6a67ffc7536 * minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents: 967
diff changeset
594 due to limits in the Unix cpp.
b6a67ffc7536 * minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents: 967
diff changeset
595
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
596 DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 7, 0,
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
597 "Read a string from the minibuffer, prompting with string PROMPT.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
598 If optional second arg INITIAL-CONTENTS is non-nil, it is a string\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
599 to be inserted into the minibuffer before reading input.\n\
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
600 If INITIAL-CONTENTS is (STRING . POSITION), the initial input\n\
15835
73e83d35cd70 (Fread_from_minibuffer): Make position 0 in the initial
Richard M. Stallman <rms@gnu.org>
parents: 15389
diff changeset
601 is STRING, but point is placed at position POSITION in the minibuffer.\n\
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
602 Third arg KEYMAP is a keymap to use whilst reading;\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
603 if omitted or nil, the default is `minibuffer-local-map'.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
604 If fourth arg READ is non-nil, then interpret the result as a lisp object\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
605 and return that object:\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
606 in other words, do `(car (read-from-string INPUT-STRING))'\n\
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
607 Fifth arg HIST, if non-nil, specifies a history list\n\
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
608 and optionally the initial position in the list.\n\
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
609 It can be a symbol, which is the history list variable to use,\n\
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
610 or it can be a cons cell (HISTVAR . HISTPOS).\n\
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
611 In that case, HISTVAR is the history list variable to use,\n\
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
612 and HISTPOS is the initial position (the position in the list\n\
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
613 which INITIAL-CONTENTS corresponds to).\n\
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
614 Positions are counted starting from 1 at the beginning of the list.\n\
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
615 Sixth arg DEFAULT-VALUE is the default value. If non-nil, it is used\n\
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
616 for history commands, and as the value to return if the user enters\n\
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
617 the empty string.\n\
19672
fcc4578bfeeb (Fread_from_minibuffer, Fread_string): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19569
diff changeset
618 Seventh arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits\n\
fcc4578bfeeb (Fread_from_minibuffer, Fread_string): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19569
diff changeset
619 the current input method and the setting of enable-multibyte-characters.\n\
18444
825ff9e2e44e (read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents: 17805
diff changeset
620 If the variable `minibuffer-allow-text-properties is non-nil,\n\
825ff9e2e44e (read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents: 17805
diff changeset
621 then the string which is returned includes whatever text properties\n\
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
622 were present in the minibuffer. Otherwise the value has no text properties.")
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
623 (prompt, initial_contents, keymap, read, hist, default_value, inherit_input_method)
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
624 */
1010
b6a67ffc7536 * minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents: 967
diff changeset
625
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
626 DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 7, 0,
1010
b6a67ffc7536 * minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents: 967
diff changeset
627 0 /* See immediately above */)
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
628 (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
629 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
630 Lisp_Object inherit_input_method;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
631 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
632 int pos = 0;
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
633 Lisp_Object histvar, histpos, position, val;
17805
f1625c2d3db9 (Fread_from_minibuffer): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents: 17737
diff changeset
634 struct gcpro gcpro1;
f1625c2d3db9 (Fread_from_minibuffer): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents: 17737
diff changeset
635
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
636 position = Qnil;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
637
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
638 CHECK_STRING (prompt, 0);
5376
eb9c60c0cfe8 (read_from_minibuffer): Rename arg initial_input to initial_contents.
Richard M. Stallman <rms@gnu.org>
parents: 5369
diff changeset
639 if (!NILP (initial_contents))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
640 {
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
641 if (CONSP (initial_contents))
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
642 {
5376
eb9c60c0cfe8 (read_from_minibuffer): Rename arg initial_input to initial_contents.
Richard M. Stallman <rms@gnu.org>
parents: 5369
diff changeset
643 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
644 initial_contents = Fcar (initial_contents);
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
645 }
5376
eb9c60c0cfe8 (read_from_minibuffer): Rename arg initial_input to initial_contents.
Richard M. Stallman <rms@gnu.org>
parents: 5369
diff changeset
646 CHECK_STRING (initial_contents, 1);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
647 if (!NILP (position))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
648 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
649 CHECK_NUMBER (position, 0);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
650 /* 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
651 if (XINT (position) < 1)
73e83d35cd70 (Fread_from_minibuffer): Make position 0 in the initial
Richard M. Stallman <rms@gnu.org>
parents: 15389
diff changeset
652 /* 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
653 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
654 else
73e83d35cd70 (Fread_from_minibuffer): Make position 0 in the initial
Richard M. Stallman <rms@gnu.org>
parents: 15389
diff changeset
655 pos = XINT (position) - 1 - XSTRING (initial_contents)->size;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
656 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
657 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
658
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
659 if (NILP (keymap))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
660 keymap = Vminibuffer_local_map;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
661 else
18740
db49bcffa9b2 (Fread_from_minibuffer): Remove extra get_keymap argument.
Richard M. Stallman <rms@gnu.org>
parents: 18613
diff changeset
662 keymap = get_keymap (keymap);
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
663
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
664 if (SYMBOLP (hist))
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
665 {
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
666 histvar = hist;
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
667 histpos = Qnil;
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
668 }
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
669 else
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
670 {
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
671 histvar = Fcar_safe (hist);
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
672 histpos = Fcdr_safe (hist);
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
673 }
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
674 if (NILP (histvar))
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
675 histvar = Qminibuffer_history;
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
676 if (NILP (histpos))
9316
5f7cfbdef872 (read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents: 9183
diff changeset
677 XSETFASTINT (histpos, 0);
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
678
17805
f1625c2d3db9 (Fread_from_minibuffer): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents: 17737
diff changeset
679 GCPRO1 (default_value);
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
680 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
681 make_number (pos), !NILP (read),
18444
825ff9e2e44e (read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents: 17805
diff changeset
682 histvar, histpos, default_value,
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
683 minibuffer_allow_text_properties,
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
684 !NILP (inherit_input_method));
17805
f1625c2d3db9 (Fread_from_minibuffer): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents: 17737
diff changeset
685 UNGCPRO;
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
686 return val;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
687 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
688
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
689 DEFUN ("read-minibuffer", Fread_minibuffer, Sread_minibuffer, 1, 2, 0,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
690 "Return a Lisp object read using the minibuffer.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
691 Prompt with PROMPT. If non-nil, optional second arg INITIAL-CONTENTS\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
692 is a string to insert in the minibuffer before reading.")
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
693 (prompt, initial_contents)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
694 Lisp_Object prompt, initial_contents;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
695 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
696 CHECK_STRING (prompt, 0);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
697 if (!NILP (initial_contents))
3841
11500459af1d * minibuf.c (Fread_minibuffer): Add missing semicolon after
Jim Blandy <jimb@redhat.com>
parents: 3690
diff changeset
698 CHECK_STRING (initial_contents, 1);
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
699 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
700 prompt, Qnil, 1, Qminibuffer_history,
19417
d87f6112e034 (read_minibuf): New arg disable_multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 18904
diff changeset
701 make_number (0), Qnil, 0, 0);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
702 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
703
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
704 DEFUN ("eval-minibuffer", Feval_minibuffer, Seval_minibuffer, 1, 2, 0,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
705 "Return value of Lisp expression read using the minibuffer.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
706 Prompt with PROMPT. If non-nil, optional second arg INITIAL-CONTENTS\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
707 is a string to insert in the minibuffer before reading.")
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
708 (prompt, initial_contents)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
709 Lisp_Object prompt, initial_contents;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
710 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
711 return Feval (Fread_minibuffer (prompt, initial_contents));
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
712 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
713
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
714 /* Functions that use the minibuffer to read various things. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
715
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
716 DEFUN ("read-string", Fread_string, Sread_string, 1, 5, 0,
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
717 "Read a string from the minibuffer, prompting with string PROMPT.\n\
10591
5a049637599a (Fcall_interactively): Pass new arg to Fread_string.
Richard M. Stallman <rms@gnu.org>
parents: 10521
diff changeset
718 If non-nil, second arg INITIAL-INPUT is a string to insert before reading.\n\
5a049637599a (Fcall_interactively): Pass new arg to Fread_string.
Richard M. Stallman <rms@gnu.org>
parents: 10521
diff changeset
719 The third arg HISTORY, if non-nil, specifies a history list\n\
5a049637599a (Fcall_interactively): Pass new arg to Fread_string.
Richard M. Stallman <rms@gnu.org>
parents: 10521
diff changeset
720 and optionally the initial position in the list.\n\
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
721 See `read-from-minibuffer' for details of HISTORY argument.\n\
19672
fcc4578bfeeb (Fread_from_minibuffer, Fread_string): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19569
diff changeset
722 Fourth arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits\n\
fcc4578bfeeb (Fread_from_minibuffer, Fread_string): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19569
diff changeset
723 the current input method and the setting of enable-multibyte-characters.")
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
724 (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
725 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
726 Lisp_Object inherit_input_method;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
727 {
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
728 return Fread_from_minibuffer (prompt, initial_input, Qnil,
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
729 Qnil, history, default_value,
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
730 inherit_input_method);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
731 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
732
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
733 DEFUN ("read-no-blanks-input", Fread_no_blanks_input, Sread_no_blanks_input, 1, 3, 0,
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
734 "Args PROMPT and INIT, strings. Read a string from the terminal, not allowing blanks.\n\
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
735 Prompt with PROMPT, and provide INIT as an initial value of the input string.\n\
19672
fcc4578bfeeb (Fread_from_minibuffer, Fread_string): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19569
diff changeset
736 Third arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits\n\
fcc4578bfeeb (Fread_from_minibuffer, Fread_string): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19569
diff changeset
737 the current input method and the setting of enable-multibyte-characters.")
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
738 (prompt, init, inherit_input_method)
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
739 Lisp_Object prompt, init, inherit_input_method;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
740 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
741 CHECK_STRING (prompt, 0);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
742 if (! NILP (init))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
743 CHECK_STRING (init, 1);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
744
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
745 return read_minibuf (Vminibuffer_local_ns_map, init, prompt, Qnil,
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
746 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
747 !NILP (inherit_input_method));
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
748 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
749
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
750 DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0,
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
751 "Read the name of a command and return as a symbol.\n\
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
752 Prompts with PROMPT. By default, return DEFAULT-VALUE.")
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
753 (prompt, default_value)
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
754 Lisp_Object prompt, default_value;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
755 {
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
756 return Fintern (Fcompleting_read (prompt, Vobarray, Qcommandp, Qt,
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
757 Qnil, Qnil, default_value, Qnil),
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
758 Qnil);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
759 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
760
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
761 #ifdef NOTDEF
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
762 DEFUN ("read-function", Fread_function, Sread_function, 1, 1, 0,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
763 "One arg PROMPT, a string. Read the name of a function and return as a symbol.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
764 Prompts with PROMPT.")
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
765 (prompt)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
766 Lisp_Object prompt;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
767 {
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
768 return Fintern (Fcompleting_read (prompt, Vobarray, Qfboundp, Qt, Qnil, Qnil, Qnil, Qnil),
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
769 Qnil);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
770 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
771 #endif /* NOTDEF */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
772
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
773 DEFUN ("read-variable", Fread_variable, Sread_variable, 1, 2, 0,
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
774 "Read the name of a user variable and return it as a symbol.\n\
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
775 Prompts with PROMPT. By default, return DEFAULT-VALUE.\n\
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
776 A user variable is one whose documentation starts with a `*' character.")
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
777 (prompt, default_value)
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
778 Lisp_Object prompt, default_value;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
779 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
780 return Fintern (Fcompleting_read (prompt, Vobarray,
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
781 Quser_variable_p, Qt,
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
782 Qnil, Qnil, default_value, Qnil),
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
783 Qnil);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
784 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
785
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
786 DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 3, 0,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
787 "One arg PROMPT, a string. Read the name of a buffer and return as a string.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
788 Prompts with PROMPT.\n\
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
789 Optional second arg DEF is value to return if user enters an empty line.\n\
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
790 If optional third arg REQUIRE-MATCH is non-nil, only existing buffer names are allowed.")
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
791 (prompt, def, require_match)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
792 Lisp_Object prompt, def, require_match;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
793 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
794 Lisp_Object tem;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
795 Lisp_Object args[3];
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
796
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
797 if (BUFFERP (def))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
798 def = XBUFFER (def)->name;
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
799 if (!NILP (def))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
800 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
801 args[0] = build_string ("%s(default %s) ");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
802 args[1] = prompt;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
803 args[2] = def;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
804 prompt = Fformat (3, args);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
805 }
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
806 return Fcompleting_read (prompt, Vbuffer_alist, Qnil,
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
807 require_match, Qnil, Qnil, def, Qnil);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
808 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
809
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
810 DEFUN ("try-completion", Ftry_completion, Stry_completion, 2, 3, 0,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
811 "Return common substring of all completions of STRING in ALIST.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
812 Each car of each element of ALIST is tested to see if it begins with STRING.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
813 All that match are compared together; the longest initial sequence\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
814 common to all matches is returned as a string.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
815 If there is no match at all, nil is returned.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
816 For an exact match, t is returned.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
817 \n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
818 ALIST can be an obarray instead of an alist.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
819 Then the print names of all symbols in the obarray are the possible matches.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
820 \n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
821 ALIST can also be a function to do the completion itself.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
822 It receives three arguments: the values STRING, PREDICATE and nil.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
823 Whatever it returns becomes the value of `try-completion'.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
824 \n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
825 If optional third argument PREDICATE is non-nil,\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
826 it is used to test each possible match.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
827 The match is a candidate only if PREDICATE returns non-nil.\n\
10173
6a4f5fc9d3f9 (Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents: 10086
diff changeset
828 The argument given to PREDICATE is the alist element\n\
6a4f5fc9d3f9 (Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents: 10086
diff changeset
829 or the symbol from the obarray.")
14083
3ac9d27214e4 (Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 13775
diff changeset
830 (string, alist, predicate)
3ac9d27214e4 (Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 13775
diff changeset
831 Lisp_Object string, alist, predicate;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
832 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
833 Lisp_Object bestmatch, tail, elt, eltstring;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
834 int bestmatchsize;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
835 int compare, matchsize;
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
836 int list = CONSP (alist) || NILP (alist);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
837 int index, obsize;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
838 int matchcount = 0;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
839 Lisp_Object bucket, zero, end, tem;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
840 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
841
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
842 CHECK_STRING (string, 0);
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
843 if (!list && !VECTORP (alist))
14083
3ac9d27214e4 (Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 13775
diff changeset
844 return call3 (alist, string, predicate, Qnil);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
845
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
846 bestmatch = Qnil;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
847
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
848 /* If ALIST is not a list, set TAIL just for gc pro. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
849 tail = alist;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
850 if (! list)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
851 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
852 index = 0;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
853 obsize = XVECTOR (alist)->size;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
854 bucket = XVECTOR (alist)->contents[index];
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
855 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
856
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
857 while (1)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
858 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
859 /* Get the next element of the alist or obarray. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
860 /* Exit the loop if the elements are all used up. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
861 /* elt gets the alist element or symbol.
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
862 eltstring gets the name to check as a completion. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
863
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
864 if (list)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
865 {
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
866 if (NILP (tail))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
867 break;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
868 elt = Fcar (tail);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
869 eltstring = Fcar (elt);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
870 tail = Fcdr (tail);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
871 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
872 else
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
873 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
874 if (XFASTINT (bucket) != 0)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
875 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
876 elt = bucket;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
877 eltstring = Fsymbol_name (elt);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
878 if (XSYMBOL (bucket)->next)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
879 XSETSYMBOL (bucket, XSYMBOL (bucket)->next);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
880 else
9316
5f7cfbdef872 (read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents: 9183
diff changeset
881 XSETFASTINT (bucket, 0);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
882 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
883 else if (++index >= obsize)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
884 break;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
885 else
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
886 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
887 bucket = XVECTOR (alist)->contents[index];
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
888 continue;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
889 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
890 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
891
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
892 /* Is this element a possible completion? */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
893
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
894 if (STRINGP (eltstring)
6589
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
895 && XSTRING (string)->size <= XSTRING (eltstring)->size
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
896 && 0 > scmp (XSTRING (eltstring)->data, XSTRING (string)->data,
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
897 XSTRING (string)->size))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
898 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
899 /* Yes. */
6589
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
900 Lisp_Object regexps;
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
901 Lisp_Object zero;
9316
5f7cfbdef872 (read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents: 9183
diff changeset
902 XSETFASTINT (zero, 0);
6589
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
903
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
904 /* 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
905 for (regexps = Vcompletion_regexp_list; CONSP (regexps);
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
906 regexps = XCONS (regexps)->cdr)
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
907 {
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
908 tem = Fstring_match (XCONS (regexps)->car, eltstring, zero);
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
909 if (NILP (tem))
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
910 break;
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
911 }
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
912 if (CONSP (regexps))
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
913 continue;
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
914
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
915 /* Ignore this element if there is a predicate
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
916 and the predicate doesn't like it. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
917
14083
3ac9d27214e4 (Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 13775
diff changeset
918 if (!NILP (predicate))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
919 {
14083
3ac9d27214e4 (Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 13775
diff changeset
920 if (EQ (predicate, Qcommandp))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
921 tem = Fcommandp (elt);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
922 else
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
923 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
924 GCPRO4 (tail, string, eltstring, bestmatch);
14083
3ac9d27214e4 (Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 13775
diff changeset
925 tem = call1 (predicate, elt);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
926 UNGCPRO;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
927 }
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
928 if (NILP (tem)) continue;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
929 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
930
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
931 /* Update computation of how much all possible completions match */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
932
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
933 matchcount++;
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
934 if (NILP (bestmatch))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
935 bestmatch = eltstring, bestmatchsize = XSTRING (eltstring)->size;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
936 else
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
937 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
938 compare = min (bestmatchsize, XSTRING (eltstring)->size);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
939 matchsize = scmp (XSTRING (bestmatch)->data,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
940 XSTRING (eltstring)->data,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
941 compare);
330
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
942 if (matchsize < 0)
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
943 matchsize = compare;
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
944 if (completion_ignore_case)
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
945 {
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
946 /* If this is an exact match except for case,
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
947 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
948 exact match. This way, we get the case pattern
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
949 of the actual match. */
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
950 if ((matchsize == XSTRING (eltstring)->size
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
951 && matchsize < XSTRING (bestmatch)->size)
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
952 ||
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
953 /* If there is more than one exact match ignoring case,
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
954 and one of them is exact including case,
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
955 prefer that one. */
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
956 /* If there is no exact match ignoring case,
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
957 prefer a match that does not change the case
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
958 of the input. */
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
959 ((matchsize == XSTRING (eltstring)->size)
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
960 ==
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
961 (matchsize == XSTRING (bestmatch)->size)
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
962 && !bcmp (XSTRING (eltstring)->data,
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
963 XSTRING (string)->data, XSTRING (string)->size)
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
964 && bcmp (XSTRING (bestmatch)->data,
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
965 XSTRING (string)->data, XSTRING (string)->size)))
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
966 bestmatch = eltstring;
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
967 }
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
968 bestmatchsize = matchsize;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
969 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
970 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
971 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
972
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
973 if (NILP (bestmatch))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
974 return Qnil; /* No completions found */
330
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
975 /* If we are ignoring case, and there is no exact match,
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
976 and no additional text was supplied,
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
977 don't change the case of what the user typed. */
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
978 if (completion_ignore_case && bestmatchsize == XSTRING (string)->size
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
979 && XSTRING (bestmatch)->size > bestmatchsize)
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
980 return string;
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
981
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
982 /* 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
983 it does not require any change to be made. */
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
984 if (matchcount == 1 && bestmatchsize == XSTRING (string)->size
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
985 && !bcmp (XSTRING (bestmatch)->data, XSTRING (string)->data,
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
986 bestmatchsize))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
987 return Qt;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
988
9316
5f7cfbdef872 (read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents: 9183
diff changeset
989 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
990 XSETFASTINT (end, bestmatchsize); /* all completions agree */
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
991 return Fsubstring (bestmatch, zero, end);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
992 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
993
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
994 /* Compare exactly LEN chars of strings at S1 and S2,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
995 ignoring case if appropriate.
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
996 Return -1 if strings match,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
997 else number of chars that match at the beginning. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
998
9183
f49aca34b7ae (scmp): Use unsigned chars, to avoid confusing DOWNCASE.
Karl Heuer <kwzh@gnu.org>
parents: 9120
diff changeset
999 int
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1000 scmp (s1, s2, len)
9183
f49aca34b7ae (scmp): Use unsigned chars, to avoid confusing DOWNCASE.
Karl Heuer <kwzh@gnu.org>
parents: 9120
diff changeset
1001 register unsigned char *s1, *s2;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1002 int len;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1003 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1004 register int l = len;
17039
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1005 register unsigned char *start = s1;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1006
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1007 if (completion_ignore_case)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1008 {
18613
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18445
diff changeset
1009 while (l && DOWNCASE (*s1++) == DOWNCASE (*s2++))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1010 l--;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1011 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1012 else
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1013 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1014 while (l && *s1++ == *s2++)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1015 l--;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1016 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1017 if (l == 0)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1018 return -1;
9183
f49aca34b7ae (scmp): Use unsigned chars, to avoid confusing DOWNCASE.
Karl Heuer <kwzh@gnu.org>
parents: 9120
diff changeset
1019 else
17039
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1020 {
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1021 int match = len - l;
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1022
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1023 /* Now *--S1 is the unmatching byte. If it is in the middle of
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1024 multi-byte form, we must say that the multi-byte character
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1025 there doesn't match. */
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1026 while (match && *--s1 >= 0xA0) match--;
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1027 return match;
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1028 }
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1029 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1030
10173
6a4f5fc9d3f9 (Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents: 10086
diff changeset
1031 DEFUN ("all-completions", Fall_completions, Sall_completions, 2, 4, 0,
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1032 "Search for partial matches to STRING in ALIST.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1033 Each car of each element of ALIST is tested to see if it begins with STRING.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1034 The value is a list of all the strings from ALIST that match.\n\
10173
6a4f5fc9d3f9 (Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents: 10086
diff changeset
1035 \n\
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1036 ALIST can be an obarray instead of an alist.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1037 Then the print names of all symbols in the obarray are the possible matches.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1038 \n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1039 ALIST can also be a function to do the completion itself.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1040 It receives three arguments: the values STRING, PREDICATE and t.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1041 Whatever it returns becomes the value of `all-completion'.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1042 \n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1043 If optional third argument PREDICATE is non-nil,\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1044 it is used to test each possible match.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1045 The match is a candidate only if PREDICATE returns non-nil.\n\
10173
6a4f5fc9d3f9 (Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents: 10086
diff changeset
1046 The argument given to PREDICATE is the alist element\n\
6a4f5fc9d3f9 (Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents: 10086
diff changeset
1047 or the symbol from the obarray.\n\
6a4f5fc9d3f9 (Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents: 10086
diff changeset
1048 \n\
6a4f5fc9d3f9 (Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents: 10086
diff changeset
1049 If the optional fourth argument HIDE-SPACES is non-nil,\n\
6a4f5fc9d3f9 (Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents: 10086
diff changeset
1050 strings in ALIST that start with a space\n\
6a4f5fc9d3f9 (Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents: 10086
diff changeset
1051 are ignored unless STRING itself starts with a space.")
14083
3ac9d27214e4 (Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 13775
diff changeset
1052 (string, alist, predicate, hide_spaces)
3ac9d27214e4 (Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 13775
diff changeset
1053 Lisp_Object string, alist, predicate, hide_spaces;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1054 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1055 Lisp_Object tail, elt, eltstring;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1056 Lisp_Object allmatches;
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
1057 int list = CONSP (alist) || NILP (alist);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1058 int index, obsize;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1059 Lisp_Object bucket, tem;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1060 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1061
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1062 CHECK_STRING (string, 0);
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
1063 if (!list && !VECTORP (alist))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1064 {
14083
3ac9d27214e4 (Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 13775
diff changeset
1065 return call3 (alist, string, predicate, Qt);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1066 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1067 allmatches = Qnil;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1068
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1069 /* If ALIST is not a list, set TAIL just for gc pro. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1070 tail = alist;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1071 if (! list)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1072 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1073 index = 0;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1074 obsize = XVECTOR (alist)->size;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1075 bucket = XVECTOR (alist)->contents[index];
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1076 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1077
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1078 while (1)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1079 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1080 /* Get the next element of the alist or obarray. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1081 /* Exit the loop if the elements are all used up. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1082 /* elt gets the alist element or symbol.
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1083 eltstring gets the name to check as a completion. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1084
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1085 if (list)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1086 {
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
1087 if (NILP (tail))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1088 break;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1089 elt = Fcar (tail);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1090 eltstring = Fcar (elt);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1091 tail = Fcdr (tail);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1092 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1093 else
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1094 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1095 if (XFASTINT (bucket) != 0)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1096 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1097 elt = bucket;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1098 eltstring = Fsymbol_name (elt);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1099 if (XSYMBOL (bucket)->next)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1100 XSETSYMBOL (bucket, XSYMBOL (bucket)->next);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1101 else
9316
5f7cfbdef872 (read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents: 9183
diff changeset
1102 XSETFASTINT (bucket, 0);
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 else if (++index >= obsize)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1105 break;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1106 else
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1107 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1108 bucket = XVECTOR (alist)->contents[index];
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1109 continue;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1110 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1111 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1112
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1113 /* Is this element a possible completion? */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1114
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
1115 if (STRINGP (eltstring)
5369
409c8dd33f42 (Fall_completions): Allow completions that start with space
Richard M. Stallman <rms@gnu.org>
parents: 5238
diff changeset
1116 && XSTRING (string)->size <= XSTRING (eltstring)->size
10173
6a4f5fc9d3f9 (Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents: 10086
diff changeset
1117 /* 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
1118 unless the input starts with space. */
409c8dd33f42 (Fall_completions): Allow completions that start with space
Richard M. Stallman <rms@gnu.org>
parents: 5238
diff changeset
1119 && ((XSTRING (string)->size > 0 && XSTRING (string)->data[0] == ' ')
10173
6a4f5fc9d3f9 (Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents: 10086
diff changeset
1120 || XSTRING (eltstring)->data[0] != ' '
6a4f5fc9d3f9 (Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents: 10086
diff changeset
1121 || NILP (hide_spaces))
5369
409c8dd33f42 (Fall_completions): Allow completions that start with space
Richard M. Stallman <rms@gnu.org>
parents: 5238
diff changeset
1122 && 0 > scmp (XSTRING (eltstring)->data, XSTRING (string)->data,
409c8dd33f42 (Fall_completions): Allow completions that start with space
Richard M. Stallman <rms@gnu.org>
parents: 5238
diff changeset
1123 XSTRING (string)->size))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1124 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1125 /* Yes. */
6589
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
1126 Lisp_Object regexps;
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
1127 Lisp_Object zero;
9316
5f7cfbdef872 (read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents: 9183
diff changeset
1128 XSETFASTINT (zero, 0);
6589
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
1129
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
1130 /* 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
1131 for (regexps = Vcompletion_regexp_list; CONSP (regexps);
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
1132 regexps = XCONS (regexps)->cdr)
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
1133 {
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
1134 tem = Fstring_match (XCONS (regexps)->car, eltstring, zero);
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
1135 if (NILP (tem))
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
1136 break;
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
1137 }
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
1138 if (CONSP (regexps))
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
1139 continue;
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
1140
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1141 /* Ignore this element if there is a predicate
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1142 and the predicate doesn't like it. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1143
14083
3ac9d27214e4 (Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 13775
diff changeset
1144 if (!NILP (predicate))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1145 {
14083
3ac9d27214e4 (Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 13775
diff changeset
1146 if (EQ (predicate, Qcommandp))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1147 tem = Fcommandp (elt);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1148 else
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1149 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1150 GCPRO4 (tail, eltstring, allmatches, string);
14083
3ac9d27214e4 (Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 13775
diff changeset
1151 tem = call1 (predicate, elt);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1152 UNGCPRO;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1153 }
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
1154 if (NILP (tem)) continue;
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 /* Ok => put it on the list. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1157 allmatches = Fcons (eltstring, allmatches);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1158 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1159 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1160
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1161 return Fnreverse (allmatches);
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 Lisp_Object Vminibuffer_completion_table, Qminibuffer_completion_table;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1165 Lisp_Object Vminibuffer_completion_predicate, Qminibuffer_completion_predicate;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1166 Lisp_Object Vminibuffer_completion_confirm, Qminibuffer_completion_confirm;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1167
1010
b6a67ffc7536 * minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents: 967
diff changeset
1168 /* This comment supplies the doc string for completing-read,
b6a67ffc7536 * minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents: 967
diff changeset
1169 for make-docfile to see. We cannot put this in the real DEFUN
b6a67ffc7536 * minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents: 967
diff changeset
1170 due to limits in the Unix cpp.
b6a67ffc7536 * minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents: 967
diff changeset
1171
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
1172 DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 8, 0,
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1173 "Read a string in the minibuffer, with completion.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1174 PROMPT is a string to prompt with; normally it ends in a colon and a space.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1175 TABLE is an alist whose elements' cars are strings, or an obarray.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1176 PREDICATE limits completion to a subset of TABLE.\n\
9001
69f0ae06bcdf (Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8899
diff changeset
1177 See `try-completion' and `all-completions' for more details
69f0ae06bcdf (Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8899
diff changeset
1178 on completion, TABLE, and PREDICATE.\n\
8752
67b1905bc9a2 (Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8314
diff changeset
1179 \n\
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1180 If REQUIRE-MATCH is non-nil, the user is not allowed to exit unless\n\
8041
abe67e9e1bf0 (Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8001
diff changeset
1181 the input is (or completes to) an element of TABLE or is null.\n\
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1182 If it is also not t, Return does not exit if it does non-null completion.\n\
16237
4c9450bfc4db (Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 16211
diff changeset
1183 If the input is null, `completing-read' returns an empty string,\n\
8752
67b1905bc9a2 (Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8314
diff changeset
1184 regardless of the value of REQUIRE-MATCH.\n\
67b1905bc9a2 (Fcompleting_read): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8314
diff changeset
1185 \n\
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1186 If INITIAL-INPUT is non-nil, insert it in the minibuffer initially.\n\
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1187 If it is (STRING . POSITION), the initial input\n\
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1188 is STRING, but point is placed POSITION characters into the string.\n\
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1189 HIST, if non-nil, specifies a history list\n\
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1190 and optionally the initial position in the list.\n\
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1191 It can be a symbol, which is the history list variable to use,\n\
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1192 or it can be a cons cell (HISTVAR . HISTPOS).\n\
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1193 In that case, HISTVAR is the history list variable to use,\n\
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1194 and HISTPOS is the initial position (the position in the list\n\
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1195 which INITIAL-CONTENTS corresponds to).\n\
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1196 Positions are counted starting from 1 at the beginning of the list.\n\
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
1197 DEF, if non-nil, is the default value.\n\
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
1198 \n\
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
1199 If INHERIT-INPUT-METHOD is non-nil, the minibuffer inherits\n\
19672
fcc4578bfeeb (Fread_from_minibuffer, Fread_string): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19569
diff changeset
1200 the current input method and the setting of enable-multibyte-characters.\n\
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
1201 \n\
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1202 Completion ignores case if the ambient value of\n\
1010
b6a67ffc7536 * minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents: 967
diff changeset
1203 `completion-ignore-case' is non-nil."
b6a67ffc7536 * minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents: 967
diff changeset
1204 */
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
1205 DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 8, 0,
1010
b6a67ffc7536 * minibuf.c (Fread_from_minibuffer): Put this function's doc
Jim Blandy <jimb@redhat.com>
parents: 967
diff changeset
1206 0 /* See immediately above */)
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
1207 (prompt, table, predicate, require_match, init, hist, def, inherit_input_method)
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
1208 Lisp_Object prompt, table, predicate, require_match, init, hist, def;
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
1209 Lisp_Object inherit_input_method;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1210 {
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1211 Lisp_Object val, histvar, histpos, position;
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1212 int pos = 0;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1213 int count = specpdl_ptr - specpdl;
18862
2498c062473b (Fcompleting_read): gcpro def.
Richard M. Stallman <rms@gnu.org>
parents: 18740
diff changeset
1214 struct gcpro gcpro1;
19417
d87f6112e034 (read_minibuf): New arg disable_multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 18904
diff changeset
1215 int disable_multibyte = EQ (table, Qread_file_name_internal);
18862
2498c062473b (Fcompleting_read): gcpro def.
Richard M. Stallman <rms@gnu.org>
parents: 18740
diff changeset
1216
2498c062473b (Fcompleting_read): gcpro def.
Richard M. Stallman <rms@gnu.org>
parents: 18740
diff changeset
1217 GCPRO1 (def);
2498c062473b (Fcompleting_read): gcpro def.
Richard M. Stallman <rms@gnu.org>
parents: 18740
diff changeset
1218
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1219 specbind (Qminibuffer_completion_table, table);
14083
3ac9d27214e4 (Ftry_completion, Fall_completions, Fcompleting_read): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 13775
diff changeset
1220 specbind (Qminibuffer_completion_predicate, predicate);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1221 specbind (Qminibuffer_completion_confirm,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1222 EQ (require_match, Qt) ? Qnil : Qt);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1223 last_exact_completion = Qnil;
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1224
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1225 position = Qnil;
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1226 if (!NILP (init))
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1227 {
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
1228 if (CONSP (init))
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1229 {
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1230 position = Fcdr (init);
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1231 init = Fcar (init);
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1232 }
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1233 CHECK_STRING (init, 0);
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1234 if (!NILP (position))
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1235 {
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1236 CHECK_NUMBER (position, 0);
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1237 /* 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
1238 pos = XINT (position) - XSTRING (init)->size;
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1239 }
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1240 }
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1241
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
1242 if (SYMBOLP (hist))
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1243 {
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1244 histvar = hist;
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1245 histpos = Qnil;
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1246 }
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1247 else
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1248 {
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1249 histvar = Fcar_safe (hist);
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1250 histpos = Fcdr_safe (hist);
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1251 }
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1252 if (NILP (histvar))
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1253 histvar = Qminibuffer_history;
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1254 if (NILP (histpos))
9316
5f7cfbdef872 (read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents: 9183
diff changeset
1255 XSETFASTINT (histpos, 0);
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1256
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
1257 val = read_minibuf (NILP (require_match)
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1258 ? Vminibuffer_local_completion_map
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1259 : Vminibuffer_local_must_match_map,
866
ae5c412a32ec entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 864
diff changeset
1260 init, prompt, make_number (pos), 0,
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
1261 histvar, histpos, def, 0,
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
1262 !NILP (inherit_input_method));
18862
2498c062473b (Fcompleting_read): gcpro def.
Richard M. Stallman <rms@gnu.org>
parents: 18740
diff changeset
1263 RETURN_UNGCPRO (unbind_to (count, val));
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1264 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1265
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1266 Lisp_Object Fminibuffer_completion_help ();
330
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1267 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
1268 /* A subroutine of Fintern_soft. */
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1269 extern Lisp_Object oblookup ();
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1270
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1271
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1272 /* 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
1273 Lisp_Object
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1274 test_completion (txt)
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1275 Lisp_Object txt;
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1276 {
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1277 Lisp_Object tem;
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1278
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1279 if (CONSP (Vminibuffer_completion_table)
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1280 || NILP (Vminibuffer_completion_table))
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1281 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
1282 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
1283 {
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1284 /* 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
1285 tem = oblookup (Vminibuffer_completion_table,
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1286 XSTRING (txt)->data, XSTRING (txt)->size);
9460
9f5fef5890c9 (test_completion): Fix reversed condition.
Karl Heuer <kwzh@gnu.org>
parents: 9398
diff changeset
1287 if (!SYMBOLP (tem))
9398
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1288 return Qnil;
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1289 else if (!NILP (Vminibuffer_completion_predicate))
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1290 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
1291 else
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1292 return Qt;
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1293 }
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1294 else
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1295 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
1296 Vminibuffer_completion_predicate, Qlambda);
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1297 }
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1298
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1299 /* returns:
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1300 * 0 no possible completion
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1301 * 1 was already an exact and unique completion
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1302 * 3 was already an exact completion
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1303 * 4 completed to an exact completion
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1304 * 5 some completion happened
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1305 * 6 no completion happened
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1306 */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1307 int
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1308 do_completion ()
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1309 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1310 Lisp_Object completion, tem;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1311 int completedp;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1312 Lisp_Object last;
6689
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1313 struct gcpro gcpro1, gcpro2;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1314
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1315 completion = Ftry_completion (Fbuffer_string (), Vminibuffer_completion_table,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1316 Vminibuffer_completion_predicate);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1317 last = last_exact_completion;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1318 last_exact_completion = Qnil;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1319
7190
07c5d4989d9e (do_completion): Initialize vars before gcpro.
Karl Heuer <kwzh@gnu.org>
parents: 7105
diff changeset
1320 GCPRO2 (completion, last);
07c5d4989d9e (do_completion): Initialize vars before gcpro.
Karl Heuer <kwzh@gnu.org>
parents: 7105
diff changeset
1321
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
1322 if (NILP (completion))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1323 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1324 bitch_at_user ();
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1325 temp_echo_area_glyphs (" [No match]");
6689
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1326 UNGCPRO;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1327 return 0;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1328 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1329
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1330 if (EQ (completion, Qt)) /* exact and unique match */
6689
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1331 {
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1332 UNGCPRO;
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1333 return 1;
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1334 }
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1335
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1336 /* compiler bug */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1337 tem = Fstring_equal (completion, Fbuffer_string());
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
1338 if (completedp = NILP (tem))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1339 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1340 Ferase_buffer (); /* Some completion happened */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1341 Finsert (1, &completion);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1342 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1343
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1344 /* It did find a match. Do we match some possibility exactly now? */
9398
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1345 tem = test_completion (Fbuffer_string ());
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
1346 if (NILP (tem))
6689
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1347 {
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1348 /* not an exact match */
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1349 UNGCPRO;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1350 if (completedp)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1351 return 5;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1352 else if (auto_help)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1353 Fminibuffer_completion_help ();
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1354 else
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1355 temp_echo_area_glyphs (" [Next char not unique]");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1356 return 6;
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 if (completedp)
6689
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1359 {
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1360 UNGCPRO;
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1361 return 4;
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1362 }
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1363 /* If the last exact completion and this one were the same,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1364 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
1365 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
1366 last_exact_completion = completion;
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
1367 if (!NILP (last))
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 tem = Fbuffer_string ();
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
1370 if (!NILP (Fequal (tem, last)))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1371 Fminibuffer_completion_help ();
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1372 }
6689
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1373 UNGCPRO;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1374 return 3;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1375 }
6689
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1376
330
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1377 /* 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
1378
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1379 Lisp_Object
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1380 assoc_for_completion (key, list)
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1381 register Lisp_Object key;
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1382 Lisp_Object list;
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1383 {
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1384 register Lisp_Object tail;
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1385
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1386 if (completion_ignore_case)
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1387 key = Fupcase (key);
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1388
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
1389 for (tail = list; !NILP (tail); tail = Fcdr (tail))
330
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1390 {
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1391 register Lisp_Object elt, tem, thiscar;
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1392 elt = Fcar (tail);
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1393 if (!CONSP (elt)) continue;
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1394 thiscar = Fcar (elt);
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
1395 if (!STRINGP (thiscar))
330
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1396 continue;
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1397 if (completion_ignore_case)
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1398 thiscar = Fupcase (thiscar);
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1399 tem = Fequal (thiscar, key);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
1400 if (!NILP (tem)) return elt;
330
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1401 QUIT;
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1402 }
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1403 return Qnil;
9b1e9b496441 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 284
diff changeset
1404 }
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1405
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1406 DEFUN ("minibuffer-complete", Fminibuffer_complete, Sminibuffer_complete, 0, 0, "",
6234
46e46e523620 (Fminibuffer_complete, Fminibuffer_complete_word): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6233
diff changeset
1407 "Complete the minibuffer contents as far as possible.\n\
6544
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1408 Return nil if there is no valid completion, else t.\n\
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1409 If no characters can be completed, display a list of possible completions.\n\
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1410 If you repeat this command after it displayed such a list,\n\
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1411 scroll the window of possible completions.")
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1412 ()
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1413 {
6544
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1414 register int i;
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1415 Lisp_Object window, tem;
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1416
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1417 /* If the previous command was not this, then mark the completion
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1418 buffer obsolete. */
12164
f40837862599 (Fminibuffer_complete): Make last_command be kboard-local.
Karl Heuer <kwzh@gnu.org>
parents: 11346
diff changeset
1419 if (! EQ (current_kboard->Vlast_command, this_command))
6544
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1420 Vminibuf_scroll_window = Qnil;
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1421
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1422 window = Vminibuf_scroll_window;
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1423 /* 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
1424 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
1425 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
1426 && !NILP (XBUFFER (XWINDOW (window)->buffer)->name))
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1427 {
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1428 struct buffer *obuf = current_buffer;
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1429
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1430 Fset_buffer (XWINDOW (window)->buffer);
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1431 tem = Fpos_visible_in_window_p (make_number (ZV), window);
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1432 if (! NILP (tem))
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1433 /* 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
1434 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
1435 else
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1436 /* Else scroll down one screen. */
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1437 Fscroll_other_window (Qnil);
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1438
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1439 set_buffer_internal (obuf);
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1440 return Qnil;
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1441 }
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1442
a84c4990fa36 (read_minibuf): Return val via unbind_to.
Richard M. Stallman <rms@gnu.org>
parents: 6504
diff changeset
1443 i = do_completion ();
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1444 switch (i)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1445 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1446 case 0:
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1447 return Qnil;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1448
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1449 case 1:
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1450 temp_echo_area_glyphs (" [Sole completion]");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1451 break;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1452
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1453 case 3:
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1454 temp_echo_area_glyphs (" [Complete, but not unique]");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1455 break;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1456 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1457
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1458 return Qt;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1459 }
10086
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1460
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1461 /* 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
1462
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1463 /* 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
1464
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1465 Lisp_Object
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1466 complete_and_exit_1 ()
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1467 {
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1468 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
1469 }
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1470
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1471 /* 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
1472 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
1473
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1474 Lisp_Object
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1475 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
1476 Lisp_Object ignore;
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1477 {
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1478 return make_number (1);
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1479 }
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1480
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1481 DEFUN ("minibuffer-complete-and-exit", Fminibuffer_complete_and_exit,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1482 Sminibuffer_complete_and_exit, 0, 0, "",
9398
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1483 "If the minibuffer contents is a valid completion then exit.\n\
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1484 Otherwise try to complete it. If completion leads to a valid completion,\n\
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1485 a repetition of this command will exit.")
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1486 ()
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1487 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1488 register int i;
10086
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1489 Lisp_Object val;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1490
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1491 /* Allow user to specify null string */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1492 if (BEGV == ZV)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1493 goto exit;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1494
9398
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1495 if (!NILP (test_completion (Fbuffer_string ())))
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1496 goto exit;
a8e59db60df6 (test_completion): New function, extracted from do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9316
diff changeset
1497
10086
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1498 /* 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
1499 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
1500 complete_and_exit_2);
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1501
77b5eb8fc9e3 (Fminibuffer_complete_and_exit): Catch errors in do_completion.
Richard M. Stallman <rms@gnu.org>
parents: 9903
diff changeset
1502 i = XFASTINT (val);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1503 switch (i)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1504 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1505 case 1:
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1506 case 3:
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1507 goto exit;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1508
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1509 case 4:
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
1510 if (!NILP (Vminibuffer_completion_confirm))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1511 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1512 temp_echo_area_glyphs (" [Confirm]");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1513 return Qnil;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1514 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1515 else
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1516 goto exit;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1517
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1518 default:
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1519 return Qnil;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1520 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1521 exit:
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1522 Fthrow (Qexit, Qnil);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1523 /* NOTREACHED */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1524 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1525
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1526 DEFUN ("minibuffer-complete-word", Fminibuffer_complete_word, Sminibuffer_complete_word,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1527 0, 0, "",
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1528 "Complete the minibuffer contents at most a single word.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1529 After one word is completed as much as possible, a space or hyphen\n\
6234
46e46e523620 (Fminibuffer_complete, Fminibuffer_complete_word): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6233
diff changeset
1530 is added, provided that matches some possible completion.\n\
46e46e523620 (Fminibuffer_complete, Fminibuffer_complete_word): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6233
diff changeset
1531 Return nil if there is no valid completion, else t.")
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1532 ()
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1533 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1534 Lisp_Object completion, tem;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1535 register int i;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1536 register unsigned char *completion_string;
7672
c6d09116d66a (Fminibuffer_complete_word): GCPRO completion and tem.
Karl Heuer <kwzh@gnu.org>
parents: 7307
diff changeset
1537 struct gcpro gcpro1, gcpro2;
4824
eaf67474339b (Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents: 4775
diff changeset
1538
eaf67474339b (Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents: 4775
diff changeset
1539 /* 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
1540 hold onto a pointer to one of the strings thus made. */
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1541
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1542 completion = Ftry_completion (Fbuffer_string (),
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1543 Vminibuffer_completion_table,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1544 Vminibuffer_completion_predicate);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
1545 if (NILP (completion))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1546 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1547 bitch_at_user ();
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1548 temp_echo_area_glyphs (" [No match]");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1549 return Qnil;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1550 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1551 if (EQ (completion, Qt))
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1552 return Qnil;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1553
4824
eaf67474339b (Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents: 4775
diff changeset
1554 #if 0 /* How the below code used to look, for reference. */
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1555 tem = Fbuffer_string ();
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1556 b = XSTRING (tem)->data;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1557 i = ZV - 1 - XSTRING (completion)->size;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1558 p = XSTRING (completion)->data;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1559 if (i > 0 ||
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1560 0 <= scmp (b, p, ZV - 1))
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1561 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1562 i = 1;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1563 /* Set buffer to longest match of buffer tail and completion head. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1564 while (0 <= scmp (b + i, p, ZV - 1 - i))
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1565 i++;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1566 del_range (1, i + 1);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1567 SET_PT (ZV);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1568 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1569 #else /* Rewritten code */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1570 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1571 register unsigned char *buffer_string;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1572 int buffer_length, completion_length;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1573
15979
9c096f0805b0 (Fminibuffer_complete_word): Check for
Richard M. Stallman <rms@gnu.org>
parents: 15967
diff changeset
1574 CHECK_STRING (completion, 0);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1575 tem = Fbuffer_string ();
7672
c6d09116d66a (Fminibuffer_complete_word): GCPRO completion and tem.
Karl Heuer <kwzh@gnu.org>
parents: 7307
diff changeset
1576 GCPRO2 (completion, tem);
4641
9b8e20b21a66 (Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents: 4550
diff changeset
1577 /* If reading a file name,
9b8e20b21a66 (Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents: 4550
diff changeset
1578 expand any $ENVVAR refs in the buffer and in TEM. */
9b8e20b21a66 (Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents: 4550
diff changeset
1579 if (EQ (Vminibuffer_completion_table, Qread_file_name_internal))
9b8e20b21a66 (Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents: 4550
diff changeset
1580 {
9b8e20b21a66 (Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents: 4550
diff changeset
1581 Lisp_Object substituted;
9b8e20b21a66 (Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents: 4550
diff changeset
1582 substituted = Fsubstitute_in_file_name (tem);
9b8e20b21a66 (Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents: 4550
diff changeset
1583 if (! EQ (substituted, tem))
9b8e20b21a66 (Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents: 4550
diff changeset
1584 {
9b8e20b21a66 (Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents: 4550
diff changeset
1585 tem = substituted;
9b8e20b21a66 (Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents: 4550
diff changeset
1586 Ferase_buffer ();
4715
494fa3445d1e (Fminibuffer_complete_word): Pass new arg to insert_from_string*.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
1587 insert_from_string (tem, 0, XSTRING (tem)->size, 0);
4641
9b8e20b21a66 (Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents: 4550
diff changeset
1588 }
9b8e20b21a66 (Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents: 4550
diff changeset
1589 }
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1590 buffer_string = XSTRING (tem)->data;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1591 completion_string = XSTRING (completion)->data;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1592 buffer_length = XSTRING (tem)->size; /* ie ZV - BEGV */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1593 completion_length = XSTRING (completion)->size;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1594 i = buffer_length - completion_length;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1595 /* Mly: I don't understand what this is supposed to do AT ALL */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1596 if (i > 0 ||
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1597 0 <= scmp (buffer_string, completion_string, buffer_length))
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1598 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1599 /* Set buffer to longest match of buffer tail and completion head. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1600 if (i <= 0) i = 1;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1601 buffer_string += i;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1602 buffer_length -= i;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1603 while (0 <= scmp (buffer_string++, completion_string, buffer_length--))
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1604 i++;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1605 del_range (1, i + 1);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1606 SET_PT (ZV);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1607 }
7672
c6d09116d66a (Fminibuffer_complete_word): GCPRO completion and tem.
Karl Heuer <kwzh@gnu.org>
parents: 7307
diff changeset
1608 UNGCPRO;
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 #endif /* Rewritten code */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1611 i = ZV - BEGV;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1612
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1613 /* 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
1614 consider adding a space or a hyphen. */
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1615 if (i == XSTRING (completion)->size)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1616 {
4824
eaf67474339b (Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents: 4775
diff changeset
1617 GCPRO1 (completion);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1618 tem = Ftry_completion (concat2 (Fbuffer_string (), build_string (" ")),
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1619 Vminibuffer_completion_table,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1620 Vminibuffer_completion_predicate);
4824
eaf67474339b (Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents: 4775
diff changeset
1621 UNGCPRO;
eaf67474339b (Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents: 4775
diff changeset
1622
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
1623 if (STRINGP (tem))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1624 completion = tem;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1625 else
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1626 {
4824
eaf67474339b (Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents: 4775
diff changeset
1627 GCPRO1 (completion);
eaf67474339b (Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents: 4775
diff changeset
1628 tem =
eaf67474339b (Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents: 4775
diff changeset
1629 Ftry_completion (concat2 (Fbuffer_string (), build_string ("-")),
eaf67474339b (Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents: 4775
diff changeset
1630 Vminibuffer_completion_table,
eaf67474339b (Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents: 4775
diff changeset
1631 Vminibuffer_completion_predicate);
eaf67474339b (Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents: 4775
diff changeset
1632 UNGCPRO;
eaf67474339b (Fminibuffer_complete_word): GCPRO1 `completion' during calls to
Brian Fox <bfox@gnu.org>
parents: 4775
diff changeset
1633
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
1634 if (STRINGP (tem))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1635 completion = tem;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1636 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1637 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1638
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1639 /* Now find first word-break in the stuff found by completion.
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1640 i gets index in string of where to stop completing. */
17039
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1641 {
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1642 int len, c;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1643
17039
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1644 completion_string = XSTRING (completion)->data;
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1645 for (; i < XSTRING (completion)->size; i += len)
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1646 {
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1647 c = STRING_CHAR_AND_LENGTH (completion_string + i,
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1648 XSTRING (completion)->size - i,
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1649 len);
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1650 if (SYNTAX (c) != Sword)
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1651 {
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1652 i += len;
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1653 break;
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1654 }
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1655 }
b63ed55bed46 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16991
diff changeset
1656 }
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1657
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1658 /* If got no characters, print help for user. */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1659
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1660 if (i == ZV - BEGV)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1661 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1662 if (auto_help)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1663 Fminibuffer_completion_help ();
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1664 return Qnil;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1665 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1666
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1667 /* Otherwise insert in minibuffer the chars we got */
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1668
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1669 Ferase_buffer ();
4715
494fa3445d1e (Fminibuffer_complete_word): Pass new arg to insert_from_string*.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
1670 insert_from_string (completion, 0, i, 1);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1671 return Qt;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1672 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1673
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1674 DEFUN ("display-completion-list", Fdisplay_completion_list, Sdisplay_completion_list,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1675 1, 1, 0,
736
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1676 "Display the list of completions, COMPLETIONS, using `standard-output'.\n\
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1677 Each element may be just a symbol or string\n\
6161
4a1c5b2c005d (Fdisplay_completion_list): Restore original buffer
Richard M. Stallman <rms@gnu.org>
parents: 5376
diff changeset
1678 or may be a list of two strings to be printed as if concatenated.\n\
4a1c5b2c005d (Fdisplay_completion_list): Restore original buffer
Richard M. Stallman <rms@gnu.org>
parents: 5376
diff changeset
1679 `standard-output' must be a buffer.\n\
4a1c5b2c005d (Fdisplay_completion_list): Restore original buffer
Richard M. Stallman <rms@gnu.org>
parents: 5376
diff changeset
1680 At the end, run the normal hook `completion-setup-hook'.\n\
4a1c5b2c005d (Fdisplay_completion_list): Restore original buffer
Richard M. Stallman <rms@gnu.org>
parents: 5376
diff changeset
1681 It can find the completion buffer in `standard-output'.")
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1682 (completions)
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1683 Lisp_Object completions;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1684 {
12783
9e1a16d1ff73 (Fdisplay_completion_list): gcpro elt.
Richard M. Stallman <rms@gnu.org>
parents: 12631
diff changeset
1685 Lisp_Object tail, elt;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1686 register int i;
736
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1687 int column = 0;
12783
9e1a16d1ff73 (Fdisplay_completion_list): gcpro elt.
Richard M. Stallman <rms@gnu.org>
parents: 12631
diff changeset
1688 struct gcpro gcpro1, gcpro2;
8314
e0f95bf90681 (Fdisplay_completion_list): gcpro `completions'.
Richard M. Stallman <rms@gnu.org>
parents: 8041
diff changeset
1689 struct buffer *old = current_buffer;
9903
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1690 int first = 1;
8314
e0f95bf90681 (Fdisplay_completion_list): gcpro `completions'.
Richard M. Stallman <rms@gnu.org>
parents: 8041
diff changeset
1691
e0f95bf90681 (Fdisplay_completion_list): gcpro `completions'.
Richard M. Stallman <rms@gnu.org>
parents: 8041
diff changeset
1692 /* Note that (when it matters) every variable
12783
9e1a16d1ff73 (Fdisplay_completion_list): gcpro elt.
Richard M. Stallman <rms@gnu.org>
parents: 12631
diff changeset
1693 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
1694 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
1695 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
1696 elt = Qnil;
9e1a16d1ff73 (Fdisplay_completion_list): gcpro elt.
Richard M. Stallman <rms@gnu.org>
parents: 12631
diff changeset
1697 GCPRO2 (completions, elt);
8314
e0f95bf90681 (Fdisplay_completion_list): gcpro `completions'.
Richard M. Stallman <rms@gnu.org>
parents: 8041
diff changeset
1698
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
1699 if (BUFFERP (Vstandard_output))
736
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1700 set_buffer_internal (XBUFFER (Vstandard_output));
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1701
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
1702 if (NILP (completions))
4102
dba3acd9972c (Fdisplay_completion_list): Run completion-setup-hook.
Richard M. Stallman <rms@gnu.org>
parents: 3841
diff changeset
1703 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
1704 -1);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1705 else
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1706 {
736
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1707 write_string ("Possible completions are:", -1);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
1708 for (tail = completions, i = 0; !NILP (tail); tail = Fcdr (tail), i++)
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1709 {
9903
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1710 Lisp_Object tem;
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1711 int length;
12978
88a47d611c4a (Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents: 12783
diff changeset
1712 Lisp_Object startpos, endpos;
9903
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1713
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1714 elt = Fcar (tail);
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1715 /* Compute the length of this element. */
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1716 if (CONSP (elt))
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1717 {
17375
b3227e0446cf (scmp, Fdisplay_completion_list): Fix Lisp_Object/integer confusion.
Karl Heuer <kwzh@gnu.org>
parents: 17039
diff changeset
1718 tem = XCAR (elt);
9903
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1719 CHECK_STRING (tem, 0);
17375
b3227e0446cf (scmp, Fdisplay_completion_list): Fix Lisp_Object/integer confusion.
Karl Heuer <kwzh@gnu.org>
parents: 17039
diff changeset
1720 length = XSTRING (tem)->size;
9903
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1721
17375
b3227e0446cf (scmp, Fdisplay_completion_list): Fix Lisp_Object/integer confusion.
Karl Heuer <kwzh@gnu.org>
parents: 17039
diff changeset
1722 tem = Fcar (XCDR (elt));
9903
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1723 CHECK_STRING (tem, 0);
17375
b3227e0446cf (scmp, Fdisplay_completion_list): Fix Lisp_Object/integer confusion.
Karl Heuer <kwzh@gnu.org>
parents: 17039
diff changeset
1724 length += XSTRING (tem)->size;
9903
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1725 }
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1726 else
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1727 {
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1728 CHECK_STRING (elt, 0);
17375
b3227e0446cf (scmp, Fdisplay_completion_list): Fix Lisp_Object/integer confusion.
Karl Heuer <kwzh@gnu.org>
parents: 17039
diff changeset
1729 length = XSTRING (elt)->size;
9903
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1730 }
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1731
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1732 /* 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
1733 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
1734 until after the text has been made. */
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1735
12978
88a47d611c4a (Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents: 12783
diff changeset
1736 if (BUFFERP (Vstandard_output))
88a47d611c4a (Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents: 12783
diff changeset
1737 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
1738
9903
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1739 /* If the previous completion was very wide,
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1740 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
1741 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
1742 if (column > 33 || first
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1743 /* If this is really wide, don't put it second on a line. */
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1744 || column > 0 && length > 45)
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1745 {
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1746 Fterpri (Qnil);
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1747 column = 0;
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1748 }
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1749 /* Otherwise advance to column 35. */
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1750 else
736
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1751 {
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
1752 if (BUFFERP (Vstandard_output))
9903
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1753 {
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1754 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
1755
9903
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1756 column = XINT (tem);
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1757 }
736
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1758 else
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1759 {
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1760 do
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1761 {
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1762 write_string (" ", -1);
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1763 column++;
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1764 }
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1765 while (column < 35);
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1766 }
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1767 }
9903
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1768
12978
88a47d611c4a (Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents: 12783
diff changeset
1769 if (BUFFERP (Vstandard_output))
88a47d611c4a (Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents: 12783
diff changeset
1770 {
88a47d611c4a (Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents: 12783
diff changeset
1771 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
1772 Fset_text_properties (startpos, endpos,
88a47d611c4a (Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents: 12783
diff changeset
1773 Qnil, Vstandard_output);
88a47d611c4a (Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents: 12783
diff changeset
1774 }
88a47d611c4a (Fdisplay_completion_list): Clear all text properties
Richard M. Stallman <rms@gnu.org>
parents: 12783
diff changeset
1775
9903
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1776 /* Output this element and update COLUMN. */
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1777 if (CONSP (elt))
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1778 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1779 Fprinc (Fcar (elt), Qnil);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1780 Fprinc (Fcar (Fcdr (elt)), Qnil);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1781 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1782 else
9903
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1783 Fprinc (elt, Qnil);
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1784
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1785 column += length;
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1786
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1787 /* 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
1788 that takes account of character widths. */
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1789 if (BUFFERP (Vstandard_output))
736
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1790 {
9903
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1791 tem = Fcurrent_column ();
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1792 column = XINT (tem);
736
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1793 }
9903
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1794
133888d97e98 (Fdisplay_completion_list): Update COLUMN unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 9625
diff changeset
1795 first = 0;
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1796 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1797 }
736
18b892513cb7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 732
diff changeset
1798
8314
e0f95bf90681 (Fdisplay_completion_list): gcpro `completions'.
Richard M. Stallman <rms@gnu.org>
parents: 8041
diff changeset
1799 UNGCPRO;
e0f95bf90681 (Fdisplay_completion_list): gcpro `completions'.
Richard M. Stallman <rms@gnu.org>
parents: 8041
diff changeset
1800
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
1801 if (BUFFERP (Vstandard_output))
6161
4a1c5b2c005d (Fdisplay_completion_list): Restore original buffer
Richard M. Stallman <rms@gnu.org>
parents: 5376
diff changeset
1802 set_buffer_internal (old);
4a1c5b2c005d (Fdisplay_completion_list): Restore original buffer
Richard M. Stallman <rms@gnu.org>
parents: 5376
diff changeset
1803
4102
dba3acd9972c (Fdisplay_completion_list): Run completion-setup-hook.
Richard M. Stallman <rms@gnu.org>
parents: 3841
diff changeset
1804 if (!NILP (Vrun_hooks))
dba3acd9972c (Fdisplay_completion_list): Run completion-setup-hook.
Richard M. Stallman <rms@gnu.org>
parents: 3841
diff changeset
1805 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
1806
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1807 return Qnil;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1808 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1809
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1810 DEFUN ("minibuffer-completion-help", Fminibuffer_completion_help, Sminibuffer_completion_help,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1811 0, 0, "",
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1812 "Display a list of possible completions of the current minibuffer contents.")
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1813 ()
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1814 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1815 Lisp_Object completions;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1816
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1817 message ("Making completion list...");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1818 completions = Fall_completions (Fbuffer_string (),
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1819 Vminibuffer_completion_table,
10173
6a4f5fc9d3f9 (Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents: 10086
diff changeset
1820 Vminibuffer_completion_predicate,
6a4f5fc9d3f9 (Fall_completions): New arg hide_spaces.
Richard M. Stallman <rms@gnu.org>
parents: 10086
diff changeset
1821 Qt);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1822 echo_area_glyphs = 0;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1823
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 426
diff changeset
1824 if (NILP (completions))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1825 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1826 bitch_at_user ();
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1827 temp_echo_area_glyphs (" [No completions]");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1828 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1829 else
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1830 internal_with_output_to_temp_buffer ("*Completions*",
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1831 Fdisplay_completion_list,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1832 Fsort (completions, Qstring_lessp));
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1833 return Qnil;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1834 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1835
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1836 DEFUN ("self-insert-and-exit", Fself_insert_and_exit, Sself_insert_and_exit, 0, 0, "",
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1837 "Terminate minibuffer input.")
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1838 ()
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1839 {
9120
ed766dfb4efe (read_minibuf, Fread_from_minibuffer, Fread_buffer, Ftry_completion,
Karl Heuer <kwzh@gnu.org>
parents: 9049
diff changeset
1840 if (INTEGERP (last_command_char))
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1841 internal_self_insert (last_command_char, 0);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1842 else
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1843 bitch_at_user ();
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1844
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1845 Fthrow (Qexit, Qnil);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1846 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1847
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1848 DEFUN ("exit-minibuffer", Fexit_minibuffer, Sexit_minibuffer, 0, 0, "",
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1849 "Terminate this minibuffer argument.")
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1850 ()
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1851 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1852 Fthrow (Qexit, Qnil);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1853 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1854
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1855 DEFUN ("minibuffer-depth", Fminibuffer_depth, Sminibuffer_depth, 0, 0, 0,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1856 "Return current depth of activations of minibuffer, a nonnegative integer.")
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1857 ()
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1858 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1859 return make_number (minibuf_level);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1860 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1861
6590
2c66255e9469 (Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents: 6589
diff changeset
1862 DEFUN ("minibuffer-prompt", Fminibuffer_prompt, Sminibuffer_prompt, 0, 0, 0,
2c66255e9469 (Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents: 6589
diff changeset
1863 "Return the prompt string of the currently-active minibuffer.\n\
2c66255e9469 (Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents: 6589
diff changeset
1864 If no minibuffer is active, return nil.")
2c66255e9469 (Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents: 6589
diff changeset
1865 ()
2c66255e9469 (Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents: 6589
diff changeset
1866 {
7952
9e2e0fdd1710 (minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents: 7836
diff changeset
1867 return Fcopy_sequence (minibuf_prompt);
6590
2c66255e9469 (Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents: 6589
diff changeset
1868 }
2c66255e9469 (Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents: 6589
diff changeset
1869
2c66255e9469 (Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents: 6589
diff changeset
1870 DEFUN ("minibuffer-prompt-width", Fminibuffer_prompt_width,
2c66255e9469 (Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents: 6589
diff changeset
1871 Sminibuffer_prompt_width, 0, 0, 0,
6720
9ecffdca3b7a (Fminibuffer_prompt_width): Undo previous change for negative values.
Karl Heuer <kwzh@gnu.org>
parents: 6702
diff changeset
1872 "Return the display width of the minibuffer prompt.")
6590
2c66255e9469 (Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents: 6589
diff changeset
1873 ()
2c66255e9469 (Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents: 6589
diff changeset
1874 {
2c66255e9469 (Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents: 6589
diff changeset
1875 Lisp_Object width;
9316
5f7cfbdef872 (read_minibuf, get_minibuffer, read_minibuf_unwind, Fread_from_minibuffer,
Karl Heuer <kwzh@gnu.org>
parents: 9183
diff changeset
1876 XSETFASTINT (width, minibuf_prompt_width);
6590
2c66255e9469 (Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents: 6589
diff changeset
1877 return width;
2c66255e9469 (Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents: 6589
diff changeset
1878 }
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1879
16991
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1880 /* 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
1881 minibuffer contents. This is used to display things like
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1882 "[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
1883 that has no possible completions, and other quick, unobtrusive
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1884 messages. */
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1885
20302
5b3bc7f24d51 (read_minibuf_unwind): Fix return type and return nil.
Andreas Schwab <schwab@suse.de>
parents: 20075
diff changeset
1886 void
16991
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1887 temp_echo_area_glyphs (m)
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1888 char *m;
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1889 {
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1890 int osize = ZV;
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1891 int opoint = PT;
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1892 Lisp_Object oinhibit;
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1893 oinhibit = Vinhibit_quit;
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1894
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1895 /* 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
1896 message (0);
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1897
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1898 SET_PT (osize);
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1899 insert_string (m);
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1900 SET_PT (opoint);
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1901 Vinhibit_quit = Qt;
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1902 Fsit_for (make_number (2), Qnil, Qnil);
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1903 del_range (osize, ZV);
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1904 SET_PT (opoint);
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1905 if (!NILP (Vquit_flag))
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1906 {
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1907 Vquit_flag = Qnil;
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1908 Vunread_command_events = Fcons (make_number (quit_char), Qnil);
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1909 }
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1910 Vinhibit_quit = oinhibit;
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1911 }
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1912
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1913 DEFUN ("minibuffer-message", Fminibuffer_message, Sminibuffer_message,
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1914 1, 1, 0,
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1915 "Temporarily display STRING at the end of the minibuffer.\n\
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1916 The text is displayed for two seconds,\n\
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1917 or until the next input event arrives, whichever comes first.")
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1918 (string)
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1919 Lisp_Object string;
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1920 {
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1921 temp_echo_area_glyphs (XSTRING (string)->data);
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1922 return Qnil;
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1923 }
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
1924
20302
5b3bc7f24d51 (read_minibuf_unwind): Fix return type and return nil.
Andreas Schwab <schwab@suse.de>
parents: 20075
diff changeset
1925 void
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1926 init_minibuf_once ()
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1927 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1928 Vminibuffer_list = Qnil;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1929 staticpro (&Vminibuffer_list);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1930 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1931
20302
5b3bc7f24d51 (read_minibuf_unwind): Fix return type and return nil.
Andreas Schwab <schwab@suse.de>
parents: 20075
diff changeset
1932 void
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1933 syms_of_minibuf ()
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1934 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1935 minibuf_level = 0;
7952
9e2e0fdd1710 (minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents: 7836
diff changeset
1936 minibuf_prompt = Qnil;
9e2e0fdd1710 (minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents: 7836
diff changeset
1937 staticpro (&minibuf_prompt);
9e2e0fdd1710 (minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents: 7836
diff changeset
1938
9e2e0fdd1710 (minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents: 7836
diff changeset
1939 minibuf_save_list = Qnil;
9e2e0fdd1710 (minibuf_save_list): New variable, replaces minibuf_save_vector.
Karl Heuer <kwzh@gnu.org>
parents: 7836
diff changeset
1940 staticpro (&minibuf_save_list);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1941
4641
9b8e20b21a66 (Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents: 4550
diff changeset
1942 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
1943 staticpro (&Qread_file_name_internal);
9b8e20b21a66 (Qread_file_name_internal): New var.
Richard M. Stallman <rms@gnu.org>
parents: 4550
diff changeset
1944
17737
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
1945 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
1946 staticpro (&Qminibuffer_default);
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
1947 Fset (Qminibuffer_default, Qnil);
f79f2d6b119b (Fread_command): New optional arg DEFAULT-VALUE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17387
diff changeset
1948
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1949 Qminibuffer_completion_table = intern ("minibuffer-completion-table");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1950 staticpro (&Qminibuffer_completion_table);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1951
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1952 Qminibuffer_completion_confirm = intern ("minibuffer-completion-confirm");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1953 staticpro (&Qminibuffer_completion_confirm);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1954
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1955 Qminibuffer_completion_predicate = intern ("minibuffer-completion-predicate");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1956 staticpro (&Qminibuffer_completion_predicate);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1957
6689
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1958 staticpro (&last_exact_completion);
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1959 last_exact_completion = Qnil;
2efd8c4eb9be (do_completion): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents: 6590
diff changeset
1960
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1961 staticpro (&last_minibuf_string);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1962 last_minibuf_string = Qnil;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1963
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1964 Quser_variable_p = intern ("user-variable-p");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1965 staticpro (&Quser_variable_p);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1966
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1967 Qminibuffer_history = intern ("minibuffer-history");
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
1968 staticpro (&Qminibuffer_history);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1969
4550
f189820e7ea7 (Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 4102
diff changeset
1970 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
1971 staticpro (&Qminibuffer_setup_hook);
f189820e7ea7 (Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 4102
diff changeset
1972
6742
ef62a96ce830 (Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 6720
diff changeset
1973 Qminibuffer_exit_hook = intern ("minibuffer-exit-hook");
ef62a96ce830 (Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 6720
diff changeset
1974 staticpro (&Qminibuffer_exit_hook);
ef62a96ce830 (Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 6720
diff changeset
1975
15967
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
1976 Qhistory_length = intern ("history-length");
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
1977 staticpro (&Qhistory_length);
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
1978
19545
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
1979 Qcurrent_input_method = intern ("current-input-method");
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
1980 staticpro (&Qcurrent_input_method);
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
1981
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
1982 Qactivate_input_method = intern ("activate-input-method");
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
1983 staticpro (&Qactivate_input_method);
a7f1c1acde93 (Qcurrent_input_method, Qactivate_input_method): New
Kenichi Handa <handa@m17n.org>
parents: 19417
diff changeset
1984
4550
f189820e7ea7 (Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 4102
diff changeset
1985 DEFVAR_LISP ("minibuffer-setup-hook", &Vminibuffer_setup_hook,
f189820e7ea7 (Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 4102
diff changeset
1986 "Normal hook run just after entry to minibuffer.");
f189820e7ea7 (Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 4102
diff changeset
1987 Vminibuffer_setup_hook = Qnil;
f189820e7ea7 (Qminibuffer_setup_hook, Vminibuffer_setup_hook): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 4102
diff changeset
1988
6742
ef62a96ce830 (Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 6720
diff changeset
1989 DEFVAR_LISP ("minibuffer-exit-hook", &Vminibuffer_exit_hook,
ef62a96ce830 (Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 6720
diff changeset
1990 "Normal hook run just after exit from minibuffer.");
ef62a96ce830 (Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 6720
diff changeset
1991 Vminibuffer_exit_hook = Qnil;
ef62a96ce830 (Vminibuffer_exit_hook): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 6720
diff changeset
1992
15967
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
1993 DEFVAR_LISP ("history-length", &Vhistory_length,
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
1994 "*Maximum length for history lists before truncation takes place.\n\
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
1995 A number means that length; t means infinite. Truncation takes place\n\
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
1996 just after a new element is inserted. Setting the history-length\n\
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
1997 property of a history variable overrides this default.");
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
1998 XSETFASTINT (Vhistory_length, 30);
b791ab74ff30 (Vhistory_length, Qhistory_length): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 15835
diff changeset
1999
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2000 DEFVAR_BOOL ("completion-auto-help", &auto_help,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2001 "*Non-nil means automatically provide help for invalid completion input.");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2002 auto_help = 1;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2003
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2004 DEFVAR_BOOL ("completion-ignore-case", &completion_ignore_case,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2005 "Non-nil means don't consider case significant in completion.");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2006 completion_ignore_case = 0;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2007
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2008 DEFVAR_BOOL ("enable-recursive-minibuffers", &enable_recursive_minibuffers,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2009 "*Non-nil means to allow minibuffer commands while in the minibuffer.\n\
19902
fa9889643596 (syms_of_minibuf): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 19728
diff changeset
2010 This variable makes a difference whenever the minibuffer window is active.");
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2011 enable_recursive_minibuffers = 0;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2012
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2013 DEFVAR_LISP ("minibuffer-completion-table", &Vminibuffer_completion_table,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2014 "Alist or obarray used for completion in the minibuffer.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2015 This becomes the ALIST argument to `try-completion' and `all-completion'.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2016 \n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2017 The value may alternatively be a function, which is given three arguments:\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2018 STRING, the current buffer contents;\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2019 PREDICATE, the predicate for filtering possible matches;\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2020 CODE, which says what kind of things to do.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2021 CODE can be nil, t or `lambda'.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2022 nil means to return the best completion of STRING, or nil if there is none.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2023 t means to return a list of all possible completions of STRING.\n\
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2024 `lambda' means to return t if STRING is a valid completion as it stands.");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2025 Vminibuffer_completion_table = Qnil;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2026
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2027 DEFVAR_LISP ("minibuffer-completion-predicate", &Vminibuffer_completion_predicate,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2028 "Within call to `completing-read', this holds the PREDICATE argument.");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2029 Vminibuffer_completion_predicate = Qnil;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2030
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2031 DEFVAR_LISP ("minibuffer-completion-confirm", &Vminibuffer_completion_confirm,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2032 "Non-nil => demand confirmation of completion before exiting minibuffer.");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2033 Vminibuffer_completion_confirm = Qnil;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2034
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2035 DEFVAR_LISP ("minibuffer-help-form", &Vminibuffer_help_form,
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2036 "Value that `help-form' takes on inside the minibuffer.");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2037 Vminibuffer_help_form = Qnil;
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2038
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
2039 DEFVAR_LISP ("minibuffer-history-variable", &Vminibuffer_history_variable,
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
2040 "History list symbol to add minibuffer values to.\n\
13286
b4d36420c837 (syms_of_minibuf): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13162
diff changeset
2041 Each string of minibuffer input, as it appears on exit from the minibuffer,\n\
b4d36420c837 (syms_of_minibuf): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13162
diff changeset
2042 is added with\n\
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
2043 (set minibuffer-history-variable\n\
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
2044 (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
2045 XSETFASTINT (Vminibuffer_history_variable, 0);
864
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
2046
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
2047 DEFVAR_LISP ("minibuffer-history-position", &Vminibuffer_history_position,
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
2048 "Current position of redoing in the history list.");
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
2049 Vminibuffer_history_position = Qnil;
fe5f6b7c9727 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 765
diff changeset
2050
5238
63932e111cc5 (minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents: 5069
diff changeset
2051 DEFVAR_BOOL ("minibuffer-auto-raise", &minibuffer_auto_raise,
16640
48c81df37765 (syms_of_minibuf): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 16564
diff changeset
2052 "*Non-nil means entering the minibuffer raises the minibuffer's frame.\n\
48c81df37765 (syms_of_minibuf): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 16564
diff changeset
2053 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
2054 minibuffer_auto_raise = 0;
63932e111cc5 (minibuffer_auto_raise): Really define it.
Richard M. Stallman <rms@gnu.org>
parents: 5069
diff changeset
2055
6589
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
2056 DEFVAR_LISP ("completion-regexp-list", &Vcompletion_regexp_list,
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
2057 "List of regexps that should restrict possible completions.");
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
2058 Vcompletion_regexp_list = Qnil;
764913e8463c (Vcompletion_regexp_list): New var.
Richard M. Stallman <rms@gnu.org>
parents: 6544
diff changeset
2059
18444
825ff9e2e44e (read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents: 17805
diff changeset
2060 DEFVAR_BOOL ("minibuffer-allow-text-properties",
825ff9e2e44e (read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents: 17805
diff changeset
2061 &minibuffer_allow_text_properties,
825ff9e2e44e (read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents: 17805
diff changeset
2062 "Non-nil means `read-from-miniffer' should not discard text properties.\n\
825ff9e2e44e (read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents: 17805
diff changeset
2063 This also affects `read-string', but it does not affect `read-minibuffer',\n\
825ff9e2e44e (read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents: 17805
diff changeset
2064 `read-no-blanks-input', or any of the functions that do minibuffer input\n\
18445
2b1d3330e750 Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18444
diff changeset
2065 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
2066 minibuffer_allow_text_properties = 0;
825ff9e2e44e (read_minibuf): New arg allow_props.
Richard M. Stallman <rms@gnu.org>
parents: 17805
diff changeset
2067
14435
4f2ec5d39f00 (Fset_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
2068 defsubr (&Sset_minibuffer_window);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2069 defsubr (&Sread_from_minibuffer);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2070 defsubr (&Seval_minibuffer);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2071 defsubr (&Sread_minibuffer);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2072 defsubr (&Sread_string);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2073 defsubr (&Sread_command);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2074 defsubr (&Sread_variable);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2075 defsubr (&Sread_buffer);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2076 defsubr (&Sread_no_blanks_input);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2077 defsubr (&Sminibuffer_depth);
6590
2c66255e9469 (Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents: 6589
diff changeset
2078 defsubr (&Sminibuffer_prompt);
2c66255e9469 (Fminibuffer_prompt, Fminibuffer_prompt_width): New funcs.
Karl Heuer <kwzh@gnu.org>
parents: 6589
diff changeset
2079 defsubr (&Sminibuffer_prompt_width);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2080
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2081 defsubr (&Stry_completion);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2082 defsubr (&Sall_completions);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2083 defsubr (&Scompleting_read);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2084 defsubr (&Sminibuffer_complete);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2085 defsubr (&Sminibuffer_complete_word);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2086 defsubr (&Sminibuffer_complete_and_exit);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2087 defsubr (&Sdisplay_completion_list);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2088 defsubr (&Sminibuffer_completion_help);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2089
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2090 defsubr (&Sself_insert_and_exit);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2091 defsubr (&Sexit_minibuffer);
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2092
16991
b33fd17a2873 (Fminibuffer_message): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16640
diff changeset
2093 defsubr (&Sminibuffer_message);
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2094 }
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2095
20302
5b3bc7f24d51 (read_minibuf_unwind): Fix return type and return nil.
Andreas Schwab <schwab@suse.de>
parents: 20075
diff changeset
2096 void
284
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2097 keys_of_minibuf ()
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2098 {
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2099 initial_define_key (Vminibuffer_local_map, Ctl ('g'),
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2100 "abort-recursive-edit");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2101 initial_define_key (Vminibuffer_local_map, Ctl ('m'),
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2102 "exit-minibuffer");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2103 initial_define_key (Vminibuffer_local_map, Ctl ('j'),
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2104 "exit-minibuffer");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2105
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2106 initial_define_key (Vminibuffer_local_ns_map, Ctl ('g'),
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2107 "abort-recursive-edit");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2108 initial_define_key (Vminibuffer_local_ns_map, Ctl ('m'),
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2109 "exit-minibuffer");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2110 initial_define_key (Vminibuffer_local_ns_map, Ctl ('j'),
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2111 "exit-minibuffer");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2112
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2113 initial_define_key (Vminibuffer_local_ns_map, ' ',
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2114 "exit-minibuffer");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2115 initial_define_key (Vminibuffer_local_ns_map, '\t',
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2116 "exit-minibuffer");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2117 initial_define_key (Vminibuffer_local_ns_map, '?',
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2118 "self-insert-and-exit");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2119
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2120 initial_define_key (Vminibuffer_local_completion_map, Ctl ('g'),
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2121 "abort-recursive-edit");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2122 initial_define_key (Vminibuffer_local_completion_map, Ctl ('m'),
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2123 "exit-minibuffer");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2124 initial_define_key (Vminibuffer_local_completion_map, Ctl ('j'),
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2125 "exit-minibuffer");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2126
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2127 initial_define_key (Vminibuffer_local_completion_map, '\t',
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2128 "minibuffer-complete");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2129 initial_define_key (Vminibuffer_local_completion_map, ' ',
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2130 "minibuffer-complete-word");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2131 initial_define_key (Vminibuffer_local_completion_map, '?',
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2132 "minibuffer-completion-help");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2133
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2134 initial_define_key (Vminibuffer_local_must_match_map, Ctl ('g'),
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2135 "abort-recursive-edit");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2136 initial_define_key (Vminibuffer_local_must_match_map, Ctl ('m'),
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2137 "minibuffer-complete-and-exit");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2138 initial_define_key (Vminibuffer_local_must_match_map, Ctl ('j'),
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2139 "minibuffer-complete-and-exit");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2140 initial_define_key (Vminibuffer_local_must_match_map, '\t',
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2141 "minibuffer-complete");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2142 initial_define_key (Vminibuffer_local_must_match_map, ' ',
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2143 "minibuffer-complete-word");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2144 initial_define_key (Vminibuffer_local_must_match_map, '?',
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2145 "minibuffer-completion-help");
03e467a3d92a Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2146 }