Mercurial > emacs
annotate src/cmds.c @ 10762:6ca3a749bebc
(ALL_CFLAGS): Allow include files to be found in
`srcdir'.
author | Paul Reilly <pmr@pajato.com> |
---|---|
date | Wed, 15 Feb 1995 19:11:32 +0000 |
parents | fb4f688fc2cf |
children | 4887c9593b79 |
rev | line source |
---|---|
239 | 1 /* Simple built-in editing commands. |
7307 | 2 Copyright (C) 1985, 1993, 1994 Free Software Foundation, Inc. |
239 | 3 |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 it under the terms of the GNU General Public License as published by | |
647 | 8 the Free Software Foundation; either version 2, or (at your option) |
239 | 9 any later version. |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |
19 | |
20 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4561
diff
changeset
|
21 #include <config.h> |
239 | 22 #include "lisp.h" |
23 #include "commands.h" | |
24 #include "buffer.h" | |
25 #include "syntax.h" | |
8755 | 26 #include "window.h" |
239 | 27 |
28 Lisp_Object Qkill_forward_chars, Qkill_backward_chars, Vblink_paren_function; | |
10425
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
29 Lisp_Object Vuse_hard_newlines; |
239 | 30 |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
31 /* A possible value for a buffer's overwrite-mode variable. */ |
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
32 Lisp_Object Qoverwrite_mode_binary; |
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
33 |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
34 /* Non-nil means put this face on the next self-inserting character. */ |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
35 Lisp_Object Vself_insert_face; |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
36 |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
37 /* This is the command that set up Vself_insert_face. */ |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
38 Lisp_Object Vself_insert_face_command; |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
39 |
10425
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
40 #ifdef USE_TEXT_PROPERTIES |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
41 Lisp_Object Qhard; |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
42 #endif |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
43 |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
44 extern Lisp_Object Qface; |
239 | 45 |
46 DEFUN ("forward-char", Fforward_char, Sforward_char, 0, 1, "p", | |
47 "Move point right ARG characters (left if ARG negative).\n\ | |
48 On reaching end of buffer, stop and signal error.") | |
49 (n) | |
50 Lisp_Object n; | |
51 { | |
485 | 52 if (NILP (n)) |
9300
84822d6ed3be
(Fforward_char, Fbackward_char, Fbeginning_of_line, Fend_of_line): Don't use
Karl Heuer <kwzh@gnu.org>
parents:
9135
diff
changeset
|
53 XSETFASTINT (n, 1); |
239 | 54 else |
55 CHECK_NUMBER (n, 0); | |
56 | |
2777
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
57 /* This used to just set point to point + XINT (n), and then check |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
58 to see if it was within boundaries. But now that SET_PT can |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
59 potentially do a lot of stuff (calling entering and exiting |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
60 hooks, etcetera), that's not a good approach. So we validate the |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
61 proposed position, then set point. */ |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
62 { |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
63 int new_point = point + XINT (n); |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
64 |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
65 if (new_point < BEGV) |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
66 { |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
67 SET_PT (BEGV); |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
68 Fsignal (Qbeginning_of_buffer, Qnil); |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
69 } |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
70 if (new_point > ZV) |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
71 { |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
72 SET_PT (ZV); |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
73 Fsignal (Qend_of_buffer, Qnil); |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
74 } |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
75 |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
76 SET_PT (new_point); |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
77 } |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
78 |
239 | 79 return Qnil; |
80 } | |
81 | |
82 DEFUN ("backward-char", Fbackward_char, Sbackward_char, 0, 1, "p", | |
83 "Move point left ARG characters (right if ARG negative).\n\ | |
84 On attempt to pass beginning or end of buffer, stop and signal error.") | |
85 (n) | |
86 Lisp_Object n; | |
87 { | |
485 | 88 if (NILP (n)) |
9300
84822d6ed3be
(Fforward_char, Fbackward_char, Fbeginning_of_line, Fend_of_line): Don't use
Karl Heuer <kwzh@gnu.org>
parents:
9135
diff
changeset
|
89 XSETFASTINT (n, 1); |
239 | 90 else |
91 CHECK_NUMBER (n, 0); | |
92 | |
93 XSETINT (n, - XINT (n)); | |
94 return Fforward_char (n); | |
95 } | |
96 | |
97 DEFUN ("forward-line", Fforward_line, Sforward_line, 0, 1, "p", | |
98 "Move ARG lines forward (backward if ARG is negative).\n\ | |
99 Precisely, if point is on line I, move to the start of line I + ARG.\n\ | |
100 If there isn't room, go as far as possible (no error).\n\ | |
101 Returns the count of lines left to move. If moving forward,\n\ | |
102 that is ARG - number of lines moved; if backward, ARG + number moved.\n\ | |
103 With positive ARG, a non-empty line at the end counts as one line\n\ | |
104 successfully moved (for the return value).") | |
105 (n) | |
106 Lisp_Object n; | |
107 { | |
108 int pos2 = point; | |
109 int pos; | |
110 int count, shortage, negp; | |
111 | |
485 | 112 if (NILP (n)) |
239 | 113 count = 1; |
114 else | |
115 { | |
116 CHECK_NUMBER (n, 0); | |
117 count = XINT (n); | |
118 } | |
119 | |
120 negp = count <= 0; | |
9405
b7f3059c308a
* cmds.c (Fforward_line): Call scan_buffer with new args.
Jim Blandy <jimb@redhat.com>
parents:
9332
diff
changeset
|
121 pos = scan_buffer ('\n', pos2, 0, count - negp, &shortage, 1); |
239 | 122 if (shortage > 0 |
123 && (negp | |
647 | 124 || (ZV > BEGV |
125 && pos != pos2 | |
239 | 126 && FETCH_CHAR (pos - 1) != '\n'))) |
127 shortage--; | |
128 SET_PT (pos); | |
129 return make_number (negp ? - shortage : shortage); | |
130 } | |
131 | |
132 DEFUN ("beginning-of-line", Fbeginning_of_line, Sbeginning_of_line, | |
133 0, 1, "p", | |
134 "Move point to beginning of current line.\n\ | |
135 With argument ARG not nil or 1, move forward ARG - 1 lines first.\n\ | |
136 If scan reaches end of buffer, stop there without error.") | |
137 (n) | |
138 Lisp_Object n; | |
139 { | |
485 | 140 if (NILP (n)) |
9300
84822d6ed3be
(Fforward_char, Fbackward_char, Fbeginning_of_line, Fend_of_line): Don't use
Karl Heuer <kwzh@gnu.org>
parents:
9135
diff
changeset
|
141 XSETFASTINT (n, 1); |
239 | 142 else |
143 CHECK_NUMBER (n, 0); | |
144 | |
145 Fforward_line (make_number (XINT (n) - 1)); | |
146 return Qnil; | |
147 } | |
148 | |
149 DEFUN ("end-of-line", Fend_of_line, Send_of_line, | |
150 0, 1, "p", | |
151 "Move point to end of current line.\n\ | |
152 With argument ARG not nil or 1, move forward ARG - 1 lines first.\n\ | |
153 If scan reaches end of buffer, stop there without error.") | |
154 (n) | |
155 Lisp_Object n; | |
156 { | |
157 register int pos; | |
158 register int stop; | |
159 | |
485 | 160 if (NILP (n)) |
9300
84822d6ed3be
(Fforward_char, Fbackward_char, Fbeginning_of_line, Fend_of_line): Don't use
Karl Heuer <kwzh@gnu.org>
parents:
9135
diff
changeset
|
161 XSETFASTINT (n, 1); |
239 | 162 else |
163 CHECK_NUMBER (n, 0); | |
164 | |
9405
b7f3059c308a
* cmds.c (Fforward_line): Call scan_buffer with new args.
Jim Blandy <jimb@redhat.com>
parents:
9332
diff
changeset
|
165 SET_PT (find_before_next_newline (PT, 0, XINT (n) - (XINT (n) <= 0))); |
239 | 166 |
167 return Qnil; | |
168 } | |
169 | |
170 DEFUN ("delete-char", Fdelete_char, Sdelete_char, 1, 2, "p\nP", | |
171 "Delete the following ARG characters (previous, with negative arg).\n\ | |
172 Optional second arg KILLFLAG non-nil means kill instead (save in kill ring).\n\ | |
173 Interactively, ARG is the prefix arg, and KILLFLAG is set if\n\ | |
174 ARG was explicitly specified.") | |
175 (n, killflag) | |
176 Lisp_Object n, killflag; | |
177 { | |
178 CHECK_NUMBER (n, 0); | |
179 | |
485 | 180 if (NILP (killflag)) |
239 | 181 { |
182 if (XINT (n) < 0) | |
183 { | |
184 if (point + XINT (n) < BEGV) | |
185 Fsignal (Qbeginning_of_buffer, Qnil); | |
186 else | |
187 del_range (point + XINT (n), point); | |
188 } | |
189 else | |
190 { | |
191 if (point + XINT (n) > ZV) | |
192 Fsignal (Qend_of_buffer, Qnil); | |
193 else | |
194 del_range (point, point + XINT (n)); | |
195 } | |
196 } | |
197 else | |
198 { | |
199 call1 (Qkill_forward_chars, n); | |
200 } | |
201 return Qnil; | |
202 } | |
203 | |
204 DEFUN ("delete-backward-char", Fdelete_backward_char, Sdelete_backward_char, | |
205 1, 2, "p\nP", | |
206 "Delete the previous ARG characters (following, with negative ARG).\n\ | |
207 Optional second arg KILLFLAG non-nil means kill instead (save in kill ring).\n\ | |
208 Interactively, ARG is the prefix arg, and KILLFLAG is set if\n\ | |
209 ARG was explicitly specified.") | |
210 (n, killflag) | |
211 Lisp_Object n, killflag; | |
212 { | |
213 CHECK_NUMBER (n, 0); | |
214 return Fdelete_char (make_number (-XINT (n)), killflag); | |
215 } | |
216 | |
217 DEFUN ("self-insert-command", Fself_insert_command, Sself_insert_command, 1, 1, "p", | |
218 "Insert the character you type.\n\ | |
219 Whichever character you type to run this command is inserted.") | |
220 (arg) | |
221 Lisp_Object arg; | |
222 { | |
223 CHECK_NUMBER (arg, 0); | |
224 | |
225 /* Barf if the key that invoked this was not a character. */ | |
9135
551c9e4fa12a
(Fself_insert_command): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
8755
diff
changeset
|
226 if (!INTEGERP (last_command_char)) |
239 | 227 bitch_at_user (); |
228 else | |
229 while (XINT (arg) > 0) | |
230 { | |
9332
1ff5359ac932
(Fself_insert_command, Fnewline): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9300
diff
changeset
|
231 /* Ok since old and new vals both nonneg */ |
1ff5359ac932
(Fself_insert_command, Fnewline): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9300
diff
changeset
|
232 XSETFASTINT (arg, XFASTINT (arg) - 1); |
239 | 233 internal_self_insert (XINT (last_command_char), XFASTINT (arg) != 0); |
234 } | |
235 | |
236 return Qnil; | |
237 } | |
238 | |
239 DEFUN ("newline", Fnewline, Snewline, 0, 1, "P", | |
240 "Insert a newline. With arg, insert that many newlines.\n\ | |
241 In Auto Fill mode, if no numeric arg, break the preceding line if it's long.") | |
242 (arg1) | |
243 Lisp_Object arg1; | |
244 { | |
10425
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
245 int flag, i; |
239 | 246 Lisp_Object arg; |
247 char c1 = '\n'; | |
248 | |
249 arg = Fprefix_numeric_value (arg1); | |
250 | |
485 | 251 if (!NILP (current_buffer->read_only)) |
3480
9784ebc37245
(Fnewline): Use Fbarf_if_buffer_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3223
diff
changeset
|
252 Fbarf_if_buffer_read_only (); |
239 | 253 |
1986
b1bc0b15ca7f
* cmds.c (Fnewline): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1969
diff
changeset
|
254 /* Inserting a newline at the end of a line produces better |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3480
diff
changeset
|
255 redisplay in try_window_id than inserting at the beginning of a |
1986
b1bc0b15ca7f
* cmds.c (Fnewline): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1969
diff
changeset
|
256 line, and the textual result is the same. So, if we're at |
b1bc0b15ca7f
* cmds.c (Fnewline): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1969
diff
changeset
|
257 beginning of line, pretend to be at the end of the previous line. |
b1bc0b15ca7f
* cmds.c (Fnewline): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1969
diff
changeset
|
258 |
b1bc0b15ca7f
* cmds.c (Fnewline): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1969
diff
changeset
|
259 We can't use internal_self_insert in that case since it won't do |
b1bc0b15ca7f
* cmds.c (Fnewline): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1969
diff
changeset
|
260 the insertion correctly. Luckily, internal_self_insert's special |
b1bc0b15ca7f
* cmds.c (Fnewline): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1969
diff
changeset
|
261 features all do nothing in that case. */ |
239 | 262 |
263 flag = point > BEGV && FETCH_CHAR (point - 1) == '\n'; | |
8755 | 264 /* Don't do this if at the beginning of the window. */ |
265 if (XBUFFER (XWINDOW (selected_window)->buffer) == current_buffer | |
266 && marker_position (XWINDOW (selected_window)->start) == PT) | |
267 flag = 0; | |
268 | |
4561
f8a991076926
(Fnewline): If we don't do the first SET_PT,
Richard M. Stallman <rms@gnu.org>
parents:
4372
diff
changeset
|
269 #ifdef USE_TEXT_PROPERTIES |
f8a991076926
(Fnewline): If we don't do the first SET_PT,
Richard M. Stallman <rms@gnu.org>
parents:
4372
diff
changeset
|
270 /* We cannot use this optimization if properties change |
f8a991076926
(Fnewline): If we don't do the first SET_PT,
Richard M. Stallman <rms@gnu.org>
parents:
4372
diff
changeset
|
271 in the vicinity. |
f8a991076926
(Fnewline): If we don't do the first SET_PT,
Richard M. Stallman <rms@gnu.org>
parents:
4372
diff
changeset
|
272 ??? We need to check for change hook properties, etc. */ |
239 | 273 if (flag) |
4561
f8a991076926
(Fnewline): If we don't do the first SET_PT,
Richard M. Stallman <rms@gnu.org>
parents:
4372
diff
changeset
|
274 if (! (point - 1 > BEGV && ! property_change_between_p (point - 2, point))) |
f8a991076926
(Fnewline): If we don't do the first SET_PT,
Richard M. Stallman <rms@gnu.org>
parents:
4372
diff
changeset
|
275 flag = 0; |
4372
189b84c7dbc5
(Fnewline): Disable the "insert one position before"
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
276 #endif |
4561
f8a991076926
(Fnewline): If we don't do the first SET_PT,
Richard M. Stallman <rms@gnu.org>
parents:
4372
diff
changeset
|
277 |
f8a991076926
(Fnewline): If we don't do the first SET_PT,
Richard M. Stallman <rms@gnu.org>
parents:
4372
diff
changeset
|
278 if (flag) |
f8a991076926
(Fnewline): If we don't do the first SET_PT,
Richard M. Stallman <rms@gnu.org>
parents:
4372
diff
changeset
|
279 SET_PT (point - 1); |
239 | 280 |
10425
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
281 for (i = XINT (arg); i > 0; i--) |
239 | 282 { |
283 if (flag) | |
9884
cede2b87231a
(Fnewline): Always use insert_and_inherit.
Richard M. Stallman <rms@gnu.org>
parents:
9405
diff
changeset
|
284 insert_and_inherit (&c1, 1); |
239 | 285 else |
485 | 286 internal_self_insert ('\n', !NILP (arg1)); |
239 | 287 } |
288 | |
10425
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
289 #ifdef USE_TEXT_PROPERTIES |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
290 if (Vuse_hard_newlines) |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
291 { |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
292 Lisp_Object from, to, sticky; |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
293 XSETFASTINT (from, PT - arg); |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
294 XSETFASTINT (to, PT); |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
295 Fput_text_property (from, to, Qhard, Qt, Qnil); |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
296 /* If rear_nonsticky is not "t", locally add Qhard to the list. */ |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
297 sticky = Fget_text_property (from, Qrear_nonsticky, Qnil); |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
298 if (NILP (sticky) |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
299 || (CONSP (sticky) && NILP (Fmemq (Qhard, sticky)))) |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
300 { |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
301 sticky = Fcons (Qhard, sticky); |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
302 Fput_text_property (from, to, Qrear_nonsticky, sticky, Qnil); |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
303 } |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
304 } |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
305 #endif |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
306 |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
307 |
239 | 308 if (flag) |
309 SET_PT (point + 1); | |
310 | |
311 return Qnil; | |
312 } | |
313 | |
1022
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
314 /* Insert character C1. If NOAUTOFILL is nonzero, don't do autofill |
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
315 even if it is enabled. |
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
316 |
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
317 If this insertion is suitable for direct output (completely simple), |
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
318 return 0. A value of 1 indicates this *might* not have been simple. |
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
319 A value of 2 means this did things that call for an undo boundary. */ |
1022
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
320 |
239 | 321 internal_self_insert (c1, noautofill) |
322 char c1; | |
323 int noautofill; | |
324 { | |
325 extern Lisp_Object Fexpand_abbrev (); | |
326 int hairy = 0; | |
327 Lisp_Object tem; | |
328 register enum syntaxcode synt; | |
329 register int c = c1; | |
6496
e1967b6d9a5c
(internal_self_insert): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
5754
diff
changeset
|
330 Lisp_Object overwrite; |
239 | 331 |
6496
e1967b6d9a5c
(internal_self_insert): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
5754
diff
changeset
|
332 overwrite = current_buffer->overwrite_mode; |
6788
4c912c5779f5
(internal_self_insert): Test Vafter_change_functions,
Richard M. Stallman <rms@gnu.org>
parents:
6496
diff
changeset
|
333 if (!NILP (Vbefore_change_function) || !NILP (Vafter_change_function) |
4c912c5779f5
(internal_self_insert): Test Vafter_change_functions,
Richard M. Stallman <rms@gnu.org>
parents:
6496
diff
changeset
|
334 || !NILP (Vbefore_change_functions) || !NILP (Vafter_change_functions)) |
239 | 335 hairy = 1; |
336 | |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
337 if (!NILP (overwrite) |
239 | 338 && point < ZV |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
339 && (EQ (overwrite, Qoverwrite_mode_binary) |
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
340 || (c != '\n' && FETCH_CHAR (point) != '\n')) |
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
341 && (EQ (overwrite, Qoverwrite_mode_binary) |
1948
e7b8107294b7
(syms_of_cmds): New var `overwrite-binary-mode'.
Richard M. Stallman <rms@gnu.org>
parents:
1098
diff
changeset
|
342 || FETCH_CHAR (point) != '\t' |
239 | 343 || XINT (current_buffer->tab_width) <= 0 |
2159
6a082f5ce7e6
(internal_self_insert): Check that tab_width does not
Richard M. Stallman <rms@gnu.org>
parents:
1986
diff
changeset
|
344 || XFASTINT (current_buffer->tab_width) > 20 |
239 | 345 || !((current_column () + 1) % XFASTINT (current_buffer->tab_width)))) |
346 { | |
347 del_range (point, point + 1); | |
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
348 hairy = 2; |
239 | 349 } |
485 | 350 if (!NILP (current_buffer->abbrev_mode) |
239 | 351 && SYNTAX (c) != Sword |
485 | 352 && NILP (current_buffer->read_only) |
239 | 353 && point > BEGV && SYNTAX (FETCH_CHAR (point - 1)) == Sword) |
354 { | |
1098
79f020f34683
(internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents:
1022
diff
changeset
|
355 int modiff = MODIFF; |
1022
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
356 Fexpand_abbrev (); |
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
357 /* We can't trust the value of Fexpand_abbrev, |
1098
79f020f34683
(internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents:
1022
diff
changeset
|
358 but if Fexpand_abbrev changed the buffer, |
79f020f34683
(internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents:
1022
diff
changeset
|
359 assume it expanded something. */ |
79f020f34683
(internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents:
1022
diff
changeset
|
360 if (MODIFF != modiff) |
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
361 hairy = 2; |
239 | 362 } |
363 if ((c == ' ' || c == '\n') | |
364 && !noautofill | |
10474
caf4440e63e8
(internal_self_insert): Don't test current_column
Richard M. Stallman <rms@gnu.org>
parents:
10425
diff
changeset
|
365 && !NILP (current_buffer->auto_fill_function)) |
239 | 366 { |
367 if (c1 != '\n') | |
8649
e64cf8a4bf28
(internal_self_insert): Use insert_and_inherit.
Richard M. Stallman <rms@gnu.org>
parents:
8088
diff
changeset
|
368 insert_and_inherit (&c1, 1); |
239 | 369 call0 (current_buffer->auto_fill_function); |
370 if (c1 == '\n') | |
8649
e64cf8a4bf28
(internal_self_insert): Use insert_and_inherit.
Richard M. Stallman <rms@gnu.org>
parents:
8088
diff
changeset
|
371 insert_and_inherit (&c1, 1); |
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
372 hairy = 2; |
239 | 373 } |
374 else | |
8649
e64cf8a4bf28
(internal_self_insert): Use insert_and_inherit.
Richard M. Stallman <rms@gnu.org>
parents:
8088
diff
changeset
|
375 insert_and_inherit (&c1, 1); |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
376 |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
377 /* If previous command specified a face to use, use it. */ |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
378 if (!NILP (Vself_insert_face) |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
379 && EQ (last_command, Vself_insert_face_command)) |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
380 { |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
381 Lisp_Object before, after; |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
382 XSETINT (before, PT - 1); |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
383 XSETINT (after, PT); |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
384 Fput_text_property (before, after, Qface, Vself_insert_face, Qnil); |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
385 Vself_insert_face = Qnil; |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
386 } |
239 | 387 synt = SYNTAX (c); |
388 if ((synt == Sclose || synt == Smath) | |
485 | 389 && !NILP (Vblink_paren_function) && INTERACTIVE) |
239 | 390 { |
391 call0 (Vblink_paren_function); | |
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
392 hairy = 2; |
239 | 393 } |
394 return hairy; | |
395 } | |
396 | |
397 /* module initialization */ | |
398 | |
399 syms_of_cmds () | |
400 { | |
401 Qkill_backward_chars = intern ("kill-backward-chars"); | |
402 staticpro (&Qkill_backward_chars); | |
403 | |
404 Qkill_forward_chars = intern ("kill-forward-chars"); | |
405 staticpro (&Qkill_forward_chars); | |
406 | |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
407 Qoverwrite_mode_binary = intern ("overwrite-mode-binary"); |
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
408 staticpro (&Qoverwrite_mode_binary); |
1948
e7b8107294b7
(syms_of_cmds): New var `overwrite-binary-mode'.
Richard M. Stallman <rms@gnu.org>
parents:
1098
diff
changeset
|
409 |
10425
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
410 Qhard = intern ("hard"); |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
411 staticpro (&Qhard); |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
412 |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
413 DEFVAR_BOOL ("use-hard-newlines", &Vuse_hard_newlines, |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
414 "Non-nil means to distinguish hard and soft newlines.\n\ |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
415 When this is non-nil, the functions `newline' and `open-line' add the\n\ |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
416 text-property `hard' to newlines that they insert. Also, a line is\n\ |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
417 only considered as a candidate to match `paragraph-start' or\n\ |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
418 `paragraph-separate' if it follows a hard newline. Newlines not\n\ |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
419 marked hard are called \"soft\", and are always internal to\n\ |
10425
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
420 paragraphs. The fill functions always insert soft newlines."); |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
421 Vuse_hard_newlines = 0; |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
422 |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
423 DEFVAR_LISP ("self-insert-face", &Vself_insert_face, |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
424 "If non-nil, set the face of the next self-inserting character to this.\n\ |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
425 See also `self-insert-face-command'."); |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
426 Vself_insert_face = Qnil; |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
427 |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
428 DEFVAR_LISP ("self-insert-face-command", &Vself_insert_face_command, |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
429 "This is the command that set up `self-insert-face'.\n\ |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
430 If `last-command' does not equal this value, we ignore `self-insert-face'."); |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
431 Vself_insert_face_command = Qnil; |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
432 |
239 | 433 DEFVAR_LISP ("blink-paren-function", &Vblink_paren_function, |
434 "Function called, if non-nil, whenever a close parenthesis is inserted.\n\ | |
435 More precisely, a char with closeparen syntax is self-inserted."); | |
436 Vblink_paren_function = Qnil; | |
437 | |
438 defsubr (&Sforward_char); | |
439 defsubr (&Sbackward_char); | |
440 defsubr (&Sforward_line); | |
441 defsubr (&Sbeginning_of_line); | |
442 defsubr (&Send_of_line); | |
443 | |
444 defsubr (&Sdelete_char); | |
445 defsubr (&Sdelete_backward_char); | |
446 | |
447 defsubr (&Sself_insert_command); | |
448 defsubr (&Snewline); | |
449 } | |
450 | |
451 keys_of_cmds () | |
452 { | |
453 int n; | |
454 | |
10425
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
455 initial_define_key (global_map, Ctl ('M'), "newline"); |
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
456 initial_define_key (global_map, Ctl ('I'), "self-insert-command"); |
239 | 457 for (n = 040; n < 0177; n++) |
458 initial_define_key (global_map, n, "self-insert-command"); | |
5491
3965bf498738
(keys_of_cmds) [MSDOS]: Chars 0200 to 0237 self-insert.
Richard M. Stallman <rms@gnu.org>
parents:
5054
diff
changeset
|
459 #ifdef MSDOS |
3965bf498738
(keys_of_cmds) [MSDOS]: Chars 0200 to 0237 self-insert.
Richard M. Stallman <rms@gnu.org>
parents:
5054
diff
changeset
|
460 for (n = 0200; n < 0240; n++) |
3965bf498738
(keys_of_cmds) [MSDOS]: Chars 0200 to 0237 self-insert.
Richard M. Stallman <rms@gnu.org>
parents:
5054
diff
changeset
|
461 initial_define_key (global_map, n, "self-insert-command"); |
3965bf498738
(keys_of_cmds) [MSDOS]: Chars 0200 to 0237 self-insert.
Richard M. Stallman <rms@gnu.org>
parents:
5054
diff
changeset
|
462 #endif |
5054
34c280d4e1af
(keys_of_cmds): Make 0377 self-inserting.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
463 for (n = 0240; n < 0400; n++) |
3223
28a9541901d7
(keys_of_cmds): Predefined 0240-0376 as self-insert.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
464 initial_define_key (global_map, n, "self-insert-command"); |
239 | 465 |
466 initial_define_key (global_map, Ctl ('A'), "beginning-of-line"); | |
467 initial_define_key (global_map, Ctl ('B'), "backward-char"); | |
468 initial_define_key (global_map, Ctl ('D'), "delete-char"); | |
469 initial_define_key (global_map, Ctl ('E'), "end-of-line"); | |
470 initial_define_key (global_map, Ctl ('F'), "forward-char"); | |
471 initial_define_key (global_map, 0177, "delete-backward-char"); | |
472 } |