Mercurial > emacs
annotate src/cmds.c @ 14065:60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Fdelete_backward_char): Harmonize arguments with documentation.
| author | Erik Naggum <erik@naggum.no> |
|---|---|
| date | Tue, 09 Jan 1996 00:30:54 +0000 |
| parents | dc1c03408169 |
| children | ee40177f6c68 |
| rev | line source |
|---|---|
| 239 | 1 /* Simple built-in editing commands. |
| 11235 | 2 Copyright (C) 1985, 1993, 1994, 1995 Free Software Foundation, Inc. |
| 239 | 3 |
| 4 This file is part of GNU Emacs. | |
| 5 | |
| 6 GNU Emacs is free software; you can redistribute it and/or modify | |
| 7 it under the terms of the GNU General Public License as published by | |
| 647 | 8 the Free Software Foundation; either version 2, or (at your option) |
| 239 | 9 any later version. |
| 10 | |
| 11 GNU Emacs is distributed in the hope that it will be useful, | |
| 12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 GNU General Public License for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with GNU Emacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |
| 19 | |
| 20 | |
|
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4561
diff
changeset
|
21 #include <config.h> |
| 239 | 22 #include "lisp.h" |
| 23 #include "commands.h" | |
| 24 #include "buffer.h" | |
| 25 #include "syntax.h" | |
| 8755 | 26 #include "window.h" |
|
12163
4a83c7459b52
(internal_self_insert): Make last_command be kboard-local.
Karl Heuer <kwzh@gnu.org>
parents:
11235
diff
changeset
|
27 #include "keyboard.h" |
| 239 | 28 |
| 29 Lisp_Object Qkill_forward_chars, Qkill_backward_chars, Vblink_paren_function; | |
| 30 | |
|
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
31 /* A possible value for a buffer's overwrite-mode variable. */ |
|
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
32 Lisp_Object Qoverwrite_mode_binary; |
|
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
33 |
|
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
34 /* Non-nil means put this face on the next self-inserting character. */ |
|
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
35 Lisp_Object Vself_insert_face; |
|
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
36 |
|
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
37 /* This is the command that set up Vself_insert_face. */ |
|
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
38 Lisp_Object Vself_insert_face_command; |
|
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
39 |
|
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
40 extern Lisp_Object Qface; |
| 239 | 41 |
| 42 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
|
43 "Move point right N characters (left if N is negative).\n\ |
| 239 | 44 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
|
45 (n) |
|
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
46 Lisp_Object n; |
| 239 | 47 { |
|
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
48 if (NILP (n)) |
|
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
49 XSETFASTINT (n, 1); |
| 239 | 50 else |
|
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
51 CHECK_NUMBER (n, 0); |
| 239 | 52 |
|
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
53 /* 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
|
54 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
|
55 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
|
56 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
|
57 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
|
58 { |
|
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
59 int new_point = point + XINT (n); |
|
2777
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
60 |
|
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
61 if (new_point < BEGV) |
|
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
62 { |
|
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
63 SET_PT (BEGV); |
|
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
64 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
|
65 } |
|
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
66 if (new_point > ZV) |
|
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
67 { |
|
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
68 SET_PT (ZV); |
|
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
69 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
|
70 } |
|
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
71 |
|
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
72 SET_PT (new_point); |
|
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
73 } |
|
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
74 |
| 239 | 75 return Qnil; |
| 76 } | |
| 77 | |
| 78 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
|
79 "Move point left N characters (right if N is negative).\n\ |
| 239 | 80 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
|
81 (n) |
|
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
82 Lisp_Object n; |
| 239 | 83 { |
|
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
84 if (NILP (n)) |
|
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
85 XSETFASTINT (n, 1); |
| 239 | 86 else |
|
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
87 CHECK_NUMBER (n, 0); |
| 239 | 88 |
|
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
89 XSETINT (n, - XINT (n)); |
|
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
90 return Fforward_char (n); |
| 239 | 91 } |
| 92 | |
| 93 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
|
94 "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
|
95 Precisely, if point is on line I, move to the start of line I + N.\n\ |
| 239 | 96 If there isn't room, go as far as possible (no error).\n\ |
| 97 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
|
98 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
|
99 With positive N, a non-empty line at the end counts as one line\n\ |
| 239 | 100 successfully moved (for the return value).") |
| 101 (n) | |
| 102 Lisp_Object n; | |
| 103 { | |
| 104 int pos2 = point; | |
| 105 int pos; | |
| 106 int count, shortage, negp; | |
| 107 | |
| 485 | 108 if (NILP (n)) |
| 239 | 109 count = 1; |
| 110 else | |
| 111 { | |
| 112 CHECK_NUMBER (n, 0); | |
| 113 count = XINT (n); | |
| 114 } | |
| 115 | |
| 116 negp = count <= 0; | |
|
9405
b7f3059c308a
* cmds.c (Fforward_line): Call scan_buffer with new args.
Jim Blandy <jimb@redhat.com>
parents:
9332
diff
changeset
|
117 pos = scan_buffer ('\n', pos2, 0, count - negp, &shortage, 1); |
| 239 | 118 if (shortage > 0 |
| 119 && (negp | |
| 647 | 120 || (ZV > BEGV |
| 121 && pos != pos2 | |
| 239 | 122 && FETCH_CHAR (pos - 1) != '\n'))) |
| 123 shortage--; | |
| 124 SET_PT (pos); | |
| 125 return make_number (negp ? - shortage : shortage); | |
| 126 } | |
| 127 | |
| 128 DEFUN ("beginning-of-line", Fbeginning_of_line, Sbeginning_of_line, | |
| 129 0, 1, "p", | |
| 130 "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
|
131 With argument N not nil or 1, move forward N - 1 lines first.\n\ |
| 239 | 132 If scan reaches end of buffer, stop there without error.") |
| 133 (n) | |
| 134 Lisp_Object n; | |
| 135 { | |
| 485 | 136 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
|
137 XSETFASTINT (n, 1); |
| 239 | 138 else |
| 139 CHECK_NUMBER (n, 0); | |
| 140 | |
| 141 Fforward_line (make_number (XINT (n) - 1)); | |
| 142 return Qnil; | |
| 143 } | |
| 144 | |
| 145 DEFUN ("end-of-line", Fend_of_line, Send_of_line, | |
| 146 0, 1, "p", | |
| 147 "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
|
148 With argument N not nil or 1, move forward N - 1 lines first.\n\ |
| 239 | 149 If scan reaches end of buffer, stop there without error.") |
| 150 (n) | |
| 151 Lisp_Object n; | |
| 152 { | |
| 153 register int pos; | |
| 154 register int stop; | |
| 155 | |
| 485 | 156 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
|
157 XSETFASTINT (n, 1); |
| 239 | 158 else |
| 159 CHECK_NUMBER (n, 0); | |
| 160 | |
|
9405
b7f3059c308a
* cmds.c (Fforward_line): Call scan_buffer with new args.
Jim Blandy <jimb@redhat.com>
parents:
9332
diff
changeset
|
161 SET_PT (find_before_next_newline (PT, 0, XINT (n) - (XINT (n) <= 0))); |
| 239 | 162 |
| 163 return Qnil; | |
| 164 } | |
| 165 | |
| 166 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
|
167 "Delete the following N characters (previous if N is negative).\n\ |
| 239 | 168 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
|
169 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
|
170 N was explicitly specified.") |
| 239 | 171 (n, killflag) |
| 172 Lisp_Object n, killflag; | |
| 173 { | |
| 174 CHECK_NUMBER (n, 0); | |
| 175 | |
| 485 | 176 if (NILP (killflag)) |
| 239 | 177 { |
| 178 if (XINT (n) < 0) | |
| 179 { | |
| 180 if (point + XINT (n) < BEGV) | |
| 181 Fsignal (Qbeginning_of_buffer, Qnil); | |
| 182 else | |
| 183 del_range (point + XINT (n), point); | |
| 184 } | |
| 185 else | |
| 186 { | |
| 187 if (point + XINT (n) > ZV) | |
| 188 Fsignal (Qend_of_buffer, Qnil); | |
| 189 else | |
| 190 del_range (point, point + XINT (n)); | |
| 191 } | |
| 192 } | |
| 193 else | |
| 194 { | |
| 195 call1 (Qkill_forward_chars, n); | |
| 196 } | |
| 197 return Qnil; | |
| 198 } | |
| 199 | |
| 200 DEFUN ("delete-backward-char", Fdelete_backward_char, Sdelete_backward_char, | |
| 201 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
|
202 "Delete the previous N characters (following if N is negative).\n\ |
| 239 | 203 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
|
204 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
|
205 N was explicitly specified.") |
| 239 | 206 (n, killflag) |
| 207 Lisp_Object n, killflag; | |
| 208 { | |
| 209 CHECK_NUMBER (n, 0); | |
| 210 return Fdelete_char (make_number (-XINT (n)), killflag); | |
| 211 } | |
| 212 | |
| 213 DEFUN ("self-insert-command", Fself_insert_command, Sself_insert_command, 1, 1, "p", | |
| 214 "Insert the character you type.\n\ | |
| 215 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
|
216 (n) |
|
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
217 Lisp_Object n; |
| 239 | 218 { |
|
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
219 CHECK_NUMBER (n, 0); |
| 239 | 220 |
| 221 /* 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
|
222 if (!INTEGERP (last_command_char)) |
| 239 | 223 bitch_at_user (); |
|
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
224 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
|
225 { |
|
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
226 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
|
227 /* The first one might want to expand an abbrev. */ |
|
2304fcfade47
(Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents:
12163
diff
changeset
|
228 internal_self_insert (XINT (last_command_char), 1); |
|
2304fcfade47
(Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents:
12163
diff
changeset
|
229 /* 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
|
230 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
|
231 because it will get inherited from the first char inserted. */ |
|
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
232 Finsert_char (last_command_char, n, Qt); |
|
12869
2304fcfade47
(Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents:
12163
diff
changeset
|
233 /* The last one might want to auto-fill. */ |
|
2304fcfade47
(Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents:
12163
diff
changeset
|
234 internal_self_insert (XINT (last_command_char), 0); |
|
2304fcfade47
(Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents:
12163
diff
changeset
|
235 } |
| 239 | 236 else |
|
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
237 while (XINT (n) > 0) |
| 239 | 238 { |
|
9332
1ff5359ac932
(Fself_insert_command, Fnewline): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9300
diff
changeset
|
239 /* 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
|
240 XSETFASTINT (n, XFASTINT (n) - 1); |
|
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
241 internal_self_insert (XINT (last_command_char), XFASTINT (n) != 0); |
| 239 | 242 } |
| 243 | |
| 244 return Qnil; | |
| 245 } | |
| 246 | |
|
1022
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
247 /* Insert character C1. If NOAUTOFILL is nonzero, don't do autofill |
|
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
248 even if it is enabled. |
|
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
249 |
|
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
250 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
|
251 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
|
252 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
|
253 |
| 239 | 254 internal_self_insert (c1, noautofill) |
|
13825
dc1c03408169
(internal_self_insert): Declare arg c1 as unsigned char.
Richard M. Stallman <rms@gnu.org>
parents:
13765
diff
changeset
|
255 /* This has to be unsigned char; when it is char, |
|
dc1c03408169
(internal_self_insert): Declare arg c1 as unsigned char.
Richard M. Stallman <rms@gnu.org>
parents:
13765
diff
changeset
|
256 some compilers sign-extend it in SYNTAX_ENTRY, despite |
|
dc1c03408169
(internal_self_insert): Declare arg c1 as unsigned char.
Richard M. Stallman <rms@gnu.org>
parents:
13765
diff
changeset
|
257 the casts to unsigned char there. */ |
|
dc1c03408169
(internal_self_insert): Declare arg c1 as unsigned char.
Richard M. Stallman <rms@gnu.org>
parents:
13765
diff
changeset
|
258 unsigned char c1; |
| 239 | 259 int noautofill; |
| 260 { | |
| 261 extern Lisp_Object Fexpand_abbrev (); | |
| 262 int hairy = 0; | |
| 263 Lisp_Object tem; | |
| 264 register enum syntaxcode synt; | |
| 265 register int c = c1; | |
|
6496
e1967b6d9a5c
(internal_self_insert): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
5754
diff
changeset
|
266 Lisp_Object overwrite; |
| 239 | 267 |
|
6496
e1967b6d9a5c
(internal_self_insert): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
5754
diff
changeset
|
268 overwrite = current_buffer->overwrite_mode; |
|
6788
4c912c5779f5
(internal_self_insert): Test Vafter_change_functions,
Richard M. Stallman <rms@gnu.org>
parents:
6496
diff
changeset
|
269 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
|
270 || !NILP (Vbefore_change_functions) || !NILP (Vafter_change_functions)) |
| 239 | 271 hairy = 1; |
| 272 | |
|
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
273 if (!NILP (overwrite) |
| 239 | 274 && point < ZV |
|
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
275 && (EQ (overwrite, Qoverwrite_mode_binary) |
|
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
276 || (c != '\n' && FETCH_CHAR (point) != '\n')) |
|
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
277 && (EQ (overwrite, Qoverwrite_mode_binary) |
|
1948
e7b8107294b7
(syms_of_cmds): New var `overwrite-binary-mode'.
Richard M. Stallman <rms@gnu.org>
parents:
1098
diff
changeset
|
278 || FETCH_CHAR (point) != '\t' |
| 239 | 279 || XINT (current_buffer->tab_width) <= 0 |
|
2159
6a082f5ce7e6
(internal_self_insert): Check that tab_width does not
Richard M. Stallman <rms@gnu.org>
parents:
1986
diff
changeset
|
280 || XFASTINT (current_buffer->tab_width) > 20 |
| 239 | 281 || !((current_column () + 1) % XFASTINT (current_buffer->tab_width)))) |
| 282 { | |
| 283 del_range (point, point + 1); | |
|
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
284 hairy = 2; |
| 239 | 285 } |
| 485 | 286 if (!NILP (current_buffer->abbrev_mode) |
| 239 | 287 && SYNTAX (c) != Sword |
| 485 | 288 && NILP (current_buffer->read_only) |
| 239 | 289 && point > BEGV && SYNTAX (FETCH_CHAR (point - 1)) == Sword) |
| 290 { | |
|
1098
79f020f34683
(internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents:
1022
diff
changeset
|
291 int modiff = MODIFF; |
|
1022
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
292 Fexpand_abbrev (); |
|
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
293 /* We can't trust the value of Fexpand_abbrev, |
|
1098
79f020f34683
(internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents:
1022
diff
changeset
|
294 but if Fexpand_abbrev changed the buffer, |
|
79f020f34683
(internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents:
1022
diff
changeset
|
295 assume it expanded something. */ |
|
79f020f34683
(internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents:
1022
diff
changeset
|
296 if (MODIFF != modiff) |
|
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
297 hairy = 2; |
| 239 | 298 } |
| 299 if ((c == ' ' || c == '\n') | |
| 300 && !noautofill | |
|
10474
caf4440e63e8
(internal_self_insert): Don't test current_column
Richard M. Stallman <rms@gnu.org>
parents:
10425
diff
changeset
|
301 && !NILP (current_buffer->auto_fill_function)) |
| 239 | 302 { |
|
10865
4887c9593b79
(use_hard_newlines): Variable definition moved to paragraphs.el.
Boris Goldowsky <boris@gnu.org>
parents:
10729
diff
changeset
|
303 insert_and_inherit (&c1, 1); |
|
4887c9593b79
(use_hard_newlines): Variable definition moved to paragraphs.el.
Boris Goldowsky <boris@gnu.org>
parents:
10729
diff
changeset
|
304 if (c1 == '\n') |
|
4887c9593b79
(use_hard_newlines): Variable definition moved to paragraphs.el.
Boris Goldowsky <boris@gnu.org>
parents:
10729
diff
changeset
|
305 /* 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
|
306 /* 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
|
307 /* justification, if any, know where the end is going to be. */ |
|
4887c9593b79
(use_hard_newlines): Variable definition moved to paragraphs.el.
Boris Goldowsky <boris@gnu.org>
parents:
10729
diff
changeset
|
308 SET_PT (point - 1); |
| 239 | 309 call0 (current_buffer->auto_fill_function); |
| 310 if (c1 == '\n') | |
|
10865
4887c9593b79
(use_hard_newlines): Variable definition moved to paragraphs.el.
Boris Goldowsky <boris@gnu.org>
parents:
10729
diff
changeset
|
311 SET_PT (point + 1); |
|
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
312 hairy = 2; |
| 239 | 313 } |
| 314 else | |
|
8649
e64cf8a4bf28
(internal_self_insert): Use insert_and_inherit.
Richard M. Stallman <rms@gnu.org>
parents:
8088
diff
changeset
|
315 insert_and_inherit (&c1, 1); |
|
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
316 |
|
11024
636d0fa5a920
(internal_self_insert): Do face code only if HAVE_FACES.
Karl Heuer <kwzh@gnu.org>
parents:
10865
diff
changeset
|
317 #ifdef HAVE_FACES |
|
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
318 /* 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
|
319 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
|
320 && 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
|
321 { |
|
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
322 Lisp_Object before, after; |
|
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
323 XSETINT (before, PT - 1); |
|
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
324 XSETINT (after, PT); |
|
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
325 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
|
326 Vself_insert_face = Qnil; |
|
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
327 } |
|
11024
636d0fa5a920
(internal_self_insert): Do face code only if HAVE_FACES.
Karl Heuer <kwzh@gnu.org>
parents:
10865
diff
changeset
|
328 #endif |
| 239 | 329 synt = SYNTAX (c); |
| 330 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
|
331 && !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
|
332 && !noautofill) |
| 239 | 333 { |
| 334 call0 (Vblink_paren_function); | |
|
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
335 hairy = 2; |
| 239 | 336 } |
| 337 return hairy; | |
| 338 } | |
| 339 | |
| 340 /* module initialization */ | |
| 341 | |
| 342 syms_of_cmds () | |
| 343 { | |
| 344 Qkill_backward_chars = intern ("kill-backward-chars"); | |
| 345 staticpro (&Qkill_backward_chars); | |
| 346 | |
| 347 Qkill_forward_chars = intern ("kill-forward-chars"); | |
| 348 staticpro (&Qkill_forward_chars); | |
| 349 | |
|
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
350 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
|
351 staticpro (&Qoverwrite_mode_binary); |
|
1948
e7b8107294b7
(syms_of_cmds): New var `overwrite-binary-mode'.
Richard M. Stallman <rms@gnu.org>
parents:
1098
diff
changeset
|
352 |
|
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
353 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
|
354 "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
|
355 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
|
356 Vself_insert_face = Qnil; |
|
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
357 |
|
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
358 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
|
359 "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
|
360 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
|
361 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
|
362 |
| 239 | 363 DEFVAR_LISP ("blink-paren-function", &Vblink_paren_function, |
| 364 "Function called, if non-nil, whenever a close parenthesis is inserted.\n\ | |
| 365 More precisely, a char with closeparen syntax is self-inserted."); | |
| 366 Vblink_paren_function = Qnil; | |
| 367 | |
| 368 defsubr (&Sforward_char); | |
| 369 defsubr (&Sbackward_char); | |
| 370 defsubr (&Sforward_line); | |
| 371 defsubr (&Sbeginning_of_line); | |
| 372 defsubr (&Send_of_line); | |
| 373 | |
| 374 defsubr (&Sdelete_char); | |
| 375 defsubr (&Sdelete_backward_char); | |
| 376 | |
| 377 defsubr (&Sself_insert_command); | |
| 378 } | |
| 379 | |
| 380 keys_of_cmds () | |
| 381 { | |
| 382 int n; | |
| 383 | |
|
10425
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
384 initial_define_key (global_map, Ctl ('I'), "self-insert-command"); |
| 239 | 385 for (n = 040; n < 0177; n++) |
| 386 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
|
387 #ifdef MSDOS |
|
3965bf498738
(keys_of_cmds) [MSDOS]: Chars 0200 to 0237 self-insert.
Richard M. Stallman <rms@gnu.org>
parents:
5054
diff
changeset
|
388 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
|
389 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
|
390 #endif |
|
5054
34c280d4e1af
(keys_of_cmds): Make 0377 self-inserting.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
391 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
|
392 initial_define_key (global_map, n, "self-insert-command"); |
| 239 | 393 |
| 394 initial_define_key (global_map, Ctl ('A'), "beginning-of-line"); | |
| 395 initial_define_key (global_map, Ctl ('B'), "backward-char"); | |
| 396 initial_define_key (global_map, Ctl ('D'), "delete-char"); | |
| 397 initial_define_key (global_map, Ctl ('E'), "end-of-line"); | |
| 398 initial_define_key (global_map, Ctl ('F'), "forward-char"); | |
| 399 initial_define_key (global_map, 0177, "delete-backward-char"); | |
| 400 } |
