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