Mercurial > emacs
annotate src/cmds.c @ 111046:f0ba7e7104ca
* net/tramp.el (tramp-do-file-attributes-with-stat)
(tramp-do-directory-files-and-attributes-with-stat): Use "e0" in
order to make stat results a float. Patch by Andreas Schwab
<schwab@linux-m68k.org>.
author | Michael Albinus <michael.albinus@gmx.de> |
---|---|
date | Tue, 19 Oct 2010 11:26:21 +0200 |
parents | 6fcf1baf9c2a |
children | f3d817d46523 376148b31b5e |
rev | line source |
---|---|
239 | 1 /* Simple built-in editing commands. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
2 Copyright (C) 1985, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, |
106815 | 3 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
79759 | 4 Free Software Foundation, Inc. |
239 | 5 |
6 This file is part of GNU Emacs. | |
7 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93545
diff
changeset
|
8 GNU Emacs is free software: you can redistribute it and/or modify |
239 | 9 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93545
diff
changeset
|
10 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93545
diff
changeset
|
11 (at your option) any later version. |
239 | 12 |
13 GNU Emacs is distributed in the hope that it will be useful, | |
14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 GNU General Public License for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93545
diff
changeset
|
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
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> |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105661
diff
changeset
|
23 #include <setjmp.h> |
239 | 24 #include "lisp.h" |
25 #include "commands.h" | |
26 #include "buffer.h" | |
88351
aac41b50c875
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41001
diff
changeset
|
27 #include "character.h" |
239 | 28 #include "syntax.h" |
8755 | 29 #include "window.h" |
12163
4a83c7459b52
(internal_self_insert): Make last_command be kboard-local.
Karl Heuer <kwzh@gnu.org>
parents:
11235
diff
changeset
|
30 #include "keyboard.h" |
39748
42b7a798ff79
Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31182
diff
changeset
|
31 #include "keymap.h" |
21514 | 32 #include "dispextern.h" |
106511
1905fc4b8a80
* cmds.c: Include "frame.h".
Andreas Schwab <schwab@linux-m68k.org>
parents:
106177
diff
changeset
|
33 #include "frame.h" |
239 | 34 |
35 Lisp_Object Qkill_forward_chars, Qkill_backward_chars, Vblink_paren_function; | |
36 | |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
37 /* 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
|
38 Lisp_Object Qoverwrite_mode_binary; |
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
39 |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
40 /* 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
|
41 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
|
42 |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
43 /* 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
|
44 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
|
45 |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
46 extern Lisp_Object Qface; |
48228
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
47 extern Lisp_Object Vtranslation_table_for_input; |
239 | 48 |
17026 | 49 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
|
50 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
|
51 (n) |
17026 | 52 Lisp_Object n; |
53 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
54 CHECK_NUMBER (n); |
17026 | 55 |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
56 return make_number (PT + XINT (n)); |
17026 | 57 } |
58 | |
93545
63d60f1f216a
(Fforward_char, Fbackward_char, Fforward_line)
Chong Yidong <cyd@stupidchicken.com>
parents:
91327
diff
changeset
|
59 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
|
60 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
|
61 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
|
62 (n) |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
63 Lisp_Object n; |
239 | 64 { |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
65 if (NILP (n)) |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
66 XSETFASTINT (n, 1); |
239 | 67 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
68 CHECK_NUMBER (n); |
239 | 69 |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
70 /* 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
|
71 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
|
72 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
|
73 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
|
74 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
|
75 { |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
76 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
|
77 |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
78 if (new_point < BEGV) |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
79 { |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
80 SET_PT (BEGV); |
71971
a0c56d32ce9f
(Fforward_char, Fdelete_char): Use xsignal0.
Kim F. Storm <storm@cua.dk>
parents:
68839
diff
changeset
|
81 xsignal0 (Qbeginning_of_buffer); |
2777
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 if (new_point > ZV) |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
84 { |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
85 SET_PT (ZV); |
71971
a0c56d32ce9f
(Fforward_char, Fdelete_char): Use xsignal0.
Kim F. Storm <storm@cua.dk>
parents:
68839
diff
changeset
|
86 xsignal0 (Qend_of_buffer); |
2777
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
87 } |
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 SET_PT (new_point); |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
90 } |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
91 |
239 | 92 return Qnil; |
93 } | |
94 | |
93545
63d60f1f216a
(Fforward_char, Fbackward_char, Fforward_line)
Chong Yidong <cyd@stupidchicken.com>
parents:
91327
diff
changeset
|
95 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
|
96 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
|
97 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
|
98 (n) |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
99 Lisp_Object n; |
239 | 100 { |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
101 if (NILP (n)) |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
102 XSETFASTINT (n, 1); |
239 | 103 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
104 CHECK_NUMBER (n); |
239 | 105 |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
106 XSETINT (n, - XINT (n)); |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
107 return Fforward_char (n); |
239 | 108 } |
109 | |
93545
63d60f1f216a
(Fforward_char, Fbackward_char, Fforward_line)
Chong Yidong <cyd@stupidchicken.com>
parents:
91327
diff
changeset
|
110 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
|
111 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
|
112 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
|
113 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
|
114 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
|
115 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
|
116 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
|
117 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
|
118 (n) |
239 | 119 Lisp_Object n; |
120 { | |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
121 int opoint = PT, opoint_byte = PT_BYTE; |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
122 int pos, pos_byte; |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
123 int count, shortage; |
239 | 124 |
485 | 125 if (NILP (n)) |
239 | 126 count = 1; |
127 else | |
128 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
129 CHECK_NUMBER (n); |
239 | 130 count = XINT (n); |
131 } | |
132 | |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
133 if (count <= 0) |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
134 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
|
135 else |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
136 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
|
137 |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
138 /* Since scan_newline does TEMP_SET_PT_BOTH, |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
139 and we want to set PT "for real", |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
140 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
|
141 pos = PT; |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
142 pos_byte = PT_BYTE; |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
143 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
144 SET_PT_BOTH (pos, pos_byte); |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
145 |
239 | 146 if (shortage > 0 |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
147 && (count <= 0 |
647 | 148 || (ZV > BEGV |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
149 && PT != opoint |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
150 && (FETCH_BYTE (PT_BYTE - 1) != '\n')))) |
239 | 151 shortage--; |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
152 |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
153 return make_number (count <= 0 ? - shortage : shortage); |
239 | 154 } |
155 | |
93545
63d60f1f216a
(Fforward_char, Fbackward_char, Fforward_line)
Chong Yidong <cyd@stupidchicken.com>
parents:
91327
diff
changeset
|
156 DEFUN ("beginning-of-line", Fbeginning_of_line, Sbeginning_of_line, 0, 1, "^p", |
40041
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
157 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
|
158 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
|
159 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
|
160 |
68393
b5ff41ef0331
(Fbeginning_of_line, Fend_of_line): Clarify confusing doc string.
Károly Lőrentey <lorentey@elte.hu>
parents:
68391
diff
changeset
|
161 This function constrains point to the current field unless this moves |
b5ff41ef0331
(Fbeginning_of_line, Fend_of_line): Clarify confusing doc string.
Károly Lőrentey <lorentey@elte.hu>
parents:
68391
diff
changeset
|
162 point to a different line than the original, unconstrained result. If |
b5ff41ef0331
(Fbeginning_of_line, Fend_of_line): Clarify confusing doc string.
Károly Lőrentey <lorentey@elte.hu>
parents:
68391
diff
changeset
|
163 N is nil or 1, and a front-sticky field starts at point, the point |
b5ff41ef0331
(Fbeginning_of_line, Fend_of_line): Clarify confusing doc string.
Károly Lőrentey <lorentey@elte.hu>
parents:
68391
diff
changeset
|
164 does not move. To ignore field boundaries bind |
68391
64fbda7a8666
(Fbeginning_of_line, Fend_of_line): Clarify confusing doc string.
Károly Lőrentey <lorentey@elte.hu>
parents:
64770
diff
changeset
|
165 `inhibit-field-text-motion' to t, or use the `forward-line' function |
64fbda7a8666
(Fbeginning_of_line, Fend_of_line): Clarify confusing doc string.
Károly Lőrentey <lorentey@elte.hu>
parents:
64770
diff
changeset
|
166 instead. For instance, `(forward-line 0)' does the same thing as |
64fbda7a8666
(Fbeginning_of_line, Fend_of_line): Clarify confusing doc string.
Károly Lőrentey <lorentey@elte.hu>
parents:
64770
diff
changeset
|
167 `(beginning-of-line)', except that it ignores field boundaries. */) |
40041
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
168 (n) |
239 | 169 Lisp_Object n; |
170 { | |
485 | 171 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
|
172 XSETFASTINT (n, 1); |
239 | 173 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
174 CHECK_NUMBER (n); |
239 | 175 |
25632
82ebdf9967da
(Fbeginning_of_line): Don't handle minibuffer prompt here.
Richard M. Stallman <rms@gnu.org>
parents:
25351
diff
changeset
|
176 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
|
177 |
239 | 178 return Qnil; |
179 } | |
180 | |
93545
63d60f1f216a
(Fforward_char, Fbackward_char, Fforward_line)
Chong Yidong <cyd@stupidchicken.com>
parents:
91327
diff
changeset
|
181 DEFUN ("end-of-line", Fend_of_line, Send_of_line, 0, 1, "^p", |
40041
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
182 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
|
183 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
|
184 If point reaches the beginning or end of buffer, it stops there. |
54011
b7bf96cb1f23
(Fend_of_line): Doc fix.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
185 To ignore intangibility, bind `inhibit-point-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
|
186 |
68393
b5ff41ef0331
(Fbeginning_of_line, Fend_of_line): Clarify confusing doc string.
Károly Lőrentey <lorentey@elte.hu>
parents:
68391
diff
changeset
|
187 This function constrains point to the current field unless this moves |
b5ff41ef0331
(Fbeginning_of_line, Fend_of_line): Clarify confusing doc string.
Károly Lőrentey <lorentey@elte.hu>
parents:
68391
diff
changeset
|
188 point to a different line than the original, unconstrained result. If |
b5ff41ef0331
(Fbeginning_of_line, Fend_of_line): Clarify confusing doc string.
Károly Lőrentey <lorentey@elte.hu>
parents:
68391
diff
changeset
|
189 N is nil or 1, and a rear-sticky field ends at point, the point does |
b5ff41ef0331
(Fbeginning_of_line, Fend_of_line): Clarify confusing doc string.
Károly Lőrentey <lorentey@elte.hu>
parents:
68391
diff
changeset
|
190 not move. To ignore field boundaries bind `inhibit-field-text-motion' |
b5ff41ef0331
(Fbeginning_of_line, Fend_of_line): Clarify confusing doc string.
Károly Lőrentey <lorentey@elte.hu>
parents:
68391
diff
changeset
|
191 to t. */) |
40041
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
192 (n) |
239 | 193 Lisp_Object n; |
194 { | |
44754
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
195 int newpos; |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
196 |
485 | 197 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
|
198 XSETFASTINT (n, 1); |
239 | 199 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
200 CHECK_NUMBER (n); |
239 | 201 |
44754
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
202 while (1) |
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 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
|
205 SET_PT (newpos); |
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 (PT > newpos |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
208 && 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
|
209 { |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
210 /* 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
|
211 an invisible intangible run, |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
212 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
|
213 within the line. */ |
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 SET_PT (PT - 1); |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
216 break; |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
217 } |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
218 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
|
219 && FETCH_CHAR (PT) != '\n') |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
220 /* 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
|
221 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
|
222 keep going. */ |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
223 n = make_number (1); |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
224 else |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
225 break; |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
226 } |
239 | 227 |
228 return Qnil; | |
229 } | |
230 | |
231 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
|
232 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
|
233 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
|
234 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
|
235 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
|
236 (n, killflag) |
239 | 237 Lisp_Object n, killflag; |
238 { | |
17026 | 239 int pos; |
240 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
241 CHECK_NUMBER (n); |
239 | 242 |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
243 pos = PT + XINT (n); |
485 | 244 if (NILP (killflag)) |
239 | 245 { |
246 if (XINT (n) < 0) | |
247 { | |
17026 | 248 if (pos < BEGV) |
71971
a0c56d32ce9f
(Fforward_char, Fdelete_char): Use xsignal0.
Kim F. Storm <storm@cua.dk>
parents:
68839
diff
changeset
|
249 xsignal0 (Qbeginning_of_buffer); |
239 | 250 else |
17026 | 251 del_range (pos, PT); |
239 | 252 } |
253 else | |
254 { | |
17026 | 255 if (pos > ZV) |
71971
a0c56d32ce9f
(Fforward_char, Fdelete_char): Use xsignal0.
Kim F. Storm <storm@cua.dk>
parents:
68839
diff
changeset
|
256 xsignal0 (Qend_of_buffer); |
239 | 257 else |
17026 | 258 del_range (PT, pos); |
239 | 259 } |
260 } | |
261 else | |
262 { | |
263 call1 (Qkill_forward_chars, n); | |
264 } | |
265 return Qnil; | |
266 } | |
267 | |
268 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
|
269 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
|
270 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
|
271 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
|
272 Interactively, N is the prefix arg, and KILLFLAG is set if |
108666
6fcf1baf9c2a
* emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
273 N was explicitly specified. |
6fcf1baf9c2a
* emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
274 This is meant for interactive use only; from Lisp, better use `delete-char' |
6fcf1baf9c2a
* emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
275 with a negated argument. */) |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
276 (n, killflag) |
239 | 277 Lisp_Object n, killflag; |
278 { | |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
279 Lisp_Object value; |
15875
5ffb83189a1b
(Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents:
15262
diff
changeset
|
280 int deleted_special = 0; |
20958
806727604be8
(Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents:
20708
diff
changeset
|
281 int pos, pos_byte, i; |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
282 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
283 CHECK_NUMBER (n); |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
284 |
15875
5ffb83189a1b
(Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents:
15262
diff
changeset
|
285 /* 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
|
286 pos = PT; |
806727604be8
(Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents:
20708
diff
changeset
|
287 pos_byte = PT_BYTE; |
806727604be8
(Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents:
20708
diff
changeset
|
288 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
|
289 { |
17026 | 290 int c; |
291 | |
20958
806727604be8
(Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents:
20708
diff
changeset
|
292 DEC_BOTH (pos, pos_byte); |
806727604be8
(Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents:
20708
diff
changeset
|
293 c = FETCH_BYTE (pos_byte); |
17026 | 294 if (c == '\t' || c == '\n') |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
295 { |
15875
5ffb83189a1b
(Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents:
15262
diff
changeset
|
296 deleted_special = 1; |
14436
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
297 break; |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
298 } |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
299 } |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
300 |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
301 /* 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
|
302 unless at end of line. */ |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
303 if (XINT (n) > 0 |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
304 && ! NILP (current_buffer->overwrite_mode) |
15875
5ffb83189a1b
(Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents:
15262
diff
changeset
|
305 && ! deleted_special |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
306 && ! (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
|
307 { |
45618
21c0392ac82a
(Fdelete_backward_char, internal_self_insert): Cast
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
44754
diff
changeset
|
308 int column = (int) current_column (); /* iftc */ |
17026 | 309 |
310 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
|
311 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
|
312 Finsert_char (make_number (' '), make_number (i), Qnil); |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
313 /* 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
|
314 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
|
315 } |
17026 | 316 else |
317 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
|
318 |
b56083146a42
(Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
319 return value; |
239 | 320 } |
321 | |
104235
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
322 int nonundocount; |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
323 |
48228
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
324 /* 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
|
325 calling this. */ |
239 | 326 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
|
327 doc: /* Insert the character you type. |
104235
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
328 Whichever character you type to run this command is inserted. |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
329 Before insertion, `expand-abbrev' is executed if the inserted character does |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
330 not have word syntax and the previous character in the buffer does. |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
331 After insertion, the value of `auto-fill-function' is called if the |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
332 `auto-fill-chars' table has a non-nil value for the inserted character. */) |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
333 (n) |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
334 Lisp_Object n; |
239 | 335 { |
106177
cb523092ddfd
* xterm.c (x_new_font):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105877
diff
changeset
|
336 int remove_boundary = 1; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
337 CHECK_NUMBER (n); |
104235
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
338 |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
339 if (!EQ (Vthis_command, current_kboard->Vlast_command)) |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
340 nonundocount = 0; |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
341 |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
342 if (NILP (Vexecuting_kbd_macro) |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
343 && !EQ (minibuf_window, selected_window)) |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
344 { |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
345 if (nonundocount <= 0 || nonundocount >= 20) |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
346 { |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
347 remove_boundary = 0; |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
348 nonundocount = 0; |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
349 } |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
350 nonundocount++; |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
351 } |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
352 |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
353 if (remove_boundary |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
354 && CONSP (current_buffer->undo_list) |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
355 && NILP (XCAR (current_buffer->undo_list))) |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
356 /* Remove the undo_boundary that was just pushed. */ |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
357 current_buffer->undo_list = XCDR (current_buffer->undo_list); |
239 | 358 |
359 /* Barf if the key that invoked this was not a character. */ | |
100999
58dada904f85
Update for last_command_char rename.
Glenn Morris <rgm@gnu.org>
parents:
100951
diff
changeset
|
360 if (!CHARACTERP (last_command_event)) |
239 | 361 bitch_at_user (); |
48228
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
362 { |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
363 int character = translate_char (Vtranslation_table_for_input, |
100999
58dada904f85
Update for last_command_char rename.
Glenn Morris <rgm@gnu.org>
parents:
100951
diff
changeset
|
364 XINT (last_command_event)); |
48228
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
365 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
|
366 { |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
367 XSETFASTINT (n, XFASTINT (n) - 2); |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
368 /* 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
|
369 internal_self_insert (character, 1); |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
370 /* 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
|
371 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
|
372 because it will get inherited from the first char inserted. */ |
104628
8cc773a4c3d7
(Fself_insert_command): Avoid unnecessay unibyte->multibyte
Kenichi Handa <handa@m17n.org>
parents:
104235
diff
changeset
|
373 Finsert_char (make_number (character), n, Qt); |
48228
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
374 /* 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
|
375 internal_self_insert (character, 0); |
239 | 376 } |
48228
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
377 else |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
378 while (XINT (n) > 0) |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
379 { |
104235
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
380 int val; |
48228
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
381 /* 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
|
382 XSETFASTINT (n, XFASTINT (n) - 1); |
104235
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
383 val = internal_self_insert (character, XFASTINT (n) != 0); |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
384 if (val == 2) |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
385 nonundocount = 0; |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
386 frame_make_pointer_invisible (); |
48228
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
387 } |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
388 } |
239 | 389 |
390 return Qnil; | |
391 } | |
392 | |
17026 | 393 /* 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
|
394 even if it is enabled. |
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
395 |
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
396 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
|
397 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
|
398 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
|
399 |
51819
ff438bca7989
(Qexpand_abbrev): New sym.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48228
diff
changeset
|
400 static Lisp_Object Qexpand_abbrev; |
ff438bca7989
(Qexpand_abbrev): New sym.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48228
diff
changeset
|
401 |
21514 | 402 int |
17026 | 403 internal_self_insert (c, noautofill) |
404 int c; | |
239 | 405 int noautofill; |
406 { | |
407 int hairy = 0; | |
408 Lisp_Object tem; | |
409 register enum syntaxcode synt; | |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
410 Lisp_Object overwrite, string; |
17026 | 411 /* Length of multi-byte form of C. */ |
412 int len; | |
413 /* 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
|
414 unsigned char str[MAX_MULTIBYTE_LENGTH]; |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
415 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
|
416 int spaces_to_insert = 0; |
239 | 417 |
6496
e1967b6d9a5c
(internal_self_insert): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
5754
diff
changeset
|
418 overwrite = current_buffer->overwrite_mode; |
29378
141820271eff
(internal_self_insert): Don't check
Dave Love <fx@gnu.org>
parents:
27379
diff
changeset
|
419 if (!NILP (Vbefore_change_functions) || !NILP (Vafter_change_functions)) |
239 | 420 hairy = 1; |
421 | |
17026 | 422 /* At first, get multi-byte form of C in STR. */ |
423 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
|
424 { |
26845
5c3e047bbf23
(internal_self_insert): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26390
diff
changeset
|
425 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
|
426 if (len == 1) |
1944b3595afd
(internal_self_insert): If C has modifier bits, insert
Kenichi Handa <handa@m17n.org>
parents:
23487
diff
changeset
|
427 /* 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
|
428 one-byte char. */ |
1944b3595afd
(internal_self_insert): If C has modifier bits, insert
Kenichi Handa <handa@m17n.org>
parents:
23487
diff
changeset
|
429 c = *str; |
21032
3bf522f06501
(internal_self_insert): Avoid checking enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
20958
diff
changeset
|
430 } |
17026 | 431 else |
22926
436499b7a769
(internal_self_insert): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
432 { |
26845
5c3e047bbf23
(internal_self_insert): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26390
diff
changeset
|
433 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
|
434 ? c |
5c3e047bbf23
(internal_self_insert): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26390
diff
changeset
|
435 : 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
|
436 len = 1; |
436499b7a769
(internal_self_insert): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
437 } |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
438 if (!NILP (overwrite) |
17026 | 439 && PT < ZV) |
239 | 440 { |
17026 | 441 /* In overwrite-mode, we substitute a character at point (C2, |
442 hereafter) by C. For that, we delete C2 in advance. But, | |
443 just substituting C2 by C may move a remaining text in the | |
444 line to the right or to the left, which is not preferable. | |
445 So we insert more spaces or delete more characters in the | |
446 following cases: if C is narrower than C2, after deleting C2, | |
447 we fill columns with spaces, if C is wider than C2, we delete | |
448 C2 and several characters following C2. */ | |
449 | |
20615
ddb1eec37783
(internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents:
20541
diff
changeset
|
450 /* This is the character after point. */ |
ddb1eec37783
(internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents:
20541
diff
changeset
|
451 int c2 = FETCH_CHAR (PT_BYTE); |
ddb1eec37783
(internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents:
20541
diff
changeset
|
452 |
ddb1eec37783
(internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents:
20541
diff
changeset
|
453 /* Column the cursor should be placed at after this insertion. |
17026 | 454 The correct value should be calculated only when necessary. */ |
455 int target_clm = 0; | |
456 | |
19658
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
457 /* 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
|
458 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
|
459 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
|
460 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
|
461 or before a tab if it doesn't use the whole width of the tab. */ |
17026 | 462 if (EQ (overwrite, Qoverwrite_mode_binary) |
463 || (c != '\n' | |
464 && 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
|
465 && ! (c2 == '\t' |
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
466 && 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
|
467 && 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
|
468 && (target_clm = ((int) current_column () /* iftc */ |
24423
230bace6a57a
(internal_self_insert): Calculate column properly
Karl Heuer <kwzh@gnu.org>
parents:
23765
diff
changeset
|
469 + 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
|
470 target_clm % XFASTINT (current_buffer->tab_width))))) |
17026 | 471 { |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
472 int pos = PT; |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
473 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
|
474 |
17026 | 475 if (target_clm == 0) |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
476 chars_to_delete = 1; |
17026 | 477 else |
478 { | |
479 /* The actual cursor position after the trial of moving | |
480 to column TARGET_CLM. It is greater than TARGET_CLM | |
481 if the TARGET_CLM is middle of multi-column | |
482 character. In that case, the new point is set after | |
483 that character. */ | |
18748
6897bd6a1c8d
(Fdelete_backward_char): Convert Finsert_char argument to
Richard M. Stallman <rms@gnu.org>
parents:
18239
diff
changeset
|
484 int actual_clm |
6897bd6a1c8d
(Fdelete_backward_char): Convert Finsert_char argument to
Richard M. Stallman <rms@gnu.org>
parents:
18239
diff
changeset
|
485 = XFASTINT (Fmove_to_column (make_number (target_clm), Qnil)); |
17026 | 486 |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
487 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
|
488 |
17026 | 489 if (actual_clm > target_clm) |
490 { | |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
491 /* We will delete too many columns. Let's fill columns |
17026 | 492 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
|
493 spaces_to_insert = actual_clm - target_clm; |
17026 | 494 } |
495 } | |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
496 SET_PT_BOTH (pos, pos_byte); |
17026 | 497 hairy = 2; |
498 } | |
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
499 hairy = 2; |
239 | 500 } |
89057
08f4bdc64a89
(internal_self_insert): In a multibyte buffer, insert C
Kenichi Handa <handa@m17n.org>
parents:
88823
diff
changeset
|
501 |
08f4bdc64a89
(internal_self_insert): In a multibyte buffer, insert C
Kenichi Handa <handa@m17n.org>
parents:
88823
diff
changeset
|
502 synt = SYNTAX (c); |
08f4bdc64a89
(internal_self_insert): In a multibyte buffer, insert C
Kenichi Handa <handa@m17n.org>
parents:
88823
diff
changeset
|
503 |
485 | 504 if (!NILP (current_buffer->abbrev_mode) |
89057
08f4bdc64a89
(internal_self_insert): In a multibyte buffer, insert C
Kenichi Handa <handa@m17n.org>
parents:
88823
diff
changeset
|
505 && synt != Sword |
485 | 506 && NILP (current_buffer->read_only) |
89057
08f4bdc64a89
(internal_self_insert): In a multibyte buffer, insert C
Kenichi Handa <handa@m17n.org>
parents:
88823
diff
changeset
|
507 && PT > BEGV |
08f4bdc64a89
(internal_self_insert): In a multibyte buffer, insert C
Kenichi Handa <handa@m17n.org>
parents:
88823
diff
changeset
|
508 && (!NILP (current_buffer->enable_multibyte_characters) |
08f4bdc64a89
(internal_self_insert): In a multibyte buffer, insert C
Kenichi Handa <handa@m17n.org>
parents:
88823
diff
changeset
|
509 ? SYNTAX (XFASTINT (Fprevious_char ())) == Sword |
105661
bac26aa40069
Remove leftover table unibyte_to_multibyte_table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105659
diff
changeset
|
510 : (SYNTAX (UNIBYTE_TO_CHAR (XFASTINT (Fprevious_char ()))) |
89057
08f4bdc64a89
(internal_self_insert): In a multibyte buffer, insert C
Kenichi Handa <handa@m17n.org>
parents:
88823
diff
changeset
|
511 == Sword))) |
239 | 512 { |
1098
79f020f34683
(internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents:
1022
diff
changeset
|
513 int modiff = MODIFF; |
16748
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
514 Lisp_Object sym; |
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
515 |
51819
ff438bca7989
(Qexpand_abbrev): New sym.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48228
diff
changeset
|
516 sym = call0 (Qexpand_abbrev); |
16748
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
517 |
27379 | 518 /* 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
|
519 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
|
520 return right away--don't really self-insert. */ |
103875
82a4881dbc9d
(internal_self_insert): Check sym by SYMBOLP before
Kenichi Handa <handa@m17n.org>
parents:
100999
diff
changeset
|
521 if (SYMBOLP (sym) && ! NILP (sym) && ! NILP (XSYMBOL (sym)->function) |
16809
c378600f005d
(internal_self_insert): Check the property
Richard M. Stallman <rms@gnu.org>
parents:
16748
diff
changeset
|
522 && 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
|
523 { |
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
524 Lisp_Object prop; |
16809
c378600f005d
(internal_self_insert): Check the property
Richard M. Stallman <rms@gnu.org>
parents:
16748
diff
changeset
|
525 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
|
526 if (! NILP (prop)) |
17376
aef6095be65c
(internal_self_insert): Fix return value.
Karl Heuer <kwzh@gnu.org>
parents:
17026
diff
changeset
|
527 return 1; |
16748
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
528 } |
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
529 |
1098
79f020f34683
(internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents:
1022
diff
changeset
|
530 if (MODIFF != modiff) |
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
531 hairy = 2; |
239 | 532 } |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
533 |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
534 if (chars_to_delete) |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
535 { |
21254
d25a091700e5
(internal_self_insert): Use make_string_from_bytes.
Richard M. Stallman <rms@gnu.org>
parents:
21238
diff
changeset
|
536 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
|
537 if (spaces_to_insert) |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
538 { |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
539 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
|
540 make_number (' ')); |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
541 string = concat2 (tem, string); |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
542 } |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
543 |
23062
fec0e9653480
(internal_self_insert): Pass 1 as NOMARKERS to replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
22926
diff
changeset
|
544 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
|
545 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
|
546 } |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
547 else |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
548 insert_and_inherit (str, len); |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
549 |
23487
6bed0cb78b71
(internal_self_insert): Check Vauto_fill_chars.
Kenichi Handa <handa@m17n.org>
parents:
23062
diff
changeset
|
550 if ((CHAR_TABLE_P (Vauto_fill_chars) |
6bed0cb78b71
(internal_self_insert): Check Vauto_fill_chars.
Kenichi Handa <handa@m17n.org>
parents:
23062
diff
changeset
|
551 ? !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
|
552 : (c == ' ' || c == '\n')) |
239 | 553 && !noautofill |
10474
caf4440e63e8
(internal_self_insert): Don't test current_column
Richard M. Stallman <rms@gnu.org>
parents:
10425
diff
changeset
|
554 && !NILP (current_buffer->auto_fill_function)) |
239 | 555 { |
15262
b455f3f77823
(internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents:
14436
diff
changeset
|
556 Lisp_Object tem; |
b455f3f77823
(internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents:
14436
diff
changeset
|
557 |
17026 | 558 if (c == '\n') |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
559 /* 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
|
560 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
|
561 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
|
562 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
|
563 tem = call0 (current_buffer->auto_fill_function); |
68839
14ada287f3fd
(internal_self_insert): Handle weird auto-fill-function.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
564 /* Test PT < ZV in case the auto-fill-function is strange. */ |
14ada287f3fd
(internal_self_insert): Handle weird auto-fill-function.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
565 if (c == '\n' && PT < ZV) |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
566 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
|
567 if (!NILP (tem)) |
b455f3f77823
(internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents:
14436
diff
changeset
|
568 hairy = 2; |
239 | 569 } |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
570 |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
571 /* 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
|
572 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
|
573 && 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
|
574 { |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
575 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
|
576 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
|
577 Vself_insert_face = Qnil; |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
578 } |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
579 |
239 | 580 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
|
581 && !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
|
582 && !noautofill) |
239 | 583 { |
584 call0 (Vblink_paren_function); | |
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
585 hairy = 2; |
239 | 586 } |
587 return hairy; | |
588 } | |
589 | |
590 /* module initialization */ | |
591 | |
21514 | 592 void |
239 | 593 syms_of_cmds () |
594 { | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
595 Qkill_backward_chars = intern_c_string ("kill-backward-chars"); |
239 | 596 staticpro (&Qkill_backward_chars); |
597 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
598 Qkill_forward_chars = intern_c_string ("kill-forward-chars"); |
239 | 599 staticpro (&Qkill_forward_chars); |
600 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
601 Qoverwrite_mode_binary = intern_c_string ("overwrite-mode-binary"); |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
602 staticpro (&Qoverwrite_mode_binary); |
1948
e7b8107294b7
(syms_of_cmds): New var `overwrite-binary-mode'.
Richard M. Stallman <rms@gnu.org>
parents:
1098
diff
changeset
|
603 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
604 Qexpand_abbrev = intern_c_string ("expand-abbrev"); |
51819
ff438bca7989
(Qexpand_abbrev): New sym.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48228
diff
changeset
|
605 staticpro (&Qexpand_abbrev); |
ff438bca7989
(Qexpand_abbrev): New sym.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48228
diff
changeset
|
606 |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
607 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
|
608 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
|
609 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
|
610 Vself_insert_face = Qnil; |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
611 |
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
612 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
|
613 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
|
614 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
|
615 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
|
616 |
239 | 617 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
|
618 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
|
619 More precisely, a char with closeparen syntax is self-inserted. */); |
239 | 620 Vblink_paren_function = Qnil; |
621 | |
17026 | 622 defsubr (&Sforward_point); |
239 | 623 defsubr (&Sforward_char); |
624 defsubr (&Sbackward_char); | |
625 defsubr (&Sforward_line); | |
626 defsubr (&Sbeginning_of_line); | |
627 defsubr (&Send_of_line); | |
628 | |
629 defsubr (&Sdelete_char); | |
630 defsubr (&Sdelete_backward_char); | |
631 | |
632 defsubr (&Sself_insert_command); | |
633 } | |
634 | |
21514 | 635 void |
239 | 636 keys_of_cmds () |
637 { | |
638 int n; | |
639 | |
104235
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
640 nonundocount = 0; |
10425
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
641 initial_define_key (global_map, Ctl ('I'), "self-insert-command"); |
239 | 642 for (n = 040; n < 0177; n++) |
643 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
|
644 #ifdef MSDOS |
3965bf498738
(keys_of_cmds) [MSDOS]: Chars 0200 to 0237 self-insert.
Richard M. Stallman <rms@gnu.org>
parents:
5054
diff
changeset
|
645 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
|
646 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
|
647 #endif |
5054
34c280d4e1af
(keys_of_cmds): Make 0377 self-inserting.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
648 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
|
649 initial_define_key (global_map, n, "self-insert-command"); |
239 | 650 |
651 initial_define_key (global_map, Ctl ('A'), "beginning-of-line"); | |
652 initial_define_key (global_map, Ctl ('B'), "backward-char"); | |
653 initial_define_key (global_map, Ctl ('D'), "delete-char"); | |
654 initial_define_key (global_map, Ctl ('E'), "end-of-line"); | |
655 initial_define_key (global_map, Ctl ('F'), "forward-char"); | |
656 initial_define_key (global_map, 0177, "delete-backward-char"); | |
657 } | |
52401 | 658 |
659 /* arch-tag: 022ba3cd-67f9-4978-9c5d-7d2b18d8644e | |
660 (do not change this comment) */ |