Mercurial > emacs
annotate src/cmds.c @ 20453:a68e24bdc522
(ange-ftp-date-regexp): Fix the problem with misparsing
`-r--r--r-- 1 may 1997' by requiring a digit before the date.
author | Paul Eggert <eggert@twinsun.com> |
---|---|
date | Thu, 11 Dec 1997 06:58:17 +0000 |
parents | 063c22255157 |
children | 0cd7f6f42138 |
rev | line source |
---|---|
239 | 1 /* Simple built-in editing commands. |
18748
6897bd6a1c8d
(Fdelete_backward_char): Convert Finsert_char argument to
Richard M. Stallman <rms@gnu.org>
parents:
18239
diff
changeset
|
2 Copyright (C) 1985, 93, 94, 95, 96, 1997 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 | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14065
diff
changeset
|
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14065
diff
changeset
|
19 Boston, MA 02111-1307, USA. */ |
239 | 20 |
21 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4561
diff
changeset
|
22 #include <config.h> |
239 | 23 #include "lisp.h" |
24 #include "commands.h" | |
25 #include "buffer.h" | |
17026 | 26 #include "charset.h" |
239 | 27 #include "syntax.h" |
8755 | 28 #include "window.h" |
12163
4a83c7459b52
(internal_self_insert): Make last_command be kboard-local.
Karl Heuer <kwzh@gnu.org>
parents:
11235
diff
changeset
|
29 #include "keyboard.h" |
239 | 30 |
31 Lisp_Object Qkill_forward_chars, Qkill_backward_chars, Vblink_paren_function; | |
32 | |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
33 /* 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
|
34 Lisp_Object Qoverwrite_mode_binary; |
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
35 |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
36 /* 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
|
37 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
|
38 |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
39 /* 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
|
40 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
|
41 |
17849
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
42 /* Offset to add to a non-ASCII value when inserting it. */ |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
43 int nonascii_insert_offset; |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
44 |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
45 extern Lisp_Object Qface; |
239 | 46 |
17026 | 47 /* Return buffer position which is N characters after `point'. */ |
48 int | |
49 forward_point (n) | |
50 int n; | |
51 { | |
52 int pos = PT, c; | |
53 | |
54 if (!NILP (current_buffer->enable_multibyte_characters)) | |
55 { | |
56 /* Simply adding N to `point' doesn't work because of multi-byte | |
57 form. We had better not use INC_POS and DEC_POS because they | |
58 check the gap position every time. But, for the moment, we | |
59 need working code. */ | |
60 if (n > 0) | |
61 { | |
62 while (pos < ZV && n--) INC_POS (pos); | |
63 if (pos < ZV) n++; | |
64 } | |
65 else | |
66 { | |
67 while (pos > BEGV && n++) DEC_POS (pos); | |
68 if (pos > BEGV) n--; | |
69 } | |
70 } | |
71 pos += n; | |
72 | |
73 return pos; | |
74 } | |
75 | |
76 DEFUN ("forward-point", Fforward_point, Sforward_point, 1, 1, 0, | |
77 "Return buffer position N characters after (before if N negative) point.") | |
78 (n) | |
79 Lisp_Object n; | |
80 { | |
81 CHECK_NUMBER (n, 0); | |
82 | |
83 return make_number (forward_point (XINT (n))); | |
84 } | |
85 | |
239 | 86 DEFUN ("forward-char", Fforward_char, Sforward_char, 0, 1, "p", |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
87 "Move point right N characters (left if N is negative).\n\ |
239 | 88 On reaching end of buffer, stop and signal error.") |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
89 (n) |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
90 Lisp_Object n; |
239 | 91 { |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
92 if (NILP (n)) |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
93 XSETFASTINT (n, 1); |
239 | 94 else |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
95 CHECK_NUMBER (n, 0); |
239 | 96 |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
97 /* This used to just set point to point + XINT (n), and then check |
2777
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
98 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
|
99 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
|
100 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
|
101 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
|
102 { |
17026 | 103 int new_point = forward_point (XINT (n)); |
2777
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
104 |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
105 if (new_point < BEGV) |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
106 { |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
107 SET_PT (BEGV); |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
108 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
|
109 } |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
110 if (new_point > ZV) |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
111 { |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
112 SET_PT (ZV); |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
113 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
|
114 } |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
115 |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
116 SET_PT (new_point); |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
117 } |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
118 |
239 | 119 return Qnil; |
120 } | |
121 | |
122 DEFUN ("backward-char", Fbackward_char, Sbackward_char, 0, 1, "p", | |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
123 "Move point left N characters (right if N is negative).\n\ |
239 | 124 On attempt to pass beginning or end of buffer, stop and signal error.") |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
125 (n) |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
126 Lisp_Object n; |
239 | 127 { |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
128 if (NILP (n)) |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
129 XSETFASTINT (n, 1); |
239 | 130 else |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
131 CHECK_NUMBER (n, 0); |
239 | 132 |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
133 XSETINT (n, - XINT (n)); |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
134 return Fforward_char (n); |
239 | 135 } |
136 | |
137 DEFUN ("forward-line", Fforward_line, Sforward_line, 0, 1, "p", | |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
138 "Move N lines forward (backward if N is negative).\n\ |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
139 Precisely, if point is on line I, move to the start of line I + N.\n\ |
239 | 140 If there isn't room, go as far as possible (no error).\n\ |
141 Returns the count of lines left to move. If moving forward,\n\ | |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
142 that is N - number of lines moved; if backward, N + number moved.\n\ |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
143 With positive N, a non-empty line at the end counts as one line\n\ |
239 | 144 successfully moved (for the return value).") |
145 (n) | |
146 Lisp_Object n; | |
147 { | |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15875
diff
changeset
|
148 int pos2 = PT; |
239 | 149 int pos; |
150 int count, shortage, negp; | |
151 | |
485 | 152 if (NILP (n)) |
239 | 153 count = 1; |
154 else | |
155 { | |
156 CHECK_NUMBER (n, 0); | |
157 count = XINT (n); | |
158 } | |
159 | |
160 negp = count <= 0; | |
9405
b7f3059c308a
* cmds.c (Fforward_line): Call scan_buffer with new args.
Jim Blandy <jimb@redhat.com>
parents:
9332
diff
changeset
|
161 pos = scan_buffer ('\n', pos2, 0, count - negp, &shortage, 1); |
239 | 162 if (shortage > 0 |
163 && (negp | |
647 | 164 || (ZV > BEGV |
165 && pos != pos2 | |
17026 | 166 && FETCH_BYTE (pos - 1) != '\n'))) |
239 | 167 shortage--; |
168 SET_PT (pos); | |
169 return make_number (negp ? - shortage : shortage); | |
170 } | |
171 | |
172 DEFUN ("beginning-of-line", Fbeginning_of_line, Sbeginning_of_line, | |
173 0, 1, "p", | |
174 "Move point to beginning of current line.\n\ | |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
175 With argument N not nil or 1, move forward N - 1 lines first.\n\ |
239 | 176 If scan reaches end of buffer, stop there without error.") |
177 (n) | |
178 Lisp_Object n; | |
179 { | |
485 | 180 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
|
181 XSETFASTINT (n, 1); |
239 | 182 else |
183 CHECK_NUMBER (n, 0); | |
184 | |
16657
f31cab608aa9
(Fend_of_line, Fbeginning_of_line):
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
185 SET_PT (XINT (Fline_beginning_position (n))); |
239 | 186 return Qnil; |
187 } | |
188 | |
189 DEFUN ("end-of-line", Fend_of_line, Send_of_line, | |
190 0, 1, "p", | |
191 "Move point to end of current line.\n\ | |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
192 With argument N not nil or 1, move forward N - 1 lines first.\n\ |
239 | 193 If scan reaches end of buffer, stop there without error.") |
194 (n) | |
195 Lisp_Object n; | |
196 { | |
197 register int pos; | |
198 register int stop; | |
199 | |
485 | 200 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
|
201 XSETFASTINT (n, 1); |
239 | 202 else |
203 CHECK_NUMBER (n, 0); | |
204 | |
16657
f31cab608aa9
(Fend_of_line, Fbeginning_of_line):
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
205 SET_PT (XINT (Fline_end_position (n))); |
239 | 206 |
207 return Qnil; | |
208 } | |
209 | |
210 DEFUN ("delete-char", Fdelete_char, Sdelete_char, 1, 2, "p\nP", | |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
211 "Delete the following N characters (previous if N is negative).\n\ |
239 | 212 Optional second arg KILLFLAG non-nil means kill instead (save in kill ring).\n\ |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
213 Interactively, N is the prefix arg, and KILLFLAG is set if\n\ |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
214 N was explicitly specified.") |
239 | 215 (n, killflag) |
216 Lisp_Object n, killflag; | |
217 { | |
17026 | 218 int pos; |
219 | |
239 | 220 CHECK_NUMBER (n, 0); |
221 | |
17026 | 222 pos = forward_point (XINT (n)); |
485 | 223 if (NILP (killflag)) |
239 | 224 { |
225 if (XINT (n) < 0) | |
226 { | |
17026 | 227 if (pos < BEGV) |
239 | 228 Fsignal (Qbeginning_of_buffer, Qnil); |
229 else | |
17026 | 230 del_range (pos, PT); |
239 | 231 } |
232 else | |
233 { | |
17026 | 234 if (pos > ZV) |
239 | 235 Fsignal (Qend_of_buffer, Qnil); |
236 else | |
17026 | 237 del_range (PT, pos); |
239 | 238 } |
239 } | |
240 else | |
241 { | |
242 call1 (Qkill_forward_chars, n); | |
243 } | |
244 return Qnil; | |
245 } | |
246 | |
247 DEFUN ("delete-backward-char", Fdelete_backward_char, Sdelete_backward_char, | |
248 1, 2, "p\nP", | |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
249 "Delete the previous N characters (following if N is negative).\n\ |
239 | 250 Optional second arg KILLFLAG non-nil means kill instead (save in kill ring).\n\ |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
251 Interactively, N is the prefix arg, and KILLFLAG is set if\n\ |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
252 N was explicitly specified.") |
239 | 253 (n, killflag) |
254 Lisp_Object n, killflag; | |
255 { | |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
256 Lisp_Object value; |
15875
5ffb83189a1b
(Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents:
15262
diff
changeset
|
257 int deleted_special = 0; |
17026 | 258 int pos, i; |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
259 |
239 | 260 CHECK_NUMBER (n, 0); |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
261 |
15875
5ffb83189a1b
(Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents:
15262
diff
changeset
|
262 /* See if we are about to delete a tab or newline backwards. */ |
17026 | 263 pos = PT; |
264 for (i = 0; i < XINT (n) && pos > BEGV; i++) | |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
265 { |
17026 | 266 int c; |
267 | |
268 DEC_POS (pos); | |
269 c = FETCH_BYTE (pos); | |
270 if (c == '\t' || c == '\n') | |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
271 { |
15875
5ffb83189a1b
(Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents:
15262
diff
changeset
|
272 deleted_special = 1; |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
273 break; |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
274 } |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
275 } |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
276 |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
277 /* In overwrite mode, back over columns while clearing them out, |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
278 unless at end of line. */ |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
279 if (XINT (n) > 0 |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
280 && ! NILP (current_buffer->overwrite_mode) |
15875
5ffb83189a1b
(Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents:
15262
diff
changeset
|
281 && ! deleted_special |
17026 | 282 && ! (PT == ZV || FETCH_BYTE (PT) == '\n')) |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
283 { |
17026 | 284 int column = current_column (); |
285 | |
286 value = Fdelete_char (make_number (-XINT (n)), killflag); | |
287 i = column - current_column (); | |
18748
6897bd6a1c8d
(Fdelete_backward_char): Convert Finsert_char argument to
Richard M. Stallman <rms@gnu.org>
parents:
18239
diff
changeset
|
288 Finsert_char (make_number (' '), make_number (i), Qnil); |
17026 | 289 SET_PT (PT - i); |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
290 } |
17026 | 291 else |
292 value = Fdelete_char (make_number (-XINT (n)), killflag); | |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
293 |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
294 return value; |
239 | 295 } |
296 | |
297 DEFUN ("self-insert-command", Fself_insert_command, Sself_insert_command, 1, 1, "p", | |
298 "Insert the character you type.\n\ | |
299 Whichever character you type to run this command is inserted.") | |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
300 (n) |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
301 Lisp_Object n; |
239 | 302 { |
17849
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
303 int character = XINT (last_command_char); |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
304 |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
305 CHECK_NUMBER (n, 0); |
239 | 306 |
307 /* 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
|
308 if (!INTEGERP (last_command_char)) |
239 | 309 bitch_at_user (); |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
310 else if (XINT (n) >= 2 && NILP (current_buffer->overwrite_mode)) |
12869
2304fcfade47
(Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents:
12163
diff
changeset
|
311 { |
17849
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
312 int modified_char = character; |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
313 /* Add the offset to the character, for Finsert_char. |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
314 We pass internal_self_insert the unmodified character |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
315 because it itself does this offsetting. */ |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
316 if (modified_char >= 0200 && modified_char <= 0377 |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
317 && ! NILP (current_buffer->enable_multibyte_characters)) |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
318 modified_char += nonascii_insert_offset; |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
319 |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
320 XSETFASTINT (n, XFASTINT (n) - 2); |
12869
2304fcfade47
(Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents:
12163
diff
changeset
|
321 /* The first one might want to expand an abbrev. */ |
17849
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
322 internal_self_insert (character, 1); |
12869
2304fcfade47
(Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents:
12163
diff
changeset
|
323 /* The bulk of the copies of this char can be inserted simply. |
2304fcfade47
(Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents:
12163
diff
changeset
|
324 We don't have to handle a user-specified face specially |
2304fcfade47
(Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents:
12163
diff
changeset
|
325 because it will get inherited from the first char inserted. */ |
17849
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
326 Finsert_char (make_number (modified_char), n, Qt); |
12869
2304fcfade47
(Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents:
12163
diff
changeset
|
327 /* The last one might want to auto-fill. */ |
17849
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
328 internal_self_insert (character, 0); |
12869
2304fcfade47
(Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents:
12163
diff
changeset
|
329 } |
239 | 330 else |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
331 while (XINT (n) > 0) |
239 | 332 { |
9332
1ff5359ac932
(Fself_insert_command, Fnewline): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9300
diff
changeset
|
333 /* Ok since old and new vals both nonneg */ |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
334 XSETFASTINT (n, XFASTINT (n) - 1); |
17849
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
335 internal_self_insert (character, XFASTINT (n) != 0); |
239 | 336 } |
337 | |
338 return Qnil; | |
339 } | |
340 | |
17026 | 341 /* Insert character C. If NOAUTOFILL is nonzero, don't do autofill |
1022
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
342 even if it is enabled. |
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
343 |
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
344 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
|
345 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
|
346 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
|
347 |
17026 | 348 internal_self_insert (c, noautofill) |
349 int c; | |
239 | 350 int noautofill; |
351 { | |
352 extern Lisp_Object Fexpand_abbrev (); | |
353 int hairy = 0; | |
354 Lisp_Object tem; | |
355 register enum syntaxcode synt; | |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
356 Lisp_Object overwrite, string; |
17026 | 357 /* Length of multi-byte form of C. */ |
358 int len; | |
359 /* Working buffer and pointer for multi-byte form of C. */ | |
360 unsigned char workbuf[4], *str; | |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
361 int number_to_delete = 0; |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
362 int spaces_to_insert = 0; |
239 | 363 |
17849
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
364 if (c >= 0200 && c <= 0377 |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
365 && ! NILP (current_buffer->enable_multibyte_characters)) |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
366 c += nonascii_insert_offset; |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
367 |
6496
e1967b6d9a5c
(internal_self_insert): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
5754
diff
changeset
|
368 overwrite = current_buffer->overwrite_mode; |
6788
4c912c5779f5
(internal_self_insert): Test Vafter_change_functions,
Richard M. Stallman <rms@gnu.org>
parents:
6496
diff
changeset
|
369 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
|
370 || !NILP (Vbefore_change_functions) || !NILP (Vafter_change_functions)) |
239 | 371 hairy = 1; |
372 | |
17026 | 373 /* At first, get multi-byte form of C in STR. */ |
374 if (!NILP (current_buffer->enable_multibyte_characters)) | |
375 len = CHAR_STRING (c, workbuf, str); | |
376 else | |
377 workbuf[0] = c, str = workbuf, len = 1; | |
378 | |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
379 if (!NILP (overwrite) |
17026 | 380 && PT < ZV) |
239 | 381 { |
17026 | 382 /* In overwrite-mode, we substitute a character at point (C2, |
383 hereafter) by C. For that, we delete C2 in advance. But, | |
384 just substituting C2 by C may move a remaining text in the | |
385 line to the right or to the left, which is not preferable. | |
386 So we insert more spaces or delete more characters in the | |
387 following cases: if C is narrower than C2, after deleting C2, | |
388 we fill columns with spaces, if C is wider than C2, we delete | |
389 C2 and several characters following C2. */ | |
390 | |
391 /* A code at `point'. Since this is checked only against | |
392 NEWLINE and TAB, we don't need a character code but only the | |
393 first byte of multi-byte form. */ | |
394 unsigned char c2 = FETCH_BYTE (PT); | |
395 /* A column the cursor should be placed at after this insertion. | |
396 The correct value should be calculated only when necessary. */ | |
397 int target_clm = 0; | |
398 | |
19658
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
399 /* Overwriting in binary-mode always replaces C2 by C. |
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
400 Overwriting in textual-mode doesn't always do that. |
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
401 It inserts newlines in the usual way, |
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
402 and inserts any character at end of line |
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
403 or before a tab if it doesn't use the whole width of the tab. */ |
17026 | 404 if (EQ (overwrite, Qoverwrite_mode_binary) |
405 || (c != '\n' | |
406 && c2 != '\n' | |
19658
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
407 && ! (c2 == '\t' |
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
408 && XINT (current_buffer->tab_width) > 0 |
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
409 && XFASTINT (current_buffer->tab_width) < 20 |
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
410 && ((NILP (current_buffer->enable_multibyte_characters) |
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
411 ? (target_clm = current_column () + 1) |
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
412 : (target_clm = current_column () + WIDTH_BY_CHAR_HEAD (str[0]))), |
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
413 target_clm % XFASTINT (current_buffer->tab_width))))) |
17026 | 414 { |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
415 int pos = PT; |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
416 |
17026 | 417 if (target_clm == 0) |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
418 number_to_delete = forward_point (1) - PT; |
17026 | 419 else |
420 { | |
421 /* The actual cursor position after the trial of moving | |
422 to column TARGET_CLM. It is greater than TARGET_CLM | |
423 if the TARGET_CLM is middle of multi-column | |
424 character. In that case, the new point is set after | |
425 that character. */ | |
18748
6897bd6a1c8d
(Fdelete_backward_char): Convert Finsert_char argument to
Richard M. Stallman <rms@gnu.org>
parents:
18239
diff
changeset
|
426 int actual_clm |
6897bd6a1c8d
(Fdelete_backward_char): Convert Finsert_char argument to
Richard M. Stallman <rms@gnu.org>
parents:
18239
diff
changeset
|
427 = XFASTINT (Fmove_to_column (make_number (target_clm), Qnil)); |
17026 | 428 |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
429 number_to_delete = PT - pos; |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
430 |
17026 | 431 if (actual_clm > target_clm) |
432 { | |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
433 /* We will delete too many columns. Let's fill columns |
17026 | 434 by spaces so that the remaining text won't move. */ |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
435 spaces_to_insert = actual_clm - target_clm; |
17026 | 436 } |
437 } | |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
438 SET_PT (pos); |
17026 | 439 hairy = 2; |
440 } | |
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
441 hairy = 2; |
239 | 442 } |
485 | 443 if (!NILP (current_buffer->abbrev_mode) |
239 | 444 && SYNTAX (c) != Sword |
485 | 445 && NILP (current_buffer->read_only) |
17026 | 446 && PT > BEGV && SYNTAX (XFASTINT (Fprevious_char ())) == Sword) |
239 | 447 { |
1098
79f020f34683
(internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents:
1022
diff
changeset
|
448 int modiff = MODIFF; |
16748
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
449 Lisp_Object sym; |
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
450 |
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
451 sym = Fexpand_abbrev (); |
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
452 |
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
453 /* If we expanded an abbrev which has only a hook, |
16809
c378600f005d
(internal_self_insert): Check the property
Richard M. Stallman <rms@gnu.org>
parents:
16748
diff
changeset
|
454 and the hook has a non-nil `no-self-insert' property, |
16748
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
455 return right away--don't really self-insert. */ |
16809
c378600f005d
(internal_self_insert): Check the property
Richard M. Stallman <rms@gnu.org>
parents:
16748
diff
changeset
|
456 if (! NILP (sym) && ! NILP (XSYMBOL (sym)->function) |
c378600f005d
(internal_self_insert): Check the property
Richard M. Stallman <rms@gnu.org>
parents:
16748
diff
changeset
|
457 && SYMBOLP (XSYMBOL (sym)->function)) |
16748
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
458 { |
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
459 Lisp_Object prop; |
16809
c378600f005d
(internal_self_insert): Check the property
Richard M. Stallman <rms@gnu.org>
parents:
16748
diff
changeset
|
460 prop = Fget (XSYMBOL (sym)->function, intern ("no-self-insert")); |
16748
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
461 if (! NILP (prop)) |
17376
aef6095be65c
(internal_self_insert): Fix return value.
Karl Heuer <kwzh@gnu.org>
parents:
17026
diff
changeset
|
462 return 1; |
16748
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
463 } |
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
464 |
1098
79f020f34683
(internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents:
1022
diff
changeset
|
465 if (MODIFF != modiff) |
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
466 hairy = 2; |
239 | 467 } |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
468 |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
469 if (number_to_delete) |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
470 { |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
471 string = make_string (str, len); |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
472 if (spaces_to_insert) |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
473 { |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
474 tem = Fmake_string (make_number (spaces_to_insert), |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
475 make_number (' ')); |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
476 string = concat2 (tem, string); |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
477 } |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
478 |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
479 replace_range (PT, PT + number_to_delete, string, 1, 1); |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
480 SET_PT (PT + XSTRING (string)->size); |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
481 } |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
482 else |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
483 insert_and_inherit (str, len); |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
484 |
239 | 485 if ((c == ' ' || c == '\n') |
486 && !noautofill | |
10474
caf4440e63e8
(internal_self_insert): Don't test current_column
Richard M. Stallman <rms@gnu.org>
parents:
10425
diff
changeset
|
487 && !NILP (current_buffer->auto_fill_function)) |
239 | 488 { |
15262
b455f3f77823
(internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents:
14436
diff
changeset
|
489 Lisp_Object tem; |
b455f3f77823
(internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents:
14436
diff
changeset
|
490 |
17026 | 491 if (c == '\n') |
10865
4887c9593b79
(use_hard_newlines): Variable definition moved to paragraphs.el.
Boris Goldowsky <boris@gnu.org>
parents:
10729
diff
changeset
|
492 /* After inserting a newline, move to previous line and fill */ |
4887c9593b79
(use_hard_newlines): Variable definition moved to paragraphs.el.
Boris Goldowsky <boris@gnu.org>
parents:
10729
diff
changeset
|
493 /* that. Must have the newline in place already so filling and */ |
4887c9593b79
(use_hard_newlines): Variable definition moved to paragraphs.el.
Boris Goldowsky <boris@gnu.org>
parents:
10729
diff
changeset
|
494 /* justification, if any, know where the end is going to be. */ |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15875
diff
changeset
|
495 SET_PT (PT - 1); |
15262
b455f3f77823
(internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents:
14436
diff
changeset
|
496 tem = call0 (current_buffer->auto_fill_function); |
17026 | 497 if (c == '\n') |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15875
diff
changeset
|
498 SET_PT (PT + 1); |
15262
b455f3f77823
(internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents:
14436
diff
changeset
|
499 if (!NILP (tem)) |
b455f3f77823
(internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents:
14436
diff
changeset
|
500 hairy = 2; |
239 | 501 } |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
502 |
11024
636d0fa5a920
(internal_self_insert): Do face code only if HAVE_FACES.
Karl Heuer <kwzh@gnu.org>
parents:
10865
diff
changeset
|
503 #ifdef HAVE_FACES |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
504 /* 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
|
505 if (!NILP (Vself_insert_face) |
12163
4a83c7459b52
(internal_self_insert): Make last_command be kboard-local.
Karl Heuer <kwzh@gnu.org>
parents:
11235
diff
changeset
|
506 && EQ (current_kboard->Vlast_command, Vself_insert_face_command)) |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
507 { |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
508 Lisp_Object before, after; |
17026 | 509 XSETINT (before, PT - len); |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
510 XSETINT (after, PT); |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
511 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
|
512 Vself_insert_face = Qnil; |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
513 } |
11024
636d0fa5a920
(internal_self_insert): Do face code only if HAVE_FACES.
Karl Heuer <kwzh@gnu.org>
parents:
10865
diff
changeset
|
514 #endif |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
515 |
239 | 516 synt = SYNTAX (c); |
517 if ((synt == Sclose || synt == Smath) | |
12869
2304fcfade47
(Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents:
12163
diff
changeset
|
518 && !NILP (Vblink_paren_function) && INTERACTIVE |
2304fcfade47
(Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents:
12163
diff
changeset
|
519 && !noautofill) |
239 | 520 { |
521 call0 (Vblink_paren_function); | |
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
522 hairy = 2; |
239 | 523 } |
524 return hairy; | |
525 } | |
526 | |
527 /* module initialization */ | |
528 | |
529 syms_of_cmds () | |
530 { | |
531 Qkill_backward_chars = intern ("kill-backward-chars"); | |
532 staticpro (&Qkill_backward_chars); | |
533 | |
534 Qkill_forward_chars = intern ("kill-forward-chars"); | |
535 staticpro (&Qkill_forward_chars); | |
536 | |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
537 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
|
538 staticpro (&Qoverwrite_mode_binary); |
1948
e7b8107294b7
(syms_of_cmds): New var `overwrite-binary-mode'.
Richard M. Stallman <rms@gnu.org>
parents:
1098
diff
changeset
|
539 |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
540 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
|
541 "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
|
542 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
|
543 Vself_insert_face = Qnil; |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
544 |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
545 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
|
546 "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
|
547 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
|
548 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
|
549 |
239 | 550 DEFVAR_LISP ("blink-paren-function", &Vblink_paren_function, |
551 "Function called, if non-nil, whenever a close parenthesis is inserted.\n\ | |
552 More precisely, a char with closeparen syntax is self-inserted."); | |
553 Vblink_paren_function = Qnil; | |
554 | |
17849
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
555 DEFVAR_INT ("nonascii-insert-offset", &nonascii_insert_offset, |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
556 "Offset to add to a non-ascii code 0200...0377 when inserting it.\n\ |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
557 This applies only when multibyte characters are enabled, and it serves\n\ |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
558 to convert a Latin-1 or similar 8-bit character code to the corresponding\n\ |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
559 Emacs character code."); |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
560 nonascii_insert_offset = 0; |
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
561 |
17026 | 562 defsubr (&Sforward_point); |
239 | 563 defsubr (&Sforward_char); |
564 defsubr (&Sbackward_char); | |
565 defsubr (&Sforward_line); | |
566 defsubr (&Sbeginning_of_line); | |
567 defsubr (&Send_of_line); | |
568 | |
569 defsubr (&Sdelete_char); | |
570 defsubr (&Sdelete_backward_char); | |
571 | |
572 defsubr (&Sself_insert_command); | |
573 } | |
574 | |
575 keys_of_cmds () | |
576 { | |
577 int n; | |
578 | |
10425
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
579 initial_define_key (global_map, Ctl ('I'), "self-insert-command"); |
239 | 580 for (n = 040; n < 0177; n++) |
581 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
|
582 #ifdef MSDOS |
3965bf498738
(keys_of_cmds) [MSDOS]: Chars 0200 to 0237 self-insert.
Richard M. Stallman <rms@gnu.org>
parents:
5054
diff
changeset
|
583 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
|
584 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
|
585 #endif |
5054
34c280d4e1af
(keys_of_cmds): Make 0377 self-inserting.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
586 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
|
587 initial_define_key (global_map, n, "self-insert-command"); |
239 | 588 |
589 initial_define_key (global_map, Ctl ('A'), "beginning-of-line"); | |
590 initial_define_key (global_map, Ctl ('B'), "backward-char"); | |
591 initial_define_key (global_map, Ctl ('D'), "delete-char"); | |
592 initial_define_key (global_map, Ctl ('E'), "end-of-line"); | |
593 initial_define_key (global_map, Ctl ('F'), "forward-char"); | |
594 initial_define_key (global_map, 0177, "delete-backward-char"); | |
595 } |