Mercurial > emacs
annotate src/cmds.c @ 49888:c0dd4de41e91
(with-syntax-table): Don't copy the table any more.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 20 Feb 2003 20:07:41 +0000 |
parents | 461d780ae946 |
children | ff438bca7989 d7ddb3e565de |
rev | line source |
---|---|
239 | 1 /* Simple built-in editing commands. |
48228
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
2 Copyright (C) 1985, 93, 94, 95, 96, 97, 1998, 2001, 02 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" |
39748
42b7a798ff79
Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31182
diff
changeset
|
30 #include "keymap.h" |
21514 | 31 #include "dispextern.h" |
239 | 32 |
33 Lisp_Object Qkill_forward_chars, Qkill_backward_chars, Vblink_paren_function; | |
34 | |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
35 /* 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
|
36 Lisp_Object Qoverwrite_mode_binary; |
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
37 |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
38 /* 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
|
39 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
|
40 |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
41 /* 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
|
42 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
|
43 |
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; |
48228
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
45 extern Lisp_Object Vtranslation_table_for_input; |
239 | 46 |
17026 | 47 DEFUN ("forward-point", Fforward_point, Sforward_point, 1, 1, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
48 doc: /* Return buffer position N characters after (before if N negative) point. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
49 (n) |
17026 | 50 Lisp_Object n; |
51 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
52 CHECK_NUMBER (n); |
17026 | 53 |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
54 return make_number (PT + XINT (n)); |
17026 | 55 } |
56 | |
239 | 57 DEFUN ("forward-char", Fforward_char, Sforward_char, 0, 1, "p", |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
58 doc: /* Move point right N characters (left if N is negative). |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
59 On reaching end of buffer, stop and signal error. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
60 (n) |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
61 Lisp_Object n; |
239 | 62 { |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
63 if (NILP (n)) |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
64 XSETFASTINT (n, 1); |
239 | 65 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
66 CHECK_NUMBER (n); |
239 | 67 |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
68 /* 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
|
69 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
|
70 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
|
71 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
|
72 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
|
73 { |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
74 int new_point = PT + XINT (n); |
2777
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 if (new_point < BEGV) |
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 SET_PT (BEGV); |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
79 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
|
80 } |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
81 if (new_point > ZV) |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
82 { |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
83 SET_PT (ZV); |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
84 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
|
85 } |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
86 |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
87 SET_PT (new_point); |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
88 } |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
89 |
239 | 90 return Qnil; |
91 } | |
92 | |
93 DEFUN ("backward-char", Fbackward_char, Sbackward_char, 0, 1, "p", | |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
94 doc: /* Move point left N characters (right if N is negative). |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
95 On attempt to pass beginning or end of buffer, stop and signal error. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
96 (n) |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
97 Lisp_Object n; |
239 | 98 { |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
99 if (NILP (n)) |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
100 XSETFASTINT (n, 1); |
239 | 101 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
102 CHECK_NUMBER (n); |
239 | 103 |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
104 XSETINT (n, - XINT (n)); |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
105 return Fforward_char (n); |
239 | 106 } |
107 | |
108 DEFUN ("forward-line", Fforward_line, Sforward_line, 0, 1, "p", | |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
109 doc: /* Move N lines forward (backward if N is negative). |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
110 Precisely, if point is on line I, move to the start of line I + N. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
111 If there isn't room, go as far as possible (no error). |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
112 Returns the count of lines left to move. If moving forward, |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
113 that is N - number of lines moved; if backward, N + number moved. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
114 With positive N, a non-empty line at the end counts as one line |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
115 successfully moved (for the return value). */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
116 (n) |
239 | 117 Lisp_Object n; |
118 { | |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
119 int opoint = PT, opoint_byte = PT_BYTE; |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
120 int pos, pos_byte; |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
121 int count, shortage; |
239 | 122 |
485 | 123 if (NILP (n)) |
239 | 124 count = 1; |
125 else | |
126 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
127 CHECK_NUMBER (n); |
239 | 128 count = XINT (n); |
129 } | |
130 | |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
131 if (count <= 0) |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
132 shortage = scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, count - 1, 1); |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
133 else |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
134 shortage = scan_newline (PT, PT_BYTE, ZV, ZV_BYTE, count, 1); |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
135 |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
136 /* Since scan_newline does TEMP_SET_PT_BOTH, |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
137 and we want to set PT "for real", |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
138 go back to the old point and then come back here. */ |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
139 pos = PT; |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
140 pos_byte = PT_BYTE; |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
141 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
142 SET_PT_BOTH (pos, pos_byte); |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
143 |
239 | 144 if (shortage > 0 |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
145 && (count <= 0 |
647 | 146 || (ZV > BEGV |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
147 && PT != opoint |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
148 && (FETCH_BYTE (PT_BYTE - 1) != '\n')))) |
239 | 149 shortage--; |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
150 |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
151 return make_number (count <= 0 ? - shortage : shortage); |
239 | 152 } |
153 | |
40041
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
154 DEFUN ("beginning-of-line", Fbeginning_of_line, Sbeginning_of_line, 0, 1, "p", |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
155 doc: /* Move point to beginning of current line. |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
156 With argument N not nil or 1, move forward N - 1 lines first. |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
157 If point reaches the beginning or end of buffer, it stops there. |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
158 |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
159 This command does not move point across a field boundary unless doing so |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
160 would move beyond there to a different line; If N is nil or 1, and point |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
161 starts at a field boundary, point does not move. To ignore field |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
162 boundaries, either bind `inhibit-field-text-motion' to t, or use the |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
163 `forward-line' function instead. For instance, `(forward-line 0)' does |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
164 the same thing as `(beginning-of-line)', except that it ignores field |
45618
21c0392ac82a
(Fdelete_backward_char, internal_self_insert): Cast
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
44754
diff
changeset
|
165 boundaries. */) |
40041
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
166 (n) |
239 | 167 Lisp_Object n; |
168 { | |
485 | 169 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
|
170 XSETFASTINT (n, 1); |
239 | 171 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
172 CHECK_NUMBER (n); |
239 | 173 |
25632
82ebdf9967da
(Fbeginning_of_line): Don't handle minibuffer prompt here.
Richard M. Stallman <rms@gnu.org>
parents:
25351
diff
changeset
|
174 SET_PT (XINT (Fline_beginning_position (n))); |
45618
21c0392ac82a
(Fdelete_backward_char, internal_self_insert): Cast
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
44754
diff
changeset
|
175 |
239 | 176 return Qnil; |
177 } | |
178 | |
40041
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
179 DEFUN ("end-of-line", Fend_of_line, Send_of_line, 0, 1, "p", |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
180 doc: /* Move point to end of current line. |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
181 With argument N not nil or 1, move forward N - 1 lines first. |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
182 If point reaches the beginning or end of buffer, it stops there. |
44754
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
183 To ignore intangibility, bind `inhibit-text-motion-hooks' to t. |
40041
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
184 |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
185 This command does not move point across a field boundary unless doing so |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
186 would move beyond there to a different line; if N is nil or 1, and |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
187 point starts at a field boundary, point does not move. To ignore field |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
188 boundaries bind `inhibit-field-text-motion' to t. */) |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
189 (n) |
239 | 190 Lisp_Object n; |
191 { | |
44754
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
192 int newpos; |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
193 |
485 | 194 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
|
195 XSETFASTINT (n, 1); |
239 | 196 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
197 CHECK_NUMBER (n); |
239 | 198 |
44754
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
199 while (1) |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
200 { |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
201 newpos = XINT (Fline_end_position (n)); |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
202 SET_PT (newpos); |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
203 |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
204 if (PT > newpos |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
205 && FETCH_CHAR (PT - 1) == '\n') |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
206 { |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
207 /* If we skipped over a newline that follows |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
208 an invisible intangible run, |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
209 move back to the last tangible position |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
210 within the line. */ |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
211 |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
212 SET_PT (PT - 1); |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
213 break; |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
214 } |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
215 else if (PT > newpos && PT < ZV |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
216 && FETCH_CHAR (PT) != '\n') |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
217 /* If we skipped something intangible |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
218 and now we're not really at eol, |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
219 keep going. */ |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
220 n = make_number (1); |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
221 else |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
222 break; |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
223 } |
239 | 224 |
225 return Qnil; | |
226 } | |
227 | |
228 DEFUN ("delete-char", Fdelete_char, Sdelete_char, 1, 2, "p\nP", | |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
229 doc: /* Delete the following N characters (previous if N is negative). |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
230 Optional second arg KILLFLAG non-nil means kill instead (save in kill ring). |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
231 Interactively, N is the prefix arg, and KILLFLAG is set if |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
232 N was explicitly specified. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
233 (n, killflag) |
239 | 234 Lisp_Object n, killflag; |
235 { | |
17026 | 236 int pos; |
237 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
238 CHECK_NUMBER (n); |
239 | 239 |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
240 pos = PT + XINT (n); |
485 | 241 if (NILP (killflag)) |
239 | 242 { |
243 if (XINT (n) < 0) | |
244 { | |
17026 | 245 if (pos < BEGV) |
239 | 246 Fsignal (Qbeginning_of_buffer, Qnil); |
247 else | |
17026 | 248 del_range (pos, PT); |
239 | 249 } |
250 else | |
251 { | |
17026 | 252 if (pos > ZV) |
239 | 253 Fsignal (Qend_of_buffer, Qnil); |
254 else | |
17026 | 255 del_range (PT, pos); |
239 | 256 } |
257 } | |
258 else | |
259 { | |
260 call1 (Qkill_forward_chars, n); | |
261 } | |
262 return Qnil; | |
263 } | |
264 | |
265 DEFUN ("delete-backward-char", Fdelete_backward_char, Sdelete_backward_char, | |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
266 1, 2, "p\nP", |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
267 doc: /* Delete the previous N characters (following if N is negative). |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
268 Optional second arg KILLFLAG non-nil means kill instead (save in kill ring). |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
269 Interactively, N is the prefix arg, and KILLFLAG is set if |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
270 N was explicitly specified. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
271 (n, killflag) |
239 | 272 Lisp_Object n, killflag; |
273 { | |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
274 Lisp_Object value; |
15875
5ffb83189a1b
(Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents:
15262
diff
changeset
|
275 int deleted_special = 0; |
20958
806727604be8
(Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents:
20708
diff
changeset
|
276 int pos, pos_byte, i; |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
277 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
278 CHECK_NUMBER (n); |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
279 |
15875
5ffb83189a1b
(Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents:
15262
diff
changeset
|
280 /* See if we are about to delete a tab or newline backwards. */ |
20958
806727604be8
(Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents:
20708
diff
changeset
|
281 pos = PT; |
806727604be8
(Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents:
20708
diff
changeset
|
282 pos_byte = PT_BYTE; |
806727604be8
(Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents:
20708
diff
changeset
|
283 for (i = 0; i < XINT (n) && pos_byte > BEGV_BYTE; i++) |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
284 { |
17026 | 285 int c; |
286 | |
20958
806727604be8
(Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents:
20708
diff
changeset
|
287 DEC_BOTH (pos, pos_byte); |
806727604be8
(Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents:
20708
diff
changeset
|
288 c = FETCH_BYTE (pos_byte); |
17026 | 289 if (c == '\t' || c == '\n') |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
290 { |
15875
5ffb83189a1b
(Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents:
15262
diff
changeset
|
291 deleted_special = 1; |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
292 break; |
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 } |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
295 |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
296 /* 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
|
297 unless at end of line. */ |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
298 if (XINT (n) > 0 |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
299 && ! NILP (current_buffer->overwrite_mode) |
15875
5ffb83189a1b
(Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents:
15262
diff
changeset
|
300 && ! deleted_special |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
301 && ! (PT == ZV || FETCH_BYTE (PT_BYTE) == '\n')) |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
302 { |
45618
21c0392ac82a
(Fdelete_backward_char, internal_self_insert): Cast
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
44754
diff
changeset
|
303 int column = (int) current_column (); /* iftc */ |
17026 | 304 |
305 value = Fdelete_char (make_number (-XINT (n)), killflag); | |
45618
21c0392ac82a
(Fdelete_backward_char, internal_self_insert): Cast
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
44754
diff
changeset
|
306 i = column - (int) current_column (); /* iftc */ |
18748
6897bd6a1c8d
(Fdelete_backward_char): Convert Finsert_char argument to
Richard M. Stallman <rms@gnu.org>
parents:
18239
diff
changeset
|
307 Finsert_char (make_number (' '), make_number (i), Qnil); |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
308 /* Whitespace chars are ASCII chars, so we can simply subtract. */ |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
309 SET_PT_BOTH (PT - i, PT_BYTE - i); |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
310 } |
17026 | 311 else |
312 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
|
313 |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
314 return value; |
239 | 315 } |
316 | |
48228
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
317 /* Note that there's code in command_loop_1 which typically avoids |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
318 calling this. */ |
239 | 319 DEFUN ("self-insert-command", Fself_insert_command, Sself_insert_command, 1, 1, "p", |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
320 doc: /* Insert the character you type. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
321 Whichever character you type to run this command is inserted. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
322 (n) |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
323 Lisp_Object n; |
239 | 324 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
325 CHECK_NUMBER (n); |
239 | 326 |
327 /* 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
|
328 if (!INTEGERP (last_command_char)) |
239 | 329 bitch_at_user (); |
48228
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
330 { |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
331 int character = translate_char (Vtranslation_table_for_input, |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
332 XINT (last_command_char), 0, 0, 0); |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
333 if (XINT (n) >= 2 && NILP (current_buffer->overwrite_mode)) |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
334 { |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
335 int modified_char = character; |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
336 /* Add the offset to the character, for Finsert_char. |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
337 We pass internal_self_insert the unmodified character |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
338 because it itself does this offsetting. */ |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
339 if (! NILP (current_buffer->enable_multibyte_characters)) |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
340 modified_char = unibyte_char_to_multibyte (modified_char); |
17849
a6442e20f768
(nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17376
diff
changeset
|
341 |
48228
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
342 XSETFASTINT (n, XFASTINT (n) - 2); |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
343 /* The first one might want to expand an abbrev. */ |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
344 internal_self_insert (character, 1); |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
345 /* The bulk of the copies of this char can be inserted simply. |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
346 We don't have to handle a user-specified face specially |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
347 because it will get inherited from the first char inserted. */ |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
348 Finsert_char (make_number (modified_char), n, Qt); |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
349 /* The last one might want to auto-fill. */ |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
350 internal_self_insert (character, 0); |
239 | 351 } |
48228
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
352 else |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
353 while (XINT (n) > 0) |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
354 { |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
355 /* Ok since old and new vals both nonneg */ |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
356 XSETFASTINT (n, XFASTINT (n) - 1); |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
357 internal_self_insert (character, XFASTINT (n) != 0); |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
358 } |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
359 } |
239 | 360 |
361 return Qnil; | |
362 } | |
363 | |
17026 | 364 /* 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
|
365 even if it is enabled. |
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
366 |
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
367 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
|
368 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
|
369 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
|
370 |
21514 | 371 int |
17026 | 372 internal_self_insert (c, noautofill) |
373 int c; | |
239 | 374 int noautofill; |
375 { | |
376 extern Lisp_Object Fexpand_abbrev (); | |
377 int hairy = 0; | |
378 Lisp_Object tem; | |
379 register enum syntaxcode synt; | |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
380 Lisp_Object overwrite, string; |
17026 | 381 /* Length of multi-byte form of C. */ |
382 int len; | |
383 /* Working buffer and pointer for multi-byte form of C. */ | |
26845
5c3e047bbf23
(internal_self_insert): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26390
diff
changeset
|
384 unsigned char str[MAX_MULTIBYTE_LENGTH]; |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
385 int chars_to_delete = 0; |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
386 int spaces_to_insert = 0; |
239 | 387 |
6496
e1967b6d9a5c
(internal_self_insert): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
5754
diff
changeset
|
388 overwrite = current_buffer->overwrite_mode; |
29378
141820271eff
(internal_self_insert): Don't check
Dave Love <fx@gnu.org>
parents:
27379
diff
changeset
|
389 if (!NILP (Vbefore_change_functions) || !NILP (Vafter_change_functions)) |
239 | 390 hairy = 1; |
391 | |
17026 | 392 /* At first, get multi-byte form of C in STR. */ |
393 if (!NILP (current_buffer->enable_multibyte_characters)) | |
21032
3bf522f06501
(internal_self_insert): Avoid checking enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
20958
diff
changeset
|
394 { |
3bf522f06501
(internal_self_insert): Avoid checking enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
20958
diff
changeset
|
395 c = unibyte_char_to_multibyte (c); |
26845
5c3e047bbf23
(internal_self_insert): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26390
diff
changeset
|
396 len = CHAR_STRING (c, str); |
23765
1944b3595afd
(internal_self_insert): If C has modifier bits, insert
Kenichi Handa <handa@m17n.org>
parents:
23487
diff
changeset
|
397 if (len == 1) |
1944b3595afd
(internal_self_insert): If C has modifier bits, insert
Kenichi Handa <handa@m17n.org>
parents:
23487
diff
changeset
|
398 /* If C has modifier bits, this makes C an appropriate |
1944b3595afd
(internal_self_insert): If C has modifier bits, insert
Kenichi Handa <handa@m17n.org>
parents:
23487
diff
changeset
|
399 one-byte char. */ |
1944b3595afd
(internal_self_insert): If C has modifier bits, insert
Kenichi Handa <handa@m17n.org>
parents:
23487
diff
changeset
|
400 c = *str; |
21032
3bf522f06501
(internal_self_insert): Avoid checking enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
20958
diff
changeset
|
401 } |
17026 | 402 else |
22926
436499b7a769
(internal_self_insert): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
403 { |
26845
5c3e047bbf23
(internal_self_insert): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26390
diff
changeset
|
404 str[0] = (SINGLE_BYTE_CHAR_P (c) |
5c3e047bbf23
(internal_self_insert): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26390
diff
changeset
|
405 ? c |
5c3e047bbf23
(internal_self_insert): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26390
diff
changeset
|
406 : multibyte_char_to_unibyte (c, Qnil)); |
22926
436499b7a769
(internal_self_insert): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
407 len = 1; |
436499b7a769
(internal_self_insert): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
408 } |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
409 if (!NILP (overwrite) |
17026 | 410 && PT < ZV) |
239 | 411 { |
17026 | 412 /* In overwrite-mode, we substitute a character at point (C2, |
413 hereafter) by C. For that, we delete C2 in advance. But, | |
414 just substituting C2 by C may move a remaining text in the | |
415 line to the right or to the left, which is not preferable. | |
416 So we insert more spaces or delete more characters in the | |
417 following cases: if C is narrower than C2, after deleting C2, | |
418 we fill columns with spaces, if C is wider than C2, we delete | |
419 C2 and several characters following C2. */ | |
420 | |
20615
ddb1eec37783
(internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents:
20541
diff
changeset
|
421 /* This is the character after point. */ |
ddb1eec37783
(internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents:
20541
diff
changeset
|
422 int c2 = FETCH_CHAR (PT_BYTE); |
ddb1eec37783
(internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents:
20541
diff
changeset
|
423 |
ddb1eec37783
(internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents:
20541
diff
changeset
|
424 /* Column the cursor should be placed at after this insertion. |
17026 | 425 The correct value should be calculated only when necessary. */ |
426 int target_clm = 0; | |
427 | |
19658
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
428 /* 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
|
429 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
|
430 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
|
431 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
|
432 or before a tab if it doesn't use the whole width of the tab. */ |
17026 | 433 if (EQ (overwrite, Qoverwrite_mode_binary) |
434 || (c != '\n' | |
435 && 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
|
436 && ! (c2 == '\t' |
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
437 && 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
|
438 && XFASTINT (current_buffer->tab_width) < 20 |
45618
21c0392ac82a
(Fdelete_backward_char, internal_self_insert): Cast
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
44754
diff
changeset
|
439 && (target_clm = ((int) current_column () /* iftc */ |
24423
230bace6a57a
(internal_self_insert): Calculate column properly
Karl Heuer <kwzh@gnu.org>
parents:
23765
diff
changeset
|
440 + XINT (Fchar_width (make_number (c)))), |
19658
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
441 target_clm % XFASTINT (current_buffer->tab_width))))) |
17026 | 442 { |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
443 int pos = PT; |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
444 int pos_byte = PT_BYTE; |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
445 |
17026 | 446 if (target_clm == 0) |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
447 chars_to_delete = 1; |
17026 | 448 else |
449 { | |
450 /* The actual cursor position after the trial of moving | |
451 to column TARGET_CLM. It is greater than TARGET_CLM | |
452 if the TARGET_CLM is middle of multi-column | |
453 character. In that case, the new point is set after | |
454 that character. */ | |
18748
6897bd6a1c8d
(Fdelete_backward_char): Convert Finsert_char argument to
Richard M. Stallman <rms@gnu.org>
parents:
18239
diff
changeset
|
455 int actual_clm |
6897bd6a1c8d
(Fdelete_backward_char): Convert Finsert_char argument to
Richard M. Stallman <rms@gnu.org>
parents:
18239
diff
changeset
|
456 = XFASTINT (Fmove_to_column (make_number (target_clm), Qnil)); |
17026 | 457 |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
458 chars_to_delete = PT - pos; |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
459 |
17026 | 460 if (actual_clm > target_clm) |
461 { | |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
462 /* We will delete too many columns. Let's fill columns |
17026 | 463 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
|
464 spaces_to_insert = actual_clm - target_clm; |
17026 | 465 } |
466 } | |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
467 SET_PT_BOTH (pos, pos_byte); |
17026 | 468 hairy = 2; |
469 } | |
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
470 hairy = 2; |
239 | 471 } |
485 | 472 if (!NILP (current_buffer->abbrev_mode) |
239 | 473 && SYNTAX (c) != Sword |
485 | 474 && NILP (current_buffer->read_only) |
17026 | 475 && PT > BEGV && SYNTAX (XFASTINT (Fprevious_char ())) == Sword) |
239 | 476 { |
1098
79f020f34683
(internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents:
1022
diff
changeset
|
477 int modiff = MODIFF; |
16748
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
478 Lisp_Object sym; |
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
479 |
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
480 sym = Fexpand_abbrev (); |
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
481 |
27379 | 482 /* If we expanded an abbrev which has a hook, |
16809
c378600f005d
(internal_self_insert): Check the property
Richard M. Stallman <rms@gnu.org>
parents:
16748
diff
changeset
|
483 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
|
484 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
|
485 if (! NILP (sym) && ! NILP (XSYMBOL (sym)->function) |
c378600f005d
(internal_self_insert): Check the property
Richard M. Stallman <rms@gnu.org>
parents:
16748
diff
changeset
|
486 && 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
|
487 { |
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
488 Lisp_Object prop; |
16809
c378600f005d
(internal_self_insert): Check the property
Richard M. Stallman <rms@gnu.org>
parents:
16748
diff
changeset
|
489 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
|
490 if (! NILP (prop)) |
17376
aef6095be65c
(internal_self_insert): Fix return value.
Karl Heuer <kwzh@gnu.org>
parents:
17026
diff
changeset
|
491 return 1; |
16748
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
492 } |
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
493 |
1098
79f020f34683
(internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents:
1022
diff
changeset
|
494 if (MODIFF != modiff) |
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
495 hairy = 2; |
239 | 496 } |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
497 |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
498 if (chars_to_delete) |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
499 { |
21254
d25a091700e5
(internal_self_insert): Use make_string_from_bytes.
Richard M. Stallman <rms@gnu.org>
parents:
21238
diff
changeset
|
500 string = make_string_from_bytes (str, 1, len); |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
501 if (spaces_to_insert) |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
502 { |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
503 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
|
504 make_number (' ')); |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
505 string = concat2 (tem, string); |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
506 } |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
507 |
23062
fec0e9653480
(internal_self_insert): Pass 1 as NOMARKERS to replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
22926
diff
changeset
|
508 replace_range (PT, PT + chars_to_delete, string, 1, 1, 1); |
21149
43ed5912d7e0
(internal_self_insert): Call Fforward_buffer to advance
Richard M. Stallman <rms@gnu.org>
parents:
21032
diff
changeset
|
509 Fforward_char (make_number (1 + spaces_to_insert)); |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
510 } |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
511 else |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
512 insert_and_inherit (str, len); |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
513 |
23487
6bed0cb78b71
(internal_self_insert): Check Vauto_fill_chars.
Kenichi Handa <handa@m17n.org>
parents:
23062
diff
changeset
|
514 if ((CHAR_TABLE_P (Vauto_fill_chars) |
6bed0cb78b71
(internal_self_insert): Check Vauto_fill_chars.
Kenichi Handa <handa@m17n.org>
parents:
23062
diff
changeset
|
515 ? !NILP (CHAR_TABLE_REF (Vauto_fill_chars, c)) |
6bed0cb78b71
(internal_self_insert): Check Vauto_fill_chars.
Kenichi Handa <handa@m17n.org>
parents:
23062
diff
changeset
|
516 : (c == ' ' || c == '\n')) |
239 | 517 && !noautofill |
10474
caf4440e63e8
(internal_self_insert): Don't test current_column
Richard M. Stallman <rms@gnu.org>
parents:
10425
diff
changeset
|
518 && !NILP (current_buffer->auto_fill_function)) |
239 | 519 { |
15262
b455f3f77823
(internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents:
14436
diff
changeset
|
520 Lisp_Object tem; |
b455f3f77823
(internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents:
14436
diff
changeset
|
521 |
17026 | 522 if (c == '\n') |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
523 /* After inserting a newline, move to previous line and fill |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
524 that. Must have the newline in place already so filling and |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
525 justification, if any, know where the end is going to be. */ |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
526 SET_PT_BOTH (PT - 1, PT_BYTE - 1); |
15262
b455f3f77823
(internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents:
14436
diff
changeset
|
527 tem = call0 (current_buffer->auto_fill_function); |
17026 | 528 if (c == '\n') |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
529 SET_PT_BOTH (PT + 1, PT_BYTE + 1); |
15262
b455f3f77823
(internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents:
14436
diff
changeset
|
530 if (!NILP (tem)) |
b455f3f77823
(internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents:
14436
diff
changeset
|
531 hairy = 2; |
239 | 532 } |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
533 |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
534 /* 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
|
535 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
|
536 && 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
|
537 { |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
538 Fput_text_property (make_number (PT - 1), make_number (PT), |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
539 Qface, Vself_insert_face, Qnil); |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
540 Vself_insert_face = Qnil; |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
541 } |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
542 |
239 | 543 synt = SYNTAX (c); |
544 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
|
545 && !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
|
546 && !noautofill) |
239 | 547 { |
548 call0 (Vblink_paren_function); | |
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
549 hairy = 2; |
239 | 550 } |
551 return hairy; | |
552 } | |
553 | |
554 /* module initialization */ | |
555 | |
21514 | 556 void |
239 | 557 syms_of_cmds () |
558 { | |
559 Qkill_backward_chars = intern ("kill-backward-chars"); | |
560 staticpro (&Qkill_backward_chars); | |
561 | |
562 Qkill_forward_chars = intern ("kill-forward-chars"); | |
563 staticpro (&Qkill_forward_chars); | |
564 | |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
565 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
|
566 staticpro (&Qoverwrite_mode_binary); |
1948
e7b8107294b7
(syms_of_cmds): New var `overwrite-binary-mode'.
Richard M. Stallman <rms@gnu.org>
parents:
1098
diff
changeset
|
567 |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
568 DEFVAR_LISP ("self-insert-face", &Vself_insert_face, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
569 doc: /* If non-nil, set the face of the next self-inserting character to this. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
570 See also `self-insert-face-command'. */); |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
571 Vself_insert_face = Qnil; |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
572 |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
573 DEFVAR_LISP ("self-insert-face-command", &Vself_insert_face_command, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
574 doc: /* This is the command that set up `self-insert-face'. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
575 If `last-command' does not equal this value, we ignore `self-insert-face'. */); |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
576 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
|
577 |
239 | 578 DEFVAR_LISP ("blink-paren-function", &Vblink_paren_function, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
579 doc: /* Function called, if non-nil, whenever a close parenthesis is inserted. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
580 More precisely, a char with closeparen syntax is self-inserted. */); |
239 | 581 Vblink_paren_function = Qnil; |
582 | |
17026 | 583 defsubr (&Sforward_point); |
239 | 584 defsubr (&Sforward_char); |
585 defsubr (&Sbackward_char); | |
586 defsubr (&Sforward_line); | |
587 defsubr (&Sbeginning_of_line); | |
588 defsubr (&Send_of_line); | |
589 | |
590 defsubr (&Sdelete_char); | |
591 defsubr (&Sdelete_backward_char); | |
592 | |
593 defsubr (&Sself_insert_command); | |
594 } | |
595 | |
21514 | 596 void |
239 | 597 keys_of_cmds () |
598 { | |
599 int n; | |
600 | |
10425
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
601 initial_define_key (global_map, Ctl ('I'), "self-insert-command"); |
239 | 602 for (n = 040; n < 0177; n++) |
603 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
|
604 #ifdef MSDOS |
3965bf498738
(keys_of_cmds) [MSDOS]: Chars 0200 to 0237 self-insert.
Richard M. Stallman <rms@gnu.org>
parents:
5054
diff
changeset
|
605 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
|
606 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
|
607 #endif |
5054
34c280d4e1af
(keys_of_cmds): Make 0377 self-inserting.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
608 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
|
609 initial_define_key (global_map, n, "self-insert-command"); |
239 | 610 |
611 initial_define_key (global_map, Ctl ('A'), "beginning-of-line"); | |
612 initial_define_key (global_map, Ctl ('B'), "backward-char"); | |
613 initial_define_key (global_map, Ctl ('D'), "delete-char"); | |
614 initial_define_key (global_map, Ctl ('E'), "end-of-line"); | |
615 initial_define_key (global_map, Ctl ('F'), "forward-char"); | |
616 initial_define_key (global_map, 0177, "delete-backward-char"); | |
617 } |