annotate src/minibuf.c @ 17604:77b137e2d9a7

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