Mercurial > emacs
annotate src/callint.c @ 87347:5d0236f8335b
(rng-nxml-easy-menu): Remove nxml-version.
author | Jason Rumney <jasonr@gnu.org> |
---|---|
date | Thu, 20 Dec 2007 15:18:48 +0000 |
parents | 803a3c8107e8 |
children | cdd30283527d bdb3fe0ba9fa |
rev | line source |
---|---|
407 | 1 /* Call a Lisp function interactively. |
75227
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
74912
diff
changeset
|
2 Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 2000, 2001, 2002, |
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
74912
diff
changeset
|
3 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. |
407 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
78260
922696f363b0
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
75227
diff
changeset
|
9 the Free Software Foundation; either version 3, or (at your option) |
407 | 10 any later version. |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
64084 | 19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
20 Boston, MA 02110-1301, USA. */ | |
407 | 21 |
22 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4046
diff
changeset
|
23 #include <config.h> |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
24 |
407 | 25 #include "lisp.h" |
26 #include "buffer.h" | |
27 #include "commands.h" | |
516 | 28 #include "keyboard.h" |
407 | 29 #include "window.h" |
39697
0b986bb45526
Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34799
diff
changeset
|
30 #include "keymap.h" |
407 | 31 |
31336 | 32 #ifdef HAVE_INDEX |
33 extern char *index P_ ((const char *, int)); | |
31225
7930c46bb365
(toplevel) [HAVE_STRING_H]: Include string.h.
Gerd Moellmann <gerd@gnu.org>
parents:
29371
diff
changeset
|
34 #endif |
407 | 35 |
16363
4097c59143f8
(Fcall_interactively): Bind cursor-in-echo-area to t for `k' and `K'.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
36 extern Lisp_Object Qcursor_in_echo_area; |
45546
ce01a38706ee
(Fcall_interactively) <"D">: Supply Qfile_directory_p
Kim F. Storm <storm@cua.dk>
parents:
45394
diff
changeset
|
37 extern Lisp_Object Qfile_directory_p; |
16363
4097c59143f8
(Fcall_interactively): Bind cursor-in-echo-area to t for `k' and `K'.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
38 |
12117
3fa5b6e7ad4b
(current_prefix_partial): Deleted.
Karl Heuer <kwzh@gnu.org>
parents:
11911
diff
changeset
|
39 Lisp_Object Vcurrent_prefix_arg, Qminus, Qplus; |
407 | 40 Lisp_Object Qcall_interactively; |
41 Lisp_Object Vcommand_history; | |
42 | |
21721
46ffb5302c40
(Fcall_interactively): Truncate command-history here.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
43 extern Lisp_Object Vhistory_length; |
52374
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
44 extern Lisp_Object Vthis_original_command, real_this_command; |
21721
46ffb5302c40
(Fcall_interactively): Truncate command-history here.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
45 |
407 | 46 Lisp_Object Vcommand_debug_status, Qcommand_debug_status; |
873 | 47 Lisp_Object Qenable_recursive_minibuffers; |
407 | 48 |
3975
718280a1ba74
(Vmark_even_if_inactive): New var, with Lisp variable.
Richard M. Stallman <rms@gnu.org>
parents:
2048
diff
changeset
|
49 /* Non-nil means treat the mark as active |
718280a1ba74
(Vmark_even_if_inactive): New var, with Lisp variable.
Richard M. Stallman <rms@gnu.org>
parents:
2048
diff
changeset
|
50 even if mark_active is 0. */ |
718280a1ba74
(Vmark_even_if_inactive): New var, with Lisp variable.
Richard M. Stallman <rms@gnu.org>
parents:
2048
diff
changeset
|
51 Lisp_Object Vmark_even_if_inactive; |
718280a1ba74
(Vmark_even_if_inactive): New var, with Lisp variable.
Richard M. Stallman <rms@gnu.org>
parents:
2048
diff
changeset
|
52 |
10279
89cf458ed188
(Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
9342
diff
changeset
|
53 Lisp_Object Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook; |
89cf458ed188
(Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
9342
diff
changeset
|
54 |
49932
2f5cdffaaa04
(fix_command): New subroutine, from Fcall_interactively.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
55 Lisp_Object Qlist, Qlet, Qletx, Qsave_excursion, Qprogn, Qif, Qwhen; |
10803
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
56 static Lisp_Object preserved_fns; |
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
57 |
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
58 /* Marker used within call-interactively to refer to point. */ |
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
59 static Lisp_Object point_marker; |
1498
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
60 |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
61 /* String for the prompt text used in Fcall_interactively. */ |
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
62 static Lisp_Object callint_message; |
74912
4c1d868b634b
(Finteractive): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
73441
diff
changeset
|
63 |
407 | 64 /* ARGSUSED */ |
65 DEFUN ("interactive", Finteractive, Sinteractive, 0, UNEVALLED, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
66 doc: /* Specify a way of parsing arguments for interactive use of a function. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
67 For example, write |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
68 (defun foo (arg) "Doc string" (interactive "p") ...use arg...) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
69 to make ARG be the prefix argument when `foo' is called as a command. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
70 The "call" to `interactive' is actually a declaration rather than a function; |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
71 it tells `call-interactively' how to read arguments |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
72 to pass to the function. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
73 When actually called, `interactive' just returns nil. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
74 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
75 The argument of `interactive' is usually a string containing a code letter |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
76 followed by a prompt. (Some code letters do not use I/O to get |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
77 the argument and do not need prompts.) To prompt for multiple arguments, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
78 give a code letter, its prompt, a newline, and another code letter, etc. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
79 Prompts are passed to format, and may use % escapes to print the |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
80 arguments that have already been read. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
81 If the argument is not a string, it is evaluated to get a list of |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
82 arguments to pass to the function. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
83 Just `(interactive)' means pass no args when calling interactively. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
84 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
85 Code letters available are: |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
86 a -- Function name: symbol with a function definition. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
87 b -- Name of existing buffer. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
88 B -- Name of buffer, possibly nonexistent. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
89 c -- Character (no input method is used). |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
90 C -- Command name: symbol with interactive function definition. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
91 d -- Value of point as number. Does not do I/O. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
92 D -- Directory name. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
93 e -- Parametrized event (i.e., one that's a list) that invoked this command. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
94 If used more than once, the Nth `e' returns the Nth parameterized event. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
95 This skips events that are integers or symbols. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
96 f -- Existing file name. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
97 F -- Possibly nonexistent file name. |
60681
046708b92d49
(Finteractive): Document G option.
Richard M. Stallman <rms@gnu.org>
parents:
58380
diff
changeset
|
98 G -- Possibly nonexistent file name, defaulting to just directory name. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
99 i -- Ignored, i.e. always nil. Does not do I/O. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
100 k -- Key sequence (downcase the last event if needed to get a definition). |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
101 K -- Key sequence to be redefined (do not downcase the last event). |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
102 m -- Value of mark as number. Does not do I/O. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
103 M -- Any string. Inherits the current input method. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
104 n -- Number read using minibuffer. |
74912
4c1d868b634b
(Finteractive): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
73441
diff
changeset
|
105 N -- Numeric prefix arg, or if none, do like code `n'. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
106 p -- Prefix arg converted to number. Does not do I/O. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
107 P -- Prefix arg in raw form. Does not do I/O. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
108 r -- Region: point and mark as 2 numeric args, smallest first. Does no I/O. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
109 s -- Any string. Does not inherit the current input method. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
110 S -- Any symbol. |
57707
e092a2ece99b
(Fcall_interactively): Add 'U' code to get the up-event discarded by a
Kim F. Storm <storm@cua.dk>
parents:
56571
diff
changeset
|
111 U -- Mouse up event discarded by a previous k or K argument. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
112 v -- Variable name: symbol that is user-variable-p. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
113 x -- Lisp expression read but not evaluated. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
114 X -- Lisp expression read and evaluated. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
115 z -- Coding system. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
116 Z -- Coding system, nil if no prefix arg. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
117 In addition, if the string begins with `*' |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
118 then an error is signaled if the buffer is read-only. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
119 This happens before reading any arguments. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
120 If the string begins with `@', then Emacs searches the key sequence |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
121 which invoked the command for its first mouse click (or any other |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
122 event which specifies a window), and selects that window before |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
123 reading any arguments. You may use both `@' and `*'; they are |
40643
184e0d756547
(Finteractive): Add usage to doc-string.
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
124 processed in the order that they appear. |
184e0d756547
(Finteractive): Add usage to doc-string.
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
125 usage: (interactive ARGS) */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
126 (args) |
407 | 127 Lisp_Object args; |
128 { | |
129 return Qnil; | |
130 } | |
131 | |
132 /* Quotify EXP: if EXP is constant, return it. | |
133 If EXP is not constant, return (quote EXP). */ | |
134 Lisp_Object | |
135 quotify_arg (exp) | |
136 register Lisp_Object exp; | |
137 { | |
9145
dda75a4dbbfb
(quotify_arg, Fcall_interactively, Fprefix_numeric_value): Use type test
Karl Heuer <kwzh@gnu.org>
parents:
9100
diff
changeset
|
138 if (!INTEGERP (exp) && !STRINGP (exp) |
485 | 139 && !NILP (exp) && !EQ (exp, Qt)) |
407 | 140 return Fcons (Qquote, Fcons (exp, Qnil)); |
141 | |
142 return exp; | |
143 } | |
144 | |
145 /* Modify EXP by quotifying each element (except the first). */ | |
146 Lisp_Object | |
147 quotify_args (exp) | |
148 Lisp_Object exp; | |
149 { | |
150 register Lisp_Object tail; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
25645
diff
changeset
|
151 Lisp_Object next; |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
25645
diff
changeset
|
152 for (tail = exp; CONSP (tail); tail = next) |
407 | 153 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
25645
diff
changeset
|
154 next = XCDR (tail); |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39945
diff
changeset
|
155 XSETCAR (tail, quotify_arg (XCAR (tail))); |
407 | 156 } |
157 return exp; | |
158 } | |
159 | |
160 char *callint_argfuns[] | |
161 = {"", "point", "mark", "region-beginning", "region-end"}; | |
162 | |
163 static void | |
43039
531bd3a9e67a
(check_mark): New arg to specify clearer error message.
Richard M. Stallman <rms@gnu.org>
parents:
42272
diff
changeset
|
164 check_mark (for_region) |
531bd3a9e67a
(check_mark): New arg to specify clearer error message.
Richard M. Stallman <rms@gnu.org>
parents:
42272
diff
changeset
|
165 int for_region; |
407 | 166 { |
6494
00475922df29
(check_mark, Fcall_interactively): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6271
diff
changeset
|
167 Lisp_Object tem; |
00475922df29
(check_mark, Fcall_interactively): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6271
diff
changeset
|
168 tem = Fmarker_buffer (current_buffer->mark); |
485 | 169 if (NILP (tem) || (XBUFFER (tem) != current_buffer)) |
43039
531bd3a9e67a
(check_mark): New arg to specify clearer error message.
Richard M. Stallman <rms@gnu.org>
parents:
42272
diff
changeset
|
170 error (for_region ? "The mark is not set now, so there is no region" |
531bd3a9e67a
(check_mark): New arg to specify clearer error message.
Richard M. Stallman <rms@gnu.org>
parents:
42272
diff
changeset
|
171 : "The mark is not set now"); |
4039
77cb08d1c4a5
(check_mark): Don't check mark-active unless in transient-mark-mode.
Roland McGrath <roland@gnu.org>
parents:
3975
diff
changeset
|
172 if (!NILP (Vtransient_mark_mode) && NILP (Vmark_even_if_inactive) |
77cb08d1c4a5
(check_mark): Don't check mark-active unless in transient-mark-mode.
Roland McGrath <roland@gnu.org>
parents:
3975
diff
changeset
|
173 && NILP (current_buffer->mark_active)) |
71969 | 174 xsignal0 (Qmark_inactive); |
407 | 175 } |
176 | |
50469 | 177 /* If the list of args INPUT was produced with an explicit call to |
178 `list', look for elements that were computed with | |
179 (region-beginning) or (region-end), and put those expressions into | |
180 VALUES instead of the present values. | |
181 | |
182 This function doesn't return a value because it modifies elements | |
183 of VALUES to do its job. */ | |
184 | |
49953
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
185 static void |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
186 fix_command (input, values) |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
187 Lisp_Object input, values; |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
188 { |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
189 if (CONSP (input)) |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
190 { |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
191 Lisp_Object car; |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
192 |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
193 car = XCAR (input); |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
194 /* Skip through certain special forms. */ |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
195 while (EQ (car, Qlet) || EQ (car, Qletx) |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
196 || EQ (car, Qsave_excursion) |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
197 || EQ (car, Qprogn)) |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
198 { |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
199 while (CONSP (XCDR (input))) |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
200 input = XCDR (input); |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
201 input = XCAR (input); |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
202 if (!CONSP (input)) |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
203 break; |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
204 car = XCAR (input); |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
205 } |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
206 if (EQ (car, Qlist)) |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
207 { |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
208 Lisp_Object intail, valtail; |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
209 for (intail = Fcdr (input), valtail = values; |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
210 CONSP (valtail); |
54891
6258852d3607
(fix_command): Use XDCR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54641
diff
changeset
|
211 intail = Fcdr (intail), valtail = XCDR (valtail)) |
49953
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
212 { |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
213 Lisp_Object elt; |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
214 elt = Fcar (intail); |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
215 if (CONSP (elt)) |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
216 { |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
217 Lisp_Object presflag, carelt; |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
218 carelt = Fcar (elt); |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
219 /* If it is (if X Y), look at Y. */ |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
220 if (EQ (carelt, Qif) |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
221 && EQ (Fnthcdr (make_number (3), elt), Qnil)) |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
222 elt = Fnth (make_number (2), elt); |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
223 /* If it is (when ... Y), look at Y. */ |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
224 else if (EQ (carelt, Qwhen)) |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
225 { |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
226 while (CONSP (XCDR (elt))) |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
227 elt = XCDR (elt); |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
228 elt = Fcar (elt); |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
229 } |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
230 |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
231 /* If the function call we're looking at |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
232 is a special preserved one, copy the |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
233 whole expression for this argument. */ |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
234 if (CONSP (elt)) |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
235 { |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
236 presflag = Fmemq (Fcar (elt), preserved_fns); |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
237 if (!NILP (presflag)) |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
238 Fsetcar (valtail, Fcar (intail)); |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
239 } |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
240 } |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
241 } |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
242 } |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
243 } |
c57ce680648d
(fix_command): Declare as static void and move before Fcall_interactively.
Juanma Barranquero <lekktu@gmail.com>
parents:
49932
diff
changeset
|
244 } |
407 | 245 |
13308
99457b67e20c
(Fcall_interactively): New arg KEYS.
Richard M. Stallman <rms@gnu.org>
parents:
13142
diff
changeset
|
246 DEFUN ("call-interactively", Fcall_interactively, Scall_interactively, 1, 3, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
247 doc: /* Call FUNCTION, reading args according to its interactive calling specs. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
248 Return the value FUNCTION returns. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
249 The function contains a specification of how to do the argument reading. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
250 In the case of user-defined functions, this is specified by placing a call |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
251 to the function `interactive' at the top level of the function body. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
252 See `interactive'. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
253 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
254 Optional second arg RECORD-FLAG non-nil |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
255 means unconditionally put this command in the command-history. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
256 Otherwise, this is done only if an arg is read using the minibuffer. |
73120
6d481bdb9779
* callint.c (Fcall_interactively): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
72135
diff
changeset
|
257 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
258 Optional third arg KEYS, if given, specifies the sequence of events to |
73120
6d481bdb9779
* callint.c (Fcall_interactively): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
72135
diff
changeset
|
259 supply, as a vector, if the command inquires which events were used to |
6d481bdb9779
* callint.c (Fcall_interactively): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
72135
diff
changeset
|
260 invoke it. If KEYS is omitted or nil, the return value of |
6d481bdb9779
* callint.c (Fcall_interactively): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
72135
diff
changeset
|
261 `this-command-keys-vector' is used. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
262 (function, record_flag, keys) |
14062
16a05061fee3
(Fcall_interactively, Fprefix_numeric_value): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13843
diff
changeset
|
263 Lisp_Object function, record_flag, keys; |
407 | 264 { |
265 Lisp_Object *args, *visargs; | |
266 Lisp_Object specs; | |
48150
2b5f7e1254d1
(Fcall_interactively): New local filter_specs.
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
267 Lisp_Object filter_specs; |
407 | 268 Lisp_Object teml; |
57707
e092a2ece99b
(Fcall_interactively): Add 'U' code to get the up-event discarded by a
Kim F. Storm <storm@cua.dk>
parents:
56571
diff
changeset
|
269 Lisp_Object up_event; |
873 | 270 Lisp_Object enable; |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46006
diff
changeset
|
271 int speccount = SPECPDL_INDEX (); |
407 | 272 |
1383
54028d2538a4
* callint.c (Fcall_interactively): Allow multiple 'e' specs.
Jim Blandy <jimb@redhat.com>
parents:
1347
diff
changeset
|
273 /* The index of the next element of this_command_keys to examine for |
54028d2538a4
* callint.c (Fcall_interactively): Allow multiple 'e' specs.
Jim Blandy <jimb@redhat.com>
parents:
1347
diff
changeset
|
274 the 'e' interactive code. */ |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1693
diff
changeset
|
275 int next_event; |
1383
54028d2538a4
* callint.c (Fcall_interactively): Allow multiple 'e' specs.
Jim Blandy <jimb@redhat.com>
parents:
1347
diff
changeset
|
276 |
407 | 277 Lisp_Object prefix_arg; |
278 unsigned char *string; | |
279 unsigned char *tem; | |
438 | 280 |
281 /* If varies[i] > 0, the i'th argument shouldn't just have its value | |
282 in this call quoted in the command history. It should be | |
283 recorded as a call to the function named callint_argfuns[varies[i]]. */ | |
407 | 284 int *varies; |
438 | 285 |
407 | 286 register int i, j; |
287 int count, foo; | |
288 char prompt1[100]; | |
289 char *tem1; | |
290 int arg_from_tty = 0; | |
57707
e092a2ece99b
(Fcall_interactively): Add 'U' code to get the up-event discarded by a
Kim F. Storm <storm@cua.dk>
parents:
56571
diff
changeset
|
291 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; |
13308
99457b67e20c
(Fcall_interactively): New arg KEYS.
Richard M. Stallman <rms@gnu.org>
parents:
13142
diff
changeset
|
292 int key_count; |
48527
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
293 int record_then_fail = 0; |
13308
99457b67e20c
(Fcall_interactively): New arg KEYS.
Richard M. Stallman <rms@gnu.org>
parents:
13142
diff
changeset
|
294 |
52374
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
295 Lisp_Object save_this_command, save_last_command; |
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
296 Lisp_Object save_this_original_command, save_real_this_command; |
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
297 |
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
298 save_this_command = Vthis_command; |
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
299 save_this_original_command = Vthis_original_command; |
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
300 save_real_this_command = real_this_command; |
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
301 save_last_command = current_kboard->Vlast_command; |
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
302 |
13308
99457b67e20c
(Fcall_interactively): New arg KEYS.
Richard M. Stallman <rms@gnu.org>
parents:
13142
diff
changeset
|
303 if (NILP (keys)) |
99457b67e20c
(Fcall_interactively): New arg KEYS.
Richard M. Stallman <rms@gnu.org>
parents:
13142
diff
changeset
|
304 keys = this_command_keys, key_count = this_command_key_count; |
99457b67e20c
(Fcall_interactively): New arg KEYS.
Richard M. Stallman <rms@gnu.org>
parents:
13142
diff
changeset
|
305 else |
99457b67e20c
(Fcall_interactively): New arg KEYS.
Richard M. Stallman <rms@gnu.org>
parents:
13142
diff
changeset
|
306 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40643
diff
changeset
|
307 CHECK_VECTOR (keys); |
13308
99457b67e20c
(Fcall_interactively): New arg KEYS.
Richard M. Stallman <rms@gnu.org>
parents:
13142
diff
changeset
|
308 key_count = XVECTOR (keys)->size; |
99457b67e20c
(Fcall_interactively): New arg KEYS.
Richard M. Stallman <rms@gnu.org>
parents:
13142
diff
changeset
|
309 } |
407 | 310 |
732 | 311 /* Save this now, since use of minibuffer will clobber it. */ |
10857
2b9faff73319
(Fcall_interactively, syms_of_callint, Vprefix_arg, Vcurrent_prefix_arg): Undo
Karl Heuer <kwzh@gnu.org>
parents:
10846
diff
changeset
|
312 prefix_arg = Vcurrent_prefix_arg; |
407 | 313 |
9145
dda75a4dbbfb
(quotify_arg, Fcall_interactively, Fprefix_numeric_value): Use type test
Karl Heuer <kwzh@gnu.org>
parents:
9100
diff
changeset
|
314 if (SYMBOLP (function)) |
1115
eb7f1ab33a9d
* callint.c (Fcall_interactively): Remove the 'K' interactive
Jim Blandy <jimb@redhat.com>
parents:
1084
diff
changeset
|
315 enable = Fget (function, Qenable_recursive_minibuffers); |
34799
c04a8de55245
(Fcall_interactively): Prevent a compiler warning.
Gerd Moellmann <gerd@gnu.org>
parents:
31336
diff
changeset
|
316 else |
c04a8de55245
(Fcall_interactively): Prevent a compiler warning.
Gerd Moellmann <gerd@gnu.org>
parents:
31336
diff
changeset
|
317 enable = Qnil; |
873 | 318 |
407 | 319 specs = Qnil; |
320 string = 0; | |
48150
2b5f7e1254d1
(Fcall_interactively): New local filter_specs.
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
321 /* The idea of FILTER_SPECS is to provide away to |
2b5f7e1254d1
(Fcall_interactively): New local filter_specs.
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
322 specify how to represent the arguments in command history. |
2b5f7e1254d1
(Fcall_interactively): New local filter_specs.
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
323 The feature is not fully implemented. */ |
2b5f7e1254d1
(Fcall_interactively): New local filter_specs.
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
324 filter_specs = Qnil; |
407 | 325 |
57707
e092a2ece99b
(Fcall_interactively): Add 'U' code to get the up-event discarded by a
Kim F. Storm <storm@cua.dk>
parents:
56571
diff
changeset
|
326 /* If k or K discard an up-event, save it here so it can be retrieved with U */ |
e092a2ece99b
(Fcall_interactively): Add 'U' code to get the up-event discarded by a
Kim F. Storm <storm@cua.dk>
parents:
56571
diff
changeset
|
327 up_event = Qnil; |
e092a2ece99b
(Fcall_interactively): Add 'U' code to get the up-event discarded by a
Kim F. Storm <storm@cua.dk>
parents:
56571
diff
changeset
|
328 |
84432
b51e2df52bfb
(Fcall_interactively): Comment fixes.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84426
diff
changeset
|
329 /* Set SPECS to the interactive form, or barf if not interactive. */ |
84426
74dfb3b7d8f2
(Fcall_interactively): Use Finteractive_form also for subrs
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
330 { |
74dfb3b7d8f2
(Fcall_interactively): Use Finteractive_form also for subrs
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
331 Lisp_Object form; |
74dfb3b7d8f2
(Fcall_interactively): Use Finteractive_form also for subrs
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
332 GCPRO2 (function, prefix_arg); |
74dfb3b7d8f2
(Fcall_interactively): Use Finteractive_form also for subrs
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
333 form = Finteractive_form (function); |
74dfb3b7d8f2
(Fcall_interactively): Use Finteractive_form also for subrs
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
334 UNGCPRO; |
74dfb3b7d8f2
(Fcall_interactively): Use Finteractive_form also for subrs
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
335 if (CONSP (form)) |
74dfb3b7d8f2
(Fcall_interactively): Use Finteractive_form also for subrs
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
336 specs = filter_specs = Fcar (XCDR (form)); |
74dfb3b7d8f2
(Fcall_interactively): Use Finteractive_form also for subrs
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
337 else |
74dfb3b7d8f2
(Fcall_interactively): Use Finteractive_form also for subrs
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
338 wrong_type_argument (Qcommandp, function); |
74dfb3b7d8f2
(Fcall_interactively): Use Finteractive_form also for subrs
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
339 } |
407 | 340 |
84432
b51e2df52bfb
(Fcall_interactively): Comment fixes.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
84426
diff
changeset
|
341 /* If SPECS is set to a string, use it as an interactive prompt. */ |
9145
dda75a4dbbfb
(quotify_arg, Fcall_interactively, Fprefix_numeric_value): Use type test
Karl Heuer <kwzh@gnu.org>
parents:
9100
diff
changeset
|
342 if (STRINGP (specs)) |
617 | 343 { |
344 /* Make a copy of string so that if a GC relocates specs, | |
345 `string' will still be valid. */ | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
346 string = (unsigned char *) alloca (SBYTES (specs) + 1); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
347 bcopy (SDATA (specs), string, |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
348 SBYTES (specs) + 1); |
617 | 349 } |
84426
74dfb3b7d8f2
(Fcall_interactively): Use Finteractive_form also for subrs
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
350 else |
407 | 351 { |
1498
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
352 Lisp_Object input; |
17876
6e27f660a0be
(Fcall_interactively): Use num_input_events.
Richard M. Stallman <rms@gnu.org>
parents:
17806
diff
changeset
|
353 i = num_input_events; |
1498
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
354 input = specs; |
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
355 /* Compute the arg values using the user's expression. */ |
48150
2b5f7e1254d1
(Fcall_interactively): New local filter_specs.
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
356 GCPRO2 (input, filter_specs); |
13843
f5bd72a6fe48
(Fcall_interactively): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
13764
diff
changeset
|
357 specs = Feval (specs); |
48150
2b5f7e1254d1
(Fcall_interactively): New local filter_specs.
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
358 UNGCPRO; |
17876
6e27f660a0be
(Fcall_interactively): Use num_input_events.
Richard M. Stallman <rms@gnu.org>
parents:
17806
diff
changeset
|
359 if (i != num_input_events || !NILP (record_flag)) |
1498
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
360 { |
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
361 /* We should record this command on the command history. */ |
51048
7ac9c3bea5ea
(Fselect_window): Add optional arg `norecord'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50469
diff
changeset
|
362 Lisp_Object values; |
1498
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
363 /* Make a copy of the list of values, for the command history, |
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
364 and turn them into things we can eval. */ |
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
365 values = quotify_args (Fcopy_sequence (specs)); |
49932
2f5cdffaaa04
(fix_command): New subroutine, from Fcall_interactively.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
366 fix_command (input, values); |
1498
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
367 Vcommand_history |
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
368 = Fcons (Fcons (function, values), Vcommand_history); |
21721
46ffb5302c40
(Fcall_interactively): Truncate command-history here.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
369 |
46ffb5302c40
(Fcall_interactively): Truncate command-history here.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
370 /* Don't keep command history around forever. */ |
44405
0ed69545b5f3
(Fcall_interactively): Use INTEGERP instead of
Gerd Moellmann <gerd@gnu.org>
parents:
43039
diff
changeset
|
371 if (INTEGERP (Vhistory_length) && XINT (Vhistory_length) > 0) |
21721
46ffb5302c40
(Fcall_interactively): Truncate command-history here.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
372 { |
46ffb5302c40
(Fcall_interactively): Truncate command-history here.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
373 teml = Fnthcdr (Vhistory_length, Vcommand_history); |
46ffb5302c40
(Fcall_interactively): Truncate command-history here.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
374 if (CONSP (teml)) |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39945
diff
changeset
|
375 XSETCDR (teml, Qnil); |
21721
46ffb5302c40
(Fcall_interactively): Truncate command-history here.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
376 } |
1498
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
377 } |
52374
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
378 |
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
379 Vthis_command = save_this_command; |
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
380 Vthis_original_command = save_this_original_command; |
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
381 real_this_command= save_real_this_command; |
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
382 current_kboard->Vlast_command = save_last_command; |
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
383 |
83374
0b75ace4f7ad
Fix crash after y-or-n-p prompt triggered by emacsclient. (Reported by Han Boetes, analysis by Kalle Olavi Niemitalo.)
Karoly Lorentey <lorentey@elte.hu>
parents:
64770
diff
changeset
|
384 temporarily_switch_to_single_kboard (NULL); |
0b75ace4f7ad
Fix crash after y-or-n-p prompt triggered by emacsclient. (Reported by Han Boetes, analysis by Kalle Olavi Niemitalo.)
Karoly Lorentey <lorentey@elte.hu>
parents:
64770
diff
changeset
|
385 return unbind_to (speccount, apply1 (function, specs)); |
407 | 386 } |
387 | |
388 /* Here if function specifies a string to control parsing the defaults */ | |
389 | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1693
diff
changeset
|
390 /* Set next_event to point to the first event with parameters. */ |
13308
99457b67e20c
(Fcall_interactively): New arg KEYS.
Richard M. Stallman <rms@gnu.org>
parents:
13142
diff
changeset
|
391 for (next_event = 0; next_event < key_count; next_event++) |
99457b67e20c
(Fcall_interactively): New arg KEYS.
Richard M. Stallman <rms@gnu.org>
parents:
13142
diff
changeset
|
392 if (EVENT_HAS_PARAMETERS (XVECTOR (keys)->contents[next_event])) |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1693
diff
changeset
|
393 break; |
48527
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
394 |
7912
f87185e63bbc
(Fcall_interactively): Ignore `-' in string.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
395 /* Handle special starting chars `*' and `@'. Also `-'. */ |
11278
25b2219c415c
(Fcall_interactively): `+' is reserved for user changes.
Richard M. Stallman <rms@gnu.org>
parents:
11009
diff
changeset
|
396 /* Note that `+' is reserved for user extensions. */ |
407 | 397 while (1) |
398 { | |
11280
5146fba1f75d
(Fcall_interactively): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
11278
diff
changeset
|
399 if (*string == '+') |
11278
25b2219c415c
(Fcall_interactively): `+' is reserved for user changes.
Richard M. Stallman <rms@gnu.org>
parents:
11009
diff
changeset
|
400 error ("`+' is not used in `interactive' for ordinary commands"); |
25b2219c415c
(Fcall_interactively): `+' is reserved for user changes.
Richard M. Stallman <rms@gnu.org>
parents:
11009
diff
changeset
|
401 else if (*string == '*') |
407 | 402 { |
403 string++; | |
485 | 404 if (!NILP (current_buffer->read_only)) |
48527
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
405 { |
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
406 if (!NILP (record_flag)) |
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
407 { |
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
408 unsigned char *p = string; |
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
409 while (*p) |
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
410 { |
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
411 if (! (*p == 'r' || *p == 'p' || *p == 'P' |
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
412 || *p == '\n')) |
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
413 Fbarf_if_buffer_read_only (); |
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
414 p++; |
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
415 } |
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
416 record_then_fail = 1; |
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
417 } |
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
418 else |
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
419 Fbarf_if_buffer_read_only (); |
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
420 } |
407 | 421 } |
7912
f87185e63bbc
(Fcall_interactively): Ignore `-' in string.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
422 /* Ignore this for semi-compatibility with Lucid. */ |
f87185e63bbc
(Fcall_interactively): Ignore `-' in string.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
423 else if (*string == '-') |
f87185e63bbc
(Fcall_interactively): Ignore `-' in string.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
424 string++; |
407 | 425 else if (*string == '@') |
426 { | |
57998
a017cc23b31d
(Fcall_interactively): Avoid reusing EVENT for other data.
Richard M. Stallman <rms@gnu.org>
parents:
57707
diff
changeset
|
427 Lisp_Object event, tem; |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1693
diff
changeset
|
428 |
48630
edd0dd275f1f
(Fcall_interactively): Use next_event only if less
Andreas Schwab <schwab@suse.de>
parents:
48527
diff
changeset
|
429 event = (next_event < key_count |
edd0dd275f1f
(Fcall_interactively): Use next_event only if less
Andreas Schwab <schwab@suse.de>
parents:
48527
diff
changeset
|
430 ? XVECTOR (keys)->contents[next_event] |
edd0dd275f1f
(Fcall_interactively): Use next_event only if less
Andreas Schwab <schwab@suse.de>
parents:
48527
diff
changeset
|
431 : Qnil); |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1693
diff
changeset
|
432 if (EVENT_HAS_PARAMETERS (event) |
57998
a017cc23b31d
(Fcall_interactively): Avoid reusing EVENT for other data.
Richard M. Stallman <rms@gnu.org>
parents:
57707
diff
changeset
|
433 && (tem = XCDR (event), CONSP (tem)) |
a017cc23b31d
(Fcall_interactively): Avoid reusing EVENT for other data.
Richard M. Stallman <rms@gnu.org>
parents:
57707
diff
changeset
|
434 && (tem = XCAR (tem), CONSP (tem)) |
a017cc23b31d
(Fcall_interactively): Avoid reusing EVENT for other data.
Richard M. Stallman <rms@gnu.org>
parents:
57707
diff
changeset
|
435 && (tem = XCAR (tem), WINDOWP (tem))) |
6270
853b88dd9945
(Fcall_interactively): Don't select an active minibuffer.
Karl Heuer <kwzh@gnu.org>
parents:
4696
diff
changeset
|
436 { |
57998
a017cc23b31d
(Fcall_interactively): Avoid reusing EVENT for other data.
Richard M. Stallman <rms@gnu.org>
parents:
57707
diff
changeset
|
437 if (MINI_WINDOW_P (XWINDOW (tem)) |
a017cc23b31d
(Fcall_interactively): Avoid reusing EVENT for other data.
Richard M. Stallman <rms@gnu.org>
parents:
57707
diff
changeset
|
438 && ! (minibuf_level > 0 && EQ (tem, minibuf_window))) |
6270
853b88dd9945
(Fcall_interactively): Don't select an active minibuffer.
Karl Heuer <kwzh@gnu.org>
parents:
4696
diff
changeset
|
439 error ("Attempt to select inactive minibuffer window"); |
10279
89cf458ed188
(Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
9342
diff
changeset
|
440 |
89cf458ed188
(Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
9342
diff
changeset
|
441 /* If the current buffer wants to clean up, let it. */ |
89cf458ed188
(Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
9342
diff
changeset
|
442 if (!NILP (Vmouse_leave_buffer_hook)) |
89cf458ed188
(Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
9342
diff
changeset
|
443 call1 (Vrun_hooks, Qmouse_leave_buffer_hook); |
89cf458ed188
(Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
9342
diff
changeset
|
444 |
57998
a017cc23b31d
(Fcall_interactively): Avoid reusing EVENT for other data.
Richard M. Stallman <rms@gnu.org>
parents:
57707
diff
changeset
|
445 Fselect_window (tem, Qnil); |
6270
853b88dd9945
(Fcall_interactively): Don't select an active minibuffer.
Karl Heuer <kwzh@gnu.org>
parents:
4696
diff
changeset
|
446 } |
407 | 447 string++; |
448 } | |
449 else break; | |
450 } | |
451 | |
452 /* Count the number of arguments the interactive spec would have | |
453 us give to the function. */ | |
454 tem = string; | |
81608
75c51005f057
(Fcall_interactively): Make the parsing of interactive
David Kastrup <dak@gnu.org>
parents:
81285
diff
changeset
|
455 for (j = 0; *tem;) |
407 | 456 { |
457 /* 'r' specifications ("point and mark as 2 numeric args") | |
458 produce *two* arguments. */ | |
81608
75c51005f057
(Fcall_interactively): Make the parsing of interactive
David Kastrup <dak@gnu.org>
parents:
81285
diff
changeset
|
459 if (*tem == 'r') |
75c51005f057
(Fcall_interactively): Make the parsing of interactive
David Kastrup <dak@gnu.org>
parents:
81285
diff
changeset
|
460 j += 2; |
75c51005f057
(Fcall_interactively): Make the parsing of interactive
David Kastrup <dak@gnu.org>
parents:
81285
diff
changeset
|
461 else |
75c51005f057
(Fcall_interactively): Make the parsing of interactive
David Kastrup <dak@gnu.org>
parents:
81285
diff
changeset
|
462 j++; |
407 | 463 tem = (unsigned char *) index (tem, '\n'); |
464 if (tem) | |
81608
75c51005f057
(Fcall_interactively): Make the parsing of interactive
David Kastrup <dak@gnu.org>
parents:
81285
diff
changeset
|
465 ++tem; |
407 | 466 else |
81608
75c51005f057
(Fcall_interactively): Make the parsing of interactive
David Kastrup <dak@gnu.org>
parents:
81285
diff
changeset
|
467 break; |
407 | 468 } |
13843
f5bd72a6fe48
(Fcall_interactively): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
13764
diff
changeset
|
469 count = j; |
407 | 470 |
471 args = (Lisp_Object *) alloca ((count + 1) * sizeof (Lisp_Object)); | |
472 visargs = (Lisp_Object *) alloca ((count + 1) * sizeof (Lisp_Object)); | |
473 varies = (int *) alloca ((count + 1) * sizeof (int)); | |
474 | |
475 for (i = 0; i < (count + 1); i++) | |
476 { | |
477 args[i] = Qnil; | |
478 visargs[i] = Qnil; | |
479 varies[i] = 0; | |
480 } | |
481 | |
57707
e092a2ece99b
(Fcall_interactively): Add 'U' code to get the up-event discarded by a
Kim F. Storm <storm@cua.dk>
parents:
56571
diff
changeset
|
482 GCPRO5 (prefix_arg, function, *args, *visargs, up_event); |
407 | 483 gcpro3.nvars = (count + 1); |
484 gcpro4.nvars = (count + 1); | |
485 | |
873 | 486 if (!NILP (enable)) |
487 specbind (Qenable_recursive_minibuffers, Qt); | |
488 | |
407 | 489 tem = string; |
13843
f5bd72a6fe48
(Fcall_interactively): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
13764
diff
changeset
|
490 for (i = 1; *tem; i++) |
407 | 491 { |
492 strncpy (prompt1, tem + 1, sizeof prompt1 - 1); | |
493 prompt1[sizeof prompt1 - 1] = 0; | |
31225
7930c46bb365
(toplevel) [HAVE_STRING_H]: Include string.h.
Gerd Moellmann <gerd@gnu.org>
parents:
29371
diff
changeset
|
494 tem1 = (char *) index (prompt1, '\n'); |
407 | 495 if (tem1) *tem1 = 0; |
496 | |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
497 visargs[0] = build_string (prompt1); |
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
498 if (index (prompt1, '%')) |
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
499 callint_message = Fformat (i, visargs); |
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
500 else |
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
501 callint_message = visargs[0]; |
407 | 502 |
503 switch (*tem) | |
504 { | |
505 case 'a': /* Symbol defined as a function */ | |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
506 visargs[i] = Fcompleting_read (callint_message, |
17736
8b30ef18c480
(Fcall_interactively): Pass new arg to
Richard M. Stallman <rms@gnu.org>
parents:
17024
diff
changeset
|
507 Vobarray, Qfboundp, Qt, |
19548
b275154db0cb
(Finteractive): Document the code letter `M'.
Kenichi Handa <handa@m17n.org>
parents:
17958
diff
changeset
|
508 Qnil, Qnil, Qnil, Qnil); |
407 | 509 /* Passing args[i] directly stimulates compiler bug */ |
510 teml = visargs[i]; | |
511 args[i] = Fintern (teml, Qnil); | |
512 break; | |
513 | |
514 case 'b': /* Name of existing buffer */ | |
515 args[i] = Fcurrent_buffer (); | |
516 if (EQ (selected_window, minibuf_window)) | |
22244
41c88b9489c3
(Fcall_interactively): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
21721
diff
changeset
|
517 args[i] = Fother_buffer (args[i], Qnil, Qnil); |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
518 args[i] = Fread_buffer (callint_message, args[i], Qt); |
407 | 519 break; |
520 | |
521 case 'B': /* Name of buffer, possibly nonexistent */ | |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
522 args[i] = Fread_buffer (callint_message, |
22244
41c88b9489c3
(Fcall_interactively): Pass new arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
21721
diff
changeset
|
523 Fother_buffer (Fcurrent_buffer (), Qnil, Qnil), |
1347
ac3a893b9bb9
(Fcall_interactively): Pass 2nd arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1115
diff
changeset
|
524 Qnil); |
407 | 525 break; |
526 | |
527 case 'c': /* Character */ | |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
528 args[i] = Fread_char (callint_message, Qnil, Qnil); |
13754
8310d6085087
(Fcall_interactively): Don't log prompt strings.
Karl Heuer <kwzh@gnu.org>
parents:
13664
diff
changeset
|
529 message1_nolog ((char *) 0); |
407 | 530 /* Passing args[i] directly stimulates compiler bug */ |
531 teml = args[i]; | |
532 visargs[i] = Fchar_to_string (teml); | |
533 break; | |
534 | |
535 case 'C': /* Command: symbol with interactive function */ | |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
536 visargs[i] = Fcompleting_read (callint_message, |
17736
8b30ef18c480
(Fcall_interactively): Pass new arg to
Richard M. Stallman <rms@gnu.org>
parents:
17024
diff
changeset
|
537 Vobarray, Qcommandp, |
19548
b275154db0cb
(Finteractive): Document the code letter `M'.
Kenichi Handa <handa@m17n.org>
parents:
17958
diff
changeset
|
538 Qt, Qnil, Qnil, Qnil, Qnil); |
407 | 539 /* Passing args[i] directly stimulates compiler bug */ |
540 teml = visargs[i]; | |
541 args[i] = Fintern (teml, Qnil); | |
542 break; | |
543 | |
544 case 'd': /* Value of point. Does not do I/O. */ | |
20552
1a0cb8cd5615
(Fcall_interactively) <'d', 'r'>: Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
19759
diff
changeset
|
545 set_marker_both (point_marker, Qnil, PT, PT_BYTE); |
10803
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
546 args[i] = point_marker; |
407 | 547 /* visargs[i] = Qnil; */ |
548 varies[i] = 1; | |
549 break; | |
550 | |
551 case 'D': /* Directory name. */ | |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
552 args[i] = Fread_file_name (callint_message, Qnil, |
45546
ce01a38706ee
(Fcall_interactively) <"D">: Supply Qfile_directory_p
Kim F. Storm <storm@cua.dk>
parents:
45394
diff
changeset
|
553 current_buffer->directory, Qlambda, Qnil, |
ce01a38706ee
(Fcall_interactively) <"D">: Supply Qfile_directory_p
Kim F. Storm <storm@cua.dk>
parents:
45394
diff
changeset
|
554 Qfile_directory_p); |
407 | 555 break; |
556 | |
557 case 'f': /* Existing file name. */ | |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
558 args[i] = Fread_file_name (callint_message, |
45546
ce01a38706ee
(Fcall_interactively) <"D">: Supply Qfile_directory_p
Kim F. Storm <storm@cua.dk>
parents:
45394
diff
changeset
|
559 Qnil, Qnil, Qlambda, Qnil, Qnil); |
407 | 560 break; |
561 | |
562 case 'F': /* Possibly nonexistent file name. */ | |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
563 args[i] = Fread_file_name (callint_message, |
45546
ce01a38706ee
(Fcall_interactively) <"D">: Supply Qfile_directory_p
Kim F. Storm <storm@cua.dk>
parents:
45394
diff
changeset
|
564 Qnil, Qnil, Qnil, Qnil, Qnil); |
407 | 565 break; |
566 | |
60681
046708b92d49
(Finteractive): Document G option.
Richard M. Stallman <rms@gnu.org>
parents:
58380
diff
changeset
|
567 case 'G': /* Possibly nonexistent file name, |
046708b92d49
(Finteractive): Document G option.
Richard M. Stallman <rms@gnu.org>
parents:
58380
diff
changeset
|
568 default to directory alone. */ |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
569 args[i] = Fread_file_name (callint_message, |
81285
d82619d66bd3
(Fdelete_and_extract_region): Use empty_unibyte_string.
Juanma Barranquero <lekktu@gmail.com>
parents:
75227
diff
changeset
|
570 Qnil, Qnil, Qnil, empty_unibyte_string, Qnil); |
60681
046708b92d49
(Finteractive): Document G option.
Richard M. Stallman <rms@gnu.org>
parents:
58380
diff
changeset
|
571 break; |
046708b92d49
(Finteractive): Document G option.
Richard M. Stallman <rms@gnu.org>
parents:
58380
diff
changeset
|
572 |
17024
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
573 case 'i': /* Ignore an argument -- Does not do I/O */ |
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
574 varies[i] = -1; |
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
575 break; |
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
576 |
10540
161014ddd3c5
(Fcall_interactively): Define K mostly like k.
Richard M. Stallman <rms@gnu.org>
parents:
10345
diff
changeset
|
577 case 'k': /* Key sequence. */ |
16363
4097c59143f8
(Fcall_interactively): Bind cursor-in-echo-area to t for `k' and `K'.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
578 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46006
diff
changeset
|
579 int speccount1 = SPECPDL_INDEX (); |
16363
4097c59143f8
(Fcall_interactively): Bind cursor-in-echo-area to t for `k' and `K'.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
580 specbind (Qcursor_in_echo_area, Qt); |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
581 args[i] = Fread_key_sequence (callint_message, |
22932
0e0275920715
(Fcall_interactively): Pass new arg to Fread_key_sequence.
Richard M. Stallman <rms@gnu.org>
parents:
22485
diff
changeset
|
582 Qnil, Qnil, Qnil, Qnil); |
16363
4097c59143f8
(Fcall_interactively): Bind cursor-in-echo-area to t for `k' and `K'.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
583 unbind_to (speccount1, Qnil); |
4097c59143f8
(Fcall_interactively): Bind cursor-in-echo-area to t for `k' and `K'.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
584 teml = args[i]; |
54927
7b6b4d9ae726
(Fkey_description): Change callers.
Kim F. Storm <storm@cua.dk>
parents:
54891
diff
changeset
|
585 visargs[i] = Fkey_description (teml, Qnil); |
22485
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
586 |
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
587 /* If the key sequence ends with a down-event, |
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
588 discard the following up-event. */ |
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
589 teml = Faref (args[i], make_number (XINT (Flength (args[i])) - 1)); |
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
590 if (CONSP (teml)) |
25645
a14111a2a100
Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
24911
diff
changeset
|
591 teml = XCAR (teml); |
22485
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
592 if (SYMBOLP (teml)) |
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
593 { |
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
594 Lisp_Object tem2; |
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
595 |
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
596 teml = Fget (teml, intern ("event-symbol-elements")); |
24911
f477c5bb74c6
(Fcall_interactively): Ignore first element of
Andreas Schwab <schwab@suse.de>
parents:
23934
diff
changeset
|
597 /* Ignore first element, which is the base key. */ |
f477c5bb74c6
(Fcall_interactively): Ignore first element of
Andreas Schwab <schwab@suse.de>
parents:
23934
diff
changeset
|
598 tem2 = Fmemq (intern ("down"), Fcdr (teml)); |
22485
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
599 if (! NILP (tem2)) |
72135
2bd7c2f5456f
Change callers of read_char.
Chong Yidong <cyd@stupidchicken.com>
parents:
71969
diff
changeset
|
600 up_event = Fread_event (Qnil, Qnil, Qnil); |
22485
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
601 } |
16363
4097c59143f8
(Fcall_interactively): Bind cursor-in-echo-area to t for `k' and `K'.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
602 } |
10540
161014ddd3c5
(Fcall_interactively): Define K mostly like k.
Richard M. Stallman <rms@gnu.org>
parents:
10345
diff
changeset
|
603 break; |
161014ddd3c5
(Fcall_interactively): Define K mostly like k.
Richard M. Stallman <rms@gnu.org>
parents:
10345
diff
changeset
|
604 |
161014ddd3c5
(Fcall_interactively): Define K mostly like k.
Richard M. Stallman <rms@gnu.org>
parents:
10345
diff
changeset
|
605 case 'K': /* Key sequence to be defined. */ |
16363
4097c59143f8
(Fcall_interactively): Bind cursor-in-echo-area to t for `k' and `K'.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
606 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46006
diff
changeset
|
607 int speccount1 = SPECPDL_INDEX (); |
16363
4097c59143f8
(Fcall_interactively): Bind cursor-in-echo-area to t for `k' and `K'.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
608 specbind (Qcursor_in_echo_area, Qt); |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
609 args[i] = Fread_key_sequence (callint_message, |
22932
0e0275920715
(Fcall_interactively): Pass new arg to Fread_key_sequence.
Richard M. Stallman <rms@gnu.org>
parents:
22485
diff
changeset
|
610 Qnil, Qt, Qnil, Qnil); |
16363
4097c59143f8
(Fcall_interactively): Bind cursor-in-echo-area to t for `k' and `K'.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
611 teml = args[i]; |
54927
7b6b4d9ae726
(Fkey_description): Change callers.
Kim F. Storm <storm@cua.dk>
parents:
54891
diff
changeset
|
612 visargs[i] = Fkey_description (teml, Qnil); |
16363
4097c59143f8
(Fcall_interactively): Bind cursor-in-echo-area to t for `k' and `K'.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
613 unbind_to (speccount1, Qnil); |
22485
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
614 |
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
615 /* If the key sequence ends with a down-event, |
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
616 discard the following up-event. */ |
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
617 teml = Faref (args[i], make_number (XINT (Flength (args[i])) - 1)); |
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
618 if (CONSP (teml)) |
25645
a14111a2a100
Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
24911
diff
changeset
|
619 teml = XCAR (teml); |
22485
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
620 if (SYMBOLP (teml)) |
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
621 { |
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
622 Lisp_Object tem2; |
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
623 |
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
624 teml = Fget (teml, intern ("event-symbol-elements")); |
24911
f477c5bb74c6
(Fcall_interactively): Ignore first element of
Andreas Schwab <schwab@suse.de>
parents:
23934
diff
changeset
|
625 /* Ignore first element, which is the base key. */ |
f477c5bb74c6
(Fcall_interactively): Ignore first element of
Andreas Schwab <schwab@suse.de>
parents:
23934
diff
changeset
|
626 tem2 = Fmemq (intern ("down"), Fcdr (teml)); |
22485
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
627 if (! NILP (tem2)) |
72135
2bd7c2f5456f
Change callers of read_char.
Chong Yidong <cyd@stupidchicken.com>
parents:
71969
diff
changeset
|
628 up_event = Fread_event (Qnil, Qnil, Qnil); |
22485
b469abbc9984
(Fcall_interactively) <k, K>: If sequence ends in a down
Richard M. Stallman <rms@gnu.org>
parents:
22383
diff
changeset
|
629 } |
16363
4097c59143f8
(Fcall_interactively): Bind cursor-in-echo-area to t for `k' and `K'.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
630 } |
407 | 631 break; |
632 | |
57707
e092a2ece99b
(Fcall_interactively): Add 'U' code to get the up-event discarded by a
Kim F. Storm <storm@cua.dk>
parents:
56571
diff
changeset
|
633 case 'U': /* Up event from last k or K */ |
e092a2ece99b
(Fcall_interactively): Add 'U' code to get the up-event discarded by a
Kim F. Storm <storm@cua.dk>
parents:
56571
diff
changeset
|
634 if (!NILP (up_event)) |
e092a2ece99b
(Fcall_interactively): Add 'U' code to get the up-event discarded by a
Kim F. Storm <storm@cua.dk>
parents:
56571
diff
changeset
|
635 { |
e092a2ece99b
(Fcall_interactively): Add 'U' code to get the up-event discarded by a
Kim F. Storm <storm@cua.dk>
parents:
56571
diff
changeset
|
636 args[i] = Fmake_vector (make_number (1), up_event); |
e092a2ece99b
(Fcall_interactively): Add 'U' code to get the up-event discarded by a
Kim F. Storm <storm@cua.dk>
parents:
56571
diff
changeset
|
637 up_event = Qnil; |
e092a2ece99b
(Fcall_interactively): Add 'U' code to get the up-event discarded by a
Kim F. Storm <storm@cua.dk>
parents:
56571
diff
changeset
|
638 teml = args[i]; |
e092a2ece99b
(Fcall_interactively): Add 'U' code to get the up-event discarded by a
Kim F. Storm <storm@cua.dk>
parents:
56571
diff
changeset
|
639 visargs[i] = Fkey_description (teml, Qnil); |
e092a2ece99b
(Fcall_interactively): Add 'U' code to get the up-event discarded by a
Kim F. Storm <storm@cua.dk>
parents:
56571
diff
changeset
|
640 } |
e092a2ece99b
(Fcall_interactively): Add 'U' code to get the up-event discarded by a
Kim F. Storm <storm@cua.dk>
parents:
56571
diff
changeset
|
641 break; |
e092a2ece99b
(Fcall_interactively): Add 'U' code to get the up-event discarded by a
Kim F. Storm <storm@cua.dk>
parents:
56571
diff
changeset
|
642 |
1383
54028d2538a4
* callint.c (Fcall_interactively): Allow multiple 'e' specs.
Jim Blandy <jimb@redhat.com>
parents:
1347
diff
changeset
|
643 case 'e': /* The invoking event. */ |
13308
99457b67e20c
(Fcall_interactively): New arg KEYS.
Richard M. Stallman <rms@gnu.org>
parents:
13142
diff
changeset
|
644 if (next_event >= key_count) |
1383
54028d2538a4
* callint.c (Fcall_interactively): Allow multiple 'e' specs.
Jim Blandy <jimb@redhat.com>
parents:
1347
diff
changeset
|
645 error ("%s must be bound to an event with parameters", |
9145
dda75a4dbbfb
(quotify_arg, Fcall_interactively, Fprefix_numeric_value): Use type test
Karl Heuer <kwzh@gnu.org>
parents:
9100
diff
changeset
|
646 (SYMBOLP (function) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
647 ? (char *) SDATA (SYMBOL_NAME (function)) |
1383
54028d2538a4
* callint.c (Fcall_interactively): Allow multiple 'e' specs.
Jim Blandy <jimb@redhat.com>
parents:
1347
diff
changeset
|
648 : "command")); |
13308
99457b67e20c
(Fcall_interactively): New arg KEYS.
Richard M. Stallman <rms@gnu.org>
parents:
13142
diff
changeset
|
649 args[i] = XVECTOR (keys)->contents[next_event++]; |
732 | 650 varies[i] = -1; |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1693
diff
changeset
|
651 |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1693
diff
changeset
|
652 /* Find the next parameterized event. */ |
13308
99457b67e20c
(Fcall_interactively): New arg KEYS.
Richard M. Stallman <rms@gnu.org>
parents:
13142
diff
changeset
|
653 while (next_event < key_count |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1693
diff
changeset
|
654 && ! (EVENT_HAS_PARAMETERS |
13308
99457b67e20c
(Fcall_interactively): New arg KEYS.
Richard M. Stallman <rms@gnu.org>
parents:
13142
diff
changeset
|
655 (XVECTOR (keys)->contents[next_event]))) |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1693
diff
changeset
|
656 next_event++; |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1693
diff
changeset
|
657 |
438 | 658 break; |
659 | |
407 | 660 case 'm': /* Value of mark. Does not do I/O. */ |
43039
531bd3a9e67a
(check_mark): New arg to specify clearer error message.
Richard M. Stallman <rms@gnu.org>
parents:
42272
diff
changeset
|
661 check_mark (0); |
407 | 662 /* visargs[i] = Qnil; */ |
10803
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
663 args[i] = current_buffer->mark; |
407 | 664 varies[i] = 2; |
665 break; | |
666 | |
19548
b275154db0cb
(Finteractive): Document the code letter `M'.
Kenichi Handa <handa@m17n.org>
parents:
17958
diff
changeset
|
667 case 'M': /* String read via minibuffer with |
b275154db0cb
(Finteractive): Document the code letter `M'.
Kenichi Handa <handa@m17n.org>
parents:
17958
diff
changeset
|
668 inheriting the current input method. */ |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
669 args[i] = Fread_string (callint_message, |
19548
b275154db0cb
(Finteractive): Document the code letter `M'.
Kenichi Handa <handa@m17n.org>
parents:
17958
diff
changeset
|
670 Qnil, Qnil, Qnil, Qt); |
b275154db0cb
(Finteractive): Document the code letter `M'.
Kenichi Handa <handa@m17n.org>
parents:
17958
diff
changeset
|
671 break; |
b275154db0cb
(Finteractive): Document the code letter `M'.
Kenichi Handa <handa@m17n.org>
parents:
17958
diff
changeset
|
672 |
74912
4c1d868b634b
(Finteractive): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
73441
diff
changeset
|
673 case 'N': /* Prefix arg as number, else number from minibuffer */ |
485 | 674 if (!NILP (prefix_arg)) |
407 | 675 goto have_prefix_arg; |
676 case 'n': /* Read number from minibuffer. */ | |
15961
e26f5c2b75a6
(Fcall_interactively): For `N' and `n',
Richard M. Stallman <rms@gnu.org>
parents:
14847
diff
changeset
|
677 { |
e26f5c2b75a6
(Fcall_interactively): For `N' and `n',
Richard M. Stallman <rms@gnu.org>
parents:
14847
diff
changeset
|
678 int first = 1; |
e26f5c2b75a6
(Fcall_interactively): For `N' and `n',
Richard M. Stallman <rms@gnu.org>
parents:
14847
diff
changeset
|
679 do |
e26f5c2b75a6
(Fcall_interactively): For `N' and `n',
Richard M. Stallman <rms@gnu.org>
parents:
14847
diff
changeset
|
680 { |
e26f5c2b75a6
(Fcall_interactively): For `N' and `n',
Richard M. Stallman <rms@gnu.org>
parents:
14847
diff
changeset
|
681 Lisp_Object tem; |
71800
68b2027cba70
(Fcall_interactively): Update/simplify sit_for calls.
Kim F. Storm <storm@cua.dk>
parents:
70940
diff
changeset
|
682 if (! first) |
15961
e26f5c2b75a6
(Fcall_interactively): For `N' and `n',
Richard M. Stallman <rms@gnu.org>
parents:
14847
diff
changeset
|
683 { |
e26f5c2b75a6
(Fcall_interactively): For `N' and `n',
Richard M. Stallman <rms@gnu.org>
parents:
14847
diff
changeset
|
684 message ("Please enter a number."); |
71800
68b2027cba70
(Fcall_interactively): Update/simplify sit_for calls.
Kim F. Storm <storm@cua.dk>
parents:
70940
diff
changeset
|
685 sit_for (make_number (1), 0, 0); |
15961
e26f5c2b75a6
(Fcall_interactively): For `N' and `n',
Richard M. Stallman <rms@gnu.org>
parents:
14847
diff
changeset
|
686 } |
e26f5c2b75a6
(Fcall_interactively): For `N' and `n',
Richard M. Stallman <rms@gnu.org>
parents:
14847
diff
changeset
|
687 first = 0; |
e26f5c2b75a6
(Fcall_interactively): For `N' and `n',
Richard M. Stallman <rms@gnu.org>
parents:
14847
diff
changeset
|
688 |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
689 tem = Fread_from_minibuffer (callint_message, |
19548
b275154db0cb
(Finteractive): Document the code letter `M'.
Kenichi Handa <handa@m17n.org>
parents:
17958
diff
changeset
|
690 Qnil, Qnil, Qnil, Qnil, Qnil, |
70940
0143e273eaa8
(Fcall_interactively): Fread_from_minibuffer now takes only seven args.
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
691 Qnil); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
692 if (! STRINGP (tem) || SCHARS (tem) == 0) |
15961
e26f5c2b75a6
(Fcall_interactively): For `N' and `n',
Richard M. Stallman <rms@gnu.org>
parents:
14847
diff
changeset
|
693 args[i] = Qnil; |
e26f5c2b75a6
(Fcall_interactively): For `N' and `n',
Richard M. Stallman <rms@gnu.org>
parents:
14847
diff
changeset
|
694 else |
e26f5c2b75a6
(Fcall_interactively): For `N' and `n',
Richard M. Stallman <rms@gnu.org>
parents:
14847
diff
changeset
|
695 args[i] = Fread (tem); |
e26f5c2b75a6
(Fcall_interactively): For `N' and `n',
Richard M. Stallman <rms@gnu.org>
parents:
14847
diff
changeset
|
696 } |
e26f5c2b75a6
(Fcall_interactively): For `N' and `n',
Richard M. Stallman <rms@gnu.org>
parents:
14847
diff
changeset
|
697 while (! NUMBERP (args[i])); |
e26f5c2b75a6
(Fcall_interactively): For `N' and `n',
Richard M. Stallman <rms@gnu.org>
parents:
14847
diff
changeset
|
698 } |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
699 visargs[i] = args[i]; |
407 | 700 break; |
701 | |
702 case 'P': /* Prefix arg in raw form. Does no I/O. */ | |
703 args[i] = prefix_arg; | |
704 /* visargs[i] = Qnil; */ | |
705 varies[i] = -1; | |
706 break; | |
707 | |
708 case 'p': /* Prefix arg converted to number. No I/O. */ | |
13764
db7fb833ba03
(Fcall_interactively): Handle an arg of form (FCN ARGS...).
Karl Heuer <kwzh@gnu.org>
parents:
13754
diff
changeset
|
709 have_prefix_arg: |
407 | 710 args[i] = Fprefix_numeric_value (prefix_arg); |
711 /* visargs[i] = Qnil; */ | |
712 varies[i] = -1; | |
713 break; | |
714 | |
715 case 'r': /* Region, point and mark as 2 args. */ | |
43039
531bd3a9e67a
(check_mark): New arg to specify clearer error message.
Richard M. Stallman <rms@gnu.org>
parents:
42272
diff
changeset
|
716 check_mark (1); |
20552
1a0cb8cd5615
(Fcall_interactively) <'d', 'r'>: Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
19759
diff
changeset
|
717 set_marker_both (point_marker, Qnil, PT, PT_BYTE); |
407 | 718 /* visargs[i+1] = Qnil; */ |
719 foo = marker_position (current_buffer->mark); | |
720 /* visargs[i] = Qnil; */ | |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15961
diff
changeset
|
721 args[i] = PT < foo ? point_marker : current_buffer->mark; |
407 | 722 varies[i] = 3; |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15961
diff
changeset
|
723 args[++i] = PT > foo ? point_marker : current_buffer->mark; |
407 | 724 varies[i] = 4; |
725 break; | |
726 | |
19548
b275154db0cb
(Finteractive): Document the code letter `M'.
Kenichi Handa <handa@m17n.org>
parents:
17958
diff
changeset
|
727 case 's': /* String read via minibuffer without |
b275154db0cb
(Finteractive): Document the code letter `M'.
Kenichi Handa <handa@m17n.org>
parents:
17958
diff
changeset
|
728 inheriting the current input method. */ |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
729 args[i] = Fread_string (callint_message, |
19548
b275154db0cb
(Finteractive): Document the code letter `M'.
Kenichi Handa <handa@m17n.org>
parents:
17958
diff
changeset
|
730 Qnil, Qnil, Qnil, Qnil); |
407 | 731 break; |
732 | |
733 case 'S': /* Any symbol. */ | |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
734 visargs[i] = Fread_string (callint_message, |
19548
b275154db0cb
(Finteractive): Document the code letter `M'.
Kenichi Handa <handa@m17n.org>
parents:
17958
diff
changeset
|
735 Qnil, Qnil, Qnil, Qnil); |
407 | 736 /* Passing args[i] directly stimulates compiler bug */ |
737 teml = visargs[i]; | |
738 args[i] = Fintern (teml, Qnil); | |
739 break; | |
740 | |
741 case 'v': /* Variable name: symbol that is | |
742 user-variable-p. */ | |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
743 args[i] = Fread_variable (callint_message, Qnil); |
407 | 744 visargs[i] = last_minibuf_string; |
745 break; | |
746 | |
747 case 'x': /* Lisp expression read but not evaluated */ | |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
748 args[i] = Fread_minibuffer (callint_message, Qnil); |
407 | 749 visargs[i] = last_minibuf_string; |
750 break; | |
751 | |
752 case 'X': /* Lisp expression read and evaluated */ | |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
753 args[i] = Feval_minibuffer (callint_message, Qnil); |
407 | 754 visargs[i] = last_minibuf_string; |
755 break; | |
756 | |
17024
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
757 case 'Z': /* Coding-system symbol, or ignore the |
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
758 argument if no prefix */ |
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
759 if (NILP (prefix_arg)) |
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
760 { |
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
761 args[i] = Qnil; |
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
762 varies[i] = -1; |
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
763 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48630
diff
changeset
|
764 else |
17024
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
765 { |
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
766 args[i] |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
767 = Fread_non_nil_coding_system (callint_message); |
17024
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
768 visargs[i] = last_minibuf_string; |
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
769 } |
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
770 break; |
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
771 |
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
772 case 'z': /* Coding-system symbol or nil */ |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
773 args[i] = Fread_coding_system (callint_message, Qnil); |
17024
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
774 visargs[i] = last_minibuf_string; |
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
775 break; |
6cfba7f41dca
(doc-string of `interactive'): Describe new code
Karl Heuer <kwzh@gnu.org>
parents:
16363
diff
changeset
|
776 |
11278
25b2219c415c
(Fcall_interactively): `+' is reserved for user changes.
Richard M. Stallman <rms@gnu.org>
parents:
11009
diff
changeset
|
777 /* We have a case for `+' so we get an error |
25b2219c415c
(Fcall_interactively): `+' is reserved for user changes.
Richard M. Stallman <rms@gnu.org>
parents:
11009
diff
changeset
|
778 if anyone tries to define one here. */ |
25b2219c415c
(Fcall_interactively): `+' is reserved for user changes.
Richard M. Stallman <rms@gnu.org>
parents:
11009
diff
changeset
|
779 case '+': |
407 | 780 default: |
11278
25b2219c415c
(Fcall_interactively): `+' is reserved for user changes.
Richard M. Stallman <rms@gnu.org>
parents:
11009
diff
changeset
|
781 error ("Invalid control letter `%c' (%03o) in interactive calling string", |
407 | 782 *tem, *tem); |
783 } | |
784 | |
785 if (varies[i] == 0) | |
786 arg_from_tty = 1; | |
787 | |
9145
dda75a4dbbfb
(quotify_arg, Fcall_interactively, Fprefix_numeric_value): Use type test
Karl Heuer <kwzh@gnu.org>
parents:
9100
diff
changeset
|
788 if (NILP (visargs[i]) && STRINGP (args[i])) |
407 | 789 visargs[i] = args[i]; |
790 | |
791 tem = (unsigned char *) index (tem, '\n'); | |
792 if (tem) tem++; | |
793 else tem = (unsigned char *) ""; | |
794 } | |
873 | 795 unbind_to (speccount, Qnil); |
407 | 796 |
797 QUIT; | |
798 | |
799 args[0] = function; | |
800 | |
14062
16a05061fee3
(Fcall_interactively, Fprefix_numeric_value): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13843
diff
changeset
|
801 if (arg_from_tty || !NILP (record_flag)) |
407 | 802 { |
803 visargs[0] = function; | |
438 | 804 for (i = 1; i < count + 1; i++) |
10803
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
805 { |
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
806 if (varies[i] > 0) |
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
807 visargs[i] = Fcons (intern (callint_argfuns[varies[i]]), Qnil); |
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
808 else |
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
809 visargs[i] = quotify_arg (args[i]); |
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
810 } |
407 | 811 Vcommand_history = Fcons (Flist (count + 1, visargs), |
812 Vcommand_history); | |
21721
46ffb5302c40
(Fcall_interactively): Truncate command-history here.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
813 /* Don't keep command history around forever. */ |
44405
0ed69545b5f3
(Fcall_interactively): Use INTEGERP instead of
Gerd Moellmann <gerd@gnu.org>
parents:
43039
diff
changeset
|
814 if (INTEGERP (Vhistory_length) && XINT (Vhistory_length) > 0) |
21721
46ffb5302c40
(Fcall_interactively): Truncate command-history here.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
815 { |
46ffb5302c40
(Fcall_interactively): Truncate command-history here.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
816 teml = Fnthcdr (Vhistory_length, Vcommand_history); |
46ffb5302c40
(Fcall_interactively): Truncate command-history here.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
817 if (CONSP (teml)) |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39945
diff
changeset
|
818 XSETCDR (teml, Qnil); |
21721
46ffb5302c40
(Fcall_interactively): Truncate command-history here.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
819 } |
407 | 820 } |
821 | |
10803
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
822 /* If we used a marker to hold point, mark, or an end of the region, |
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
823 temporarily, convert it to an integer now. */ |
10917
283f18021929
(Fcall_interactively): Fix Feb 22 change.
Richard M. Stallman <rms@gnu.org>
parents:
10904
diff
changeset
|
824 for (i = 1; i <= count; i++) |
10803
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
825 if (varies[i] >= 1 && varies[i] <= 4) |
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
826 XSETINT (args[i], marker_position (args[i])); |
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
827 |
48527
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
828 if (record_then_fail) |
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
829 Fbarf_if_buffer_read_only (); |
ba7cb9f8dfc3
(Fcall_interactively): If a command fails because
Richard M. Stallman <rms@gnu.org>
parents:
48150
diff
changeset
|
830 |
52374
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
831 Vthis_command = save_this_command; |
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
832 Vthis_original_command = save_this_original_command; |
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
833 real_this_command= save_real_this_command; |
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
834 current_kboard->Vlast_command = save_last_command; |
1b48f538540b
(Fcall_interactively): Save and restore Vthis_command, Vthis_original_command,
Richard M. Stallman <rms@gnu.org>
parents:
51048
diff
changeset
|
835 |
407 | 836 { |
837 Lisp_Object val; | |
838 specbind (Qcommand_debug_status, Qnil); | |
839 | |
83449
ff74a86c2b16
Overhaul and simplify single_kboard API. Allow calls to `recursive-edit' in process filters. Small fixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83374
diff
changeset
|
840 temporarily_switch_to_single_kboard (NULL); |
407 | 841 val = Ffuncall (count + 1, args); |
842 UNGCPRO; | |
843 return unbind_to (speccount, val); | |
844 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48630
diff
changeset
|
845 } |
407 | 846 |
847 DEFUN ("prefix-numeric-value", Fprefix_numeric_value, Sprefix_numeric_value, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
848 1, 1, 0, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
849 doc: /* Return numeric meaning of raw prefix argument RAW. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
850 A raw prefix argument is what you get from `(interactive "P")'. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
851 Its numeric meaning is what you would get from `(interactive "p")'. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
852 (raw) |
407 | 853 Lisp_Object raw; |
854 { | |
855 Lisp_Object val; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48630
diff
changeset
|
856 |
485 | 857 if (NILP (raw)) |
9298
6e3aea54fc01
(Fcall_interactively, Fprefix_numeric_value): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9290
diff
changeset
|
858 XSETFASTINT (val, 1); |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
732
diff
changeset
|
859 else if (EQ (raw, Qminus)) |
407 | 860 XSETINT (val, -1); |
25645
a14111a2a100
Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
24911
diff
changeset
|
861 else if (CONSP (raw) && INTEGERP (XCAR (raw))) |
a14111a2a100
Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
24911
diff
changeset
|
862 XSETINT (val, XINT (XCAR (raw))); |
9145
dda75a4dbbfb
(quotify_arg, Fcall_interactively, Fprefix_numeric_value): Use type test
Karl Heuer <kwzh@gnu.org>
parents:
9100
diff
changeset
|
863 else if (INTEGERP (raw)) |
407 | 864 val = raw; |
865 else | |
9298
6e3aea54fc01
(Fcall_interactively, Fprefix_numeric_value): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9290
diff
changeset
|
866 XSETFASTINT (val, 1); |
407 | 867 |
868 return val; | |
869 } | |
870 | |
21514 | 871 void |
407 | 872 syms_of_callint () |
873 { | |
10803
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
874 point_marker = Fmake_marker (); |
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
875 staticpro (&point_marker); |
b8c4a1b7d484
(Fcall_interactively): Use markers temporarily in
Richard M. Stallman <rms@gnu.org>
parents:
10756
diff
changeset
|
876 |
73441
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
877 callint_message = Qnil; |
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
878 staticpro (&callint_message); |
82ed0adffca9
* callint.c (callint_message): Convert to a Lisp string.
Chong Yidong <cyd@stupidchicken.com>
parents:
73120
diff
changeset
|
879 |
1498
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
880 preserved_fns = Fcons (intern ("region-beginning"), |
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
881 Fcons (intern ("region-end"), |
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
882 Fcons (intern ("point"), |
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
883 Fcons (intern ("mark"), Qnil)))); |
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
884 staticpro (&preserved_fns); |
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
885 |
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
886 Qlist = intern ("list"); |
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
887 staticpro (&Qlist); |
13447
8c89b569cfa9
(syms_of_callint): Set up Qlet, Qletx, Qsave_excursion.
Richard M. Stallman <rms@gnu.org>
parents:
13308
diff
changeset
|
888 Qlet = intern ("let"); |
8c89b569cfa9
(syms_of_callint): Set up Qlet, Qletx, Qsave_excursion.
Richard M. Stallman <rms@gnu.org>
parents:
13308
diff
changeset
|
889 staticpro (&Qlet); |
49932
2f5cdffaaa04
(fix_command): New subroutine, from Fcall_interactively.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
890 Qif = intern ("if"); |
2f5cdffaaa04
(fix_command): New subroutine, from Fcall_interactively.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
891 staticpro (&Qif); |
2f5cdffaaa04
(fix_command): New subroutine, from Fcall_interactively.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
892 Qwhen = intern ("when"); |
2f5cdffaaa04
(fix_command): New subroutine, from Fcall_interactively.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
893 staticpro (&Qwhen); |
13447
8c89b569cfa9
(syms_of_callint): Set up Qlet, Qletx, Qsave_excursion.
Richard M. Stallman <rms@gnu.org>
parents:
13308
diff
changeset
|
894 Qletx = intern ("let*"); |
8c89b569cfa9
(syms_of_callint): Set up Qlet, Qletx, Qsave_excursion.
Richard M. Stallman <rms@gnu.org>
parents:
13308
diff
changeset
|
895 staticpro (&Qletx); |
8c89b569cfa9
(syms_of_callint): Set up Qlet, Qletx, Qsave_excursion.
Richard M. Stallman <rms@gnu.org>
parents:
13308
diff
changeset
|
896 Qsave_excursion = intern ("save-excursion"); |
8c89b569cfa9
(syms_of_callint): Set up Qlet, Qletx, Qsave_excursion.
Richard M. Stallman <rms@gnu.org>
parents:
13308
diff
changeset
|
897 staticpro (&Qsave_excursion); |
48150
2b5f7e1254d1
(Fcall_interactively): New local filter_specs.
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
898 Qprogn = intern ("progn"); |
2b5f7e1254d1
(Fcall_interactively): New local filter_specs.
Richard M. Stallman <rms@gnu.org>
parents:
46370
diff
changeset
|
899 staticpro (&Qprogn); |
1498
098464e977d6
(preserved_fns): New var.
Richard M. Stallman <rms@gnu.org>
parents:
1425
diff
changeset
|
900 |
407 | 901 Qminus = intern ("-"); |
902 staticpro (&Qminus); | |
903 | |
9100 | 904 Qplus = intern ("+"); |
905 staticpro (&Qplus); | |
906 | |
407 | 907 Qcall_interactively = intern ("call-interactively"); |
908 staticpro (&Qcall_interactively); | |
909 | |
910 Qcommand_debug_status = intern ("command-debug-status"); | |
911 staticpro (&Qcommand_debug_status); | |
912 | |
873 | 913 Qenable_recursive_minibuffers = intern ("enable-recursive-minibuffers"); |
914 staticpro (&Qenable_recursive_minibuffers); | |
915 | |
10279
89cf458ed188
(Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
9342
diff
changeset
|
916 Qmouse_leave_buffer_hook = intern ("mouse-leave-buffer-hook"); |
89cf458ed188
(Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
9342
diff
changeset
|
917 staticpro (&Qmouse_leave_buffer_hook); |
89cf458ed188
(Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
9342
diff
changeset
|
918 |
12117
3fa5b6e7ad4b
(current_prefix_partial): Deleted.
Karl Heuer <kwzh@gnu.org>
parents:
11911
diff
changeset
|
919 DEFVAR_KBOARD ("prefix-arg", Vprefix_arg, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
920 doc: /* The value of the prefix argument for the next editing command. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
921 It may be a number, or the symbol `-' for just a minus sign as arg, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
922 or a list whose car is a number for just one or more C-u's |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
923 or nil if no argument has been specified. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
924 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
925 You cannot examine this variable to find the argument for this command |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
926 since it has been set to nil by the time you can look. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
927 Instead, you should use the variable `current-prefix-arg', although |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
928 normally commands can get this prefix argument with (interactive "P"). */); |
10857
2b9faff73319
(Fcall_interactively, syms_of_callint, Vprefix_arg, Vcurrent_prefix_arg): Undo
Karl Heuer <kwzh@gnu.org>
parents:
10846
diff
changeset
|
929 |
22383
9ef0fe84c5ed
(syms_of_callint): Set up Lisp variable.
Richard M. Stallman <rms@gnu.org>
parents:
22244
diff
changeset
|
930 DEFVAR_KBOARD ("last-prefix-arg", Vlast_prefix_arg, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
931 doc: /* The value of the prefix argument for the previous editing command. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
932 See `prefix-arg' for the meaning of the value. */); |
22383
9ef0fe84c5ed
(syms_of_callint): Set up Lisp variable.
Richard M. Stallman <rms@gnu.org>
parents:
22244
diff
changeset
|
933 |
10857
2b9faff73319
(Fcall_interactively, syms_of_callint, Vprefix_arg, Vcurrent_prefix_arg): Undo
Karl Heuer <kwzh@gnu.org>
parents:
10846
diff
changeset
|
934 DEFVAR_LISP ("current-prefix-arg", &Vcurrent_prefix_arg, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
935 doc: /* The value of the prefix argument for this editing command. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
936 It may be a number, or the symbol `-' for just a minus sign as arg, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
937 or a list whose car is a number for just one or more C-u's |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
938 or nil if no argument has been specified. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
939 This is what `(interactive \"P\")' returns. */); |
10857
2b9faff73319
(Fcall_interactively, syms_of_callint, Vprefix_arg, Vcurrent_prefix_arg): Undo
Karl Heuer <kwzh@gnu.org>
parents:
10846
diff
changeset
|
940 Vcurrent_prefix_arg = Qnil; |
2b9faff73319
(Fcall_interactively, syms_of_callint, Vprefix_arg, Vcurrent_prefix_arg): Undo
Karl Heuer <kwzh@gnu.org>
parents:
10846
diff
changeset
|
941 |
407 | 942 DEFVAR_LISP ("command-history", &Vcommand_history, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
943 doc: /* List of recent commands that read arguments from terminal. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
944 Each command is represented as a form to evaluate. */); |
407 | 945 Vcommand_history = Qnil; |
946 | |
947 DEFVAR_LISP ("command-debug-status", &Vcommand_debug_status, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
948 doc: /* Debugging status of current interactive command. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
949 Bound each time `call-interactively' is called; |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
950 may be set by the debugger as a reminder for itself. */); |
407 | 951 Vcommand_debug_status = Qnil; |
952 | |
4046
79184227e7f9
(syms_of_callint): Fix DEFVAR_LISP for Vmark_even_if_inactive to use right
Roland McGrath <roland@gnu.org>
parents:
4039
diff
changeset
|
953 DEFVAR_LISP ("mark-even-if-inactive", &Vmark_even_if_inactive, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
954 doc: /* *Non-nil means you can use the mark even when inactive. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
955 This option makes a difference in Transient Mark mode. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
956 When the option is non-nil, deactivation of the mark |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
957 turns off region highlighting, but commands that use the mark |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
958 behave as if the mark were still active. */); |
3975
718280a1ba74
(Vmark_even_if_inactive): New var, with Lisp variable.
Richard M. Stallman <rms@gnu.org>
parents:
2048
diff
changeset
|
959 Vmark_even_if_inactive = Qnil; |
718280a1ba74
(Vmark_even_if_inactive): New var, with Lisp variable.
Richard M. Stallman <rms@gnu.org>
parents:
2048
diff
changeset
|
960 |
10279
89cf458ed188
(Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
9342
diff
changeset
|
961 DEFVAR_LISP ("mouse-leave-buffer-hook", &Vmouse_leave_buffer_hook, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
962 doc: /* Hook to run when about to switch windows with a mouse command. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
963 Its purpose is to give temporary modes such as Isearch mode |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
964 a way to turn themselves off when a mouse command switches windows. */); |
10279
89cf458ed188
(Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
9342
diff
changeset
|
965 Vmouse_leave_buffer_hook = Qnil; |
89cf458ed188
(Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
9342
diff
changeset
|
966 |
407 | 967 defsubr (&Sinteractive); |
968 defsubr (&Scall_interactively); | |
969 defsubr (&Sprefix_numeric_value); | |
970 } | |
52401 | 971 |
972 /* arch-tag: a3a7cad7-bcac-42ce-916e-1bd2546ebf37 | |
973 (do not change this comment) */ |