Mercurial > emacs
annotate src/cmds.c @ 112291:d10e4c917525
* fileio.c (make_temp_name): Remove unreachable code.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Sun, 16 Jan 2011 23:07:30 -0800 |
parents | ef719132ddfa |
children | 42e22c4f06b7 |
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, |
112218
376148b31b5e
Add 2011 to FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents:
108666
diff
changeset
|
3 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
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 |
110088
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
35 Lisp_Object Qkill_forward_chars, Qkill_backward_chars; |
239 | 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 |
110552
66f6be9b4d43
Fix int/EMACS_INT use in ccl.c, cmds.c, data.c, dispnew.c.
Eli Zaretskii <eliz@gnu.org>
parents:
110514
diff
changeset
|
40 static int internal_self_insert (int, EMACS_INT); |
239 | 41 |
17026 | 42 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
|
43 doc: /* Return buffer position N characters after (before if N negative) point. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
44 (Lisp_Object n) |
17026 | 45 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
46 CHECK_NUMBER (n); |
17026 | 47 |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
48 return make_number (PT + XINT (n)); |
17026 | 49 } |
50 | |
93545
63d60f1f216a
(Fforward_char, Fbackward_char, Fforward_line)
Chong Yidong <cyd@stupidchicken.com>
parents:
91327
diff
changeset
|
51 DEFUN ("forward-char", Fforward_char, Sforward_char, 0, 1, "^p", |
108596
cd5442b2826b
Implement bidi-sensitive movement with arrow keys.
Eli Zaretskii <eliz@gnu.org>
parents:
107713
diff
changeset
|
52 doc: /* Move point N characters forward (backward if N is negative). |
cd5442b2826b
Implement bidi-sensitive movement with arrow keys.
Eli Zaretskii <eliz@gnu.org>
parents:
107713
diff
changeset
|
53 On reaching end or beginning of buffer, stop and signal error. |
cd5442b2826b
Implement bidi-sensitive movement with arrow keys.
Eli Zaretskii <eliz@gnu.org>
parents:
107713
diff
changeset
|
54 |
cd5442b2826b
Implement bidi-sensitive movement with arrow keys.
Eli Zaretskii <eliz@gnu.org>
parents:
107713
diff
changeset
|
55 Depending on the bidirectional context, the movement may be to the |
cd5442b2826b
Implement bidi-sensitive movement with arrow keys.
Eli Zaretskii <eliz@gnu.org>
parents:
107713
diff
changeset
|
56 right or to the left on the screen. This is in contrast with |
108895
c4f9f87f04a2
* cmds.c (Fforward_char, Fbackward_char): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
108756
diff
changeset
|
57 \\[right-char], which see. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
58 (Lisp_Object n) |
239 | 59 { |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
60 if (NILP (n)) |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
61 XSETFASTINT (n, 1); |
239 | 62 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
63 CHECK_NUMBER (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 /* 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
|
66 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
|
67 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
|
68 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
|
69 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
|
70 { |
110514
8e5fcc5dd96b
Clean up EMACS_INT/int in cmds.c, as well as USE_SAFE_ALLOCA.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110360
diff
changeset
|
71 EMACS_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
|
72 |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
73 if (new_point < BEGV) |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
74 { |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
75 SET_PT (BEGV); |
71971
a0c56d32ce9f
(Fforward_char, Fdelete_char): Use xsignal0.
Kim F. Storm <storm@cua.dk>
parents:
68839
diff
changeset
|
76 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
|
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 > ZV) |
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 (ZV); |
71971
a0c56d32ce9f
(Fforward_char, Fdelete_char): Use xsignal0.
Kim F. Storm <storm@cua.dk>
parents:
68839
diff
changeset
|
81 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
|
82 } |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
83 |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
84 SET_PT (new_point); |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
85 } |
40e00789f1c1
* cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents:
2214
diff
changeset
|
86 |
239 | 87 return Qnil; |
88 } | |
89 | |
93545
63d60f1f216a
(Fforward_char, Fbackward_char, Fforward_line)
Chong Yidong <cyd@stupidchicken.com>
parents:
91327
diff
changeset
|
90 DEFUN ("backward-char", Fbackward_char, Sbackward_char, 0, 1, "^p", |
108596
cd5442b2826b
Implement bidi-sensitive movement with arrow keys.
Eli Zaretskii <eliz@gnu.org>
parents:
107713
diff
changeset
|
91 doc: /* Move point N characters backward (forward if N is negative). |
cd5442b2826b
Implement bidi-sensitive movement with arrow keys.
Eli Zaretskii <eliz@gnu.org>
parents:
107713
diff
changeset
|
92 On attempt to pass beginning or end of buffer, stop and signal error. |
cd5442b2826b
Implement bidi-sensitive movement with arrow keys.
Eli Zaretskii <eliz@gnu.org>
parents:
107713
diff
changeset
|
93 |
cd5442b2826b
Implement bidi-sensitive movement with arrow keys.
Eli Zaretskii <eliz@gnu.org>
parents:
107713
diff
changeset
|
94 Depending on the bidirectional context, the movement may be to the |
cd5442b2826b
Implement bidi-sensitive movement with arrow keys.
Eli Zaretskii <eliz@gnu.org>
parents:
107713
diff
changeset
|
95 right or to the left on the screen. This is in contrast with |
108895
c4f9f87f04a2
* cmds.c (Fforward_char, Fbackward_char): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
108756
diff
changeset
|
96 \\[left-char], which see. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
97 (Lisp_Object n) |
239 | 98 { |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
99 if (NILP (n)) |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
100 XSETFASTINT (n, 1); |
239 | 101 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
102 CHECK_NUMBER (n); |
239 | 103 |
14065
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
104 XSETINT (n, - XINT (n)); |
60600bcfe5f1
(Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents:
13825
diff
changeset
|
105 return Fforward_char (n); |
239 | 106 } |
107 | |
93545
63d60f1f216a
(Fforward_char, Fbackward_char, Fforward_line)
Chong Yidong <cyd@stupidchicken.com>
parents:
91327
diff
changeset
|
108 DEFUN ("forward-line", Fforward_line, Sforward_line, 0, 1, "^p", |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
109 doc: /* Move N lines forward (backward if N is negative). |
109684
dbc0119ac80e
Make some doc strings bidi-friendly.
Eli Zaretskii <eliz@gnu.org>
parents:
109573
diff
changeset
|
110 Precisely, if point is on line I, move to the start of line I + N |
dbc0119ac80e
Make some doc strings bidi-friendly.
Eli Zaretskii <eliz@gnu.org>
parents:
109573
diff
changeset
|
111 \("start of line" in the logical order). |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
112 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
|
113 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
|
114 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
|
115 With positive N, a non-empty line at the end counts as one line |
108895
c4f9f87f04a2
* cmds.c (Fforward_char, Fbackward_char): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
108756
diff
changeset
|
116 successfully moved (for the return value). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
117 (Lisp_Object n) |
239 | 118 { |
110514
8e5fcc5dd96b
Clean up EMACS_INT/int in cmds.c, as well as USE_SAFE_ALLOCA.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110360
diff
changeset
|
119 EMACS_INT opoint = PT, opoint_byte = PT_BYTE; |
8e5fcc5dd96b
Clean up EMACS_INT/int in cmds.c, as well as USE_SAFE_ALLOCA.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110360
diff
changeset
|
120 EMACS_INT pos, pos_byte; |
8e5fcc5dd96b
Clean up EMACS_INT/int in cmds.c, as well as USE_SAFE_ALLOCA.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110360
diff
changeset
|
121 EMACS_INT count, shortage; |
239 | 122 |
485 | 123 if (NILP (n)) |
239 | 124 count = 1; |
125 else | |
126 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
127 CHECK_NUMBER (n); |
239 | 128 count = XINT (n); |
129 } | |
130 | |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
131 if (count <= 0) |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
132 shortage = scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, count - 1, 1); |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
133 else |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
134 shortage = scan_newline (PT, PT_BYTE, ZV, ZV_BYTE, count, 1); |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
135 |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
136 /* Since scan_newline does TEMP_SET_PT_BOTH, |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
137 and we want to set PT "for real", |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
138 go back to the old point and then come back here. */ |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
139 pos = PT; |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
140 pos_byte = PT_BYTE; |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
141 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
142 SET_PT_BOTH (pos, pos_byte); |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
143 |
239 | 144 if (shortage > 0 |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
145 && (count <= 0 |
647 | 146 || (ZV > BEGV |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
147 && PT != opoint |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
148 && (FETCH_BYTE (PT_BYTE - 1) != '\n')))) |
239 | 149 shortage--; |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
150 |
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
151 return make_number (count <= 0 ? - shortage : shortage); |
239 | 152 } |
153 | |
93545
63d60f1f216a
(Fforward_char, Fbackward_char, Fforward_line)
Chong Yidong <cyd@stupidchicken.com>
parents:
91327
diff
changeset
|
154 DEFUN ("beginning-of-line", Fbeginning_of_line, Sbeginning_of_line, 0, 1, "^p", |
109684
dbc0119ac80e
Make some doc strings bidi-friendly.
Eli Zaretskii <eliz@gnu.org>
parents:
109573
diff
changeset
|
155 doc: /* Move point to beginning of current line (in the logical order). |
40041
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
156 With argument N not nil or 1, move forward N - 1 lines first. |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
157 If point reaches the beginning or end of buffer, it stops there. |
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
158 |
68393
b5ff41ef0331
(Fbeginning_of_line, Fend_of_line): Clarify confusing doc string.
Károly Lőrentey <lorentey@elte.hu>
parents:
68391
diff
changeset
|
159 This function constrains point to the current field unless this moves |
108895
c4f9f87f04a2
* cmds.c (Fforward_char, Fbackward_char): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
108756
diff
changeset
|
160 point to a different line than the original, unconstrained result. |
c4f9f87f04a2
* cmds.c (Fforward_char, Fbackward_char): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
108756
diff
changeset
|
161 If N is nil or 1, and a front-sticky field starts at point, the point |
68393
b5ff41ef0331
(Fbeginning_of_line, Fend_of_line): Clarify confusing doc string.
Károly Lőrentey <lorentey@elte.hu>
parents:
68391
diff
changeset
|
162 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
|
163 `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
|
164 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
|
165 `(beginning-of-line)', except that it ignores field boundaries. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
166 (Lisp_Object n) |
239 | 167 { |
485 | 168 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
|
169 XSETFASTINT (n, 1); |
239 | 170 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
171 CHECK_NUMBER (n); |
239 | 172 |
25632
82ebdf9967da
(Fbeginning_of_line): Don't handle minibuffer prompt here.
Richard M. Stallman <rms@gnu.org>
parents:
25351
diff
changeset
|
173 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
|
174 |
239 | 175 return Qnil; |
176 } | |
177 | |
93545
63d60f1f216a
(Fforward_char, Fbackward_char, Fforward_line)
Chong Yidong <cyd@stupidchicken.com>
parents:
91327
diff
changeset
|
178 DEFUN ("end-of-line", Fend_of_line, Send_of_line, 0, 1, "^p", |
109684
dbc0119ac80e
Make some doc strings bidi-friendly.
Eli Zaretskii <eliz@gnu.org>
parents:
109573
diff
changeset
|
179 doc: /* Move point to end of current line (in the logical order). |
40041
9d6d2c8564b3
(Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents:
39748
diff
changeset
|
180 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
|
181 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
|
182 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
|
183 |
68393
b5ff41ef0331
(Fbeginning_of_line, Fend_of_line): Clarify confusing doc string.
Károly Lőrentey <lorentey@elte.hu>
parents:
68391
diff
changeset
|
184 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
|
185 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
|
186 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
|
187 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
|
188 to t. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
189 (Lisp_Object n) |
239 | 190 { |
110514
8e5fcc5dd96b
Clean up EMACS_INT/int in cmds.c, as well as USE_SAFE_ALLOCA.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110360
diff
changeset
|
191 EMACS_INT newpos; |
44754
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
192 |
485 | 193 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
|
194 XSETFASTINT (n, 1); |
239 | 195 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
196 CHECK_NUMBER (n); |
239 | 197 |
44754
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
198 while (1) |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
199 { |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
200 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
|
201 SET_PT (newpos); |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
202 |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
203 if (PT > newpos |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
204 && 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
|
205 { |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
206 /* 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
|
207 an invisible intangible run, |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
208 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
|
209 within the line. */ |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
210 |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
211 SET_PT (PT - 1); |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
212 break; |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
213 } |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
214 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
|
215 && FETCH_CHAR (PT) != '\n') |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
216 /* 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
|
217 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
|
218 keep going. */ |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
219 n = make_number (1); |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
220 else |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
221 break; |
628a697e2315
(Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents:
41001
diff
changeset
|
222 } |
239 | 223 |
224 return Qnil; | |
225 } | |
226 | |
227 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
|
228 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
|
229 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
|
230 Interactively, N is the prefix arg, and KILLFLAG is set if |
109062
d8144fe7f3f8
* bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents:
108895
diff
changeset
|
231 N was explicitly specified. |
d8144fe7f3f8
* bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents:
108895
diff
changeset
|
232 |
111048
3c2bab829253
Decouple C-d and delete, so that the former does not delete the region.
Chong Yidong <cyd@stupidchicken.com>
parents:
110552
diff
changeset
|
233 The command `delete-forward-char' is preferable for interactive use. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
234 (Lisp_Object n, Lisp_Object killflag) |
239 | 235 { |
110514
8e5fcc5dd96b
Clean up EMACS_INT/int in cmds.c, as well as USE_SAFE_ALLOCA.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110360
diff
changeset
|
236 EMACS_INT pos; |
17026 | 237 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40041
diff
changeset
|
238 CHECK_NUMBER (n); |
239 | 239 |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
240 pos = PT + XINT (n); |
485 | 241 if (NILP (killflag)) |
239 | 242 { |
243 if (XINT (n) < 0) | |
244 { | |
17026 | 245 if (pos < BEGV) |
71971
a0c56d32ce9f
(Fforward_char, Fdelete_char): Use xsignal0.
Kim F. Storm <storm@cua.dk>
parents:
68839
diff
changeset
|
246 xsignal0 (Qbeginning_of_buffer); |
239 | 247 else |
17026 | 248 del_range (pos, PT); |
239 | 249 } |
250 else | |
251 { | |
17026 | 252 if (pos > ZV) |
71971
a0c56d32ce9f
(Fforward_char, Fdelete_char): Use xsignal0.
Kim F. Storm <storm@cua.dk>
parents:
68839
diff
changeset
|
253 xsignal0 (Qend_of_buffer); |
239 | 254 else |
17026 | 255 del_range (PT, pos); |
239 | 256 } |
257 } | |
258 else | |
259 { | |
260 call1 (Qkill_forward_chars, n); | |
261 } | |
262 return Qnil; | |
263 } | |
264 | |
107713
41747909cb4b
Get rid of the direct_output optimizations.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
265 static int nonundocount; |
104235
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
266 |
48228
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
267 /* 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
|
268 calling this. */ |
239 | 269 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
|
270 doc: /* Insert the character you type. |
104235
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
271 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
|
272 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
|
273 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
|
274 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
|
275 `auto-fill-chars' table has a non-nil value for the inserted character. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
276 (Lisp_Object n) |
239 | 277 { |
106177
cb523092ddfd
* xterm.c (x_new_font):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105877
diff
changeset
|
278 int remove_boundary = 1; |
111499
60e30155ac96
* src/cmds.c (Fself_insert_command): Don't call XFASTINT without checking
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
111194
diff
changeset
|
279 CHECK_NATNUM (n); |
104235
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
280 |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
281 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
|
282 nonundocount = 0; |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
283 |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
284 if (NILP (Vexecuting_kbd_macro) |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
285 && !EQ (minibuf_window, selected_window)) |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
286 { |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
287 if (nonundocount <= 0 || nonundocount >= 20) |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
288 { |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
289 remove_boundary = 0; |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
290 nonundocount = 0; |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
291 } |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
292 nonundocount++; |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
293 } |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
294 |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
295 if (remove_boundary |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
296 && CONSP (current_buffer->undo_list) |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
297 && NILP (XCAR (current_buffer->undo_list))) |
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
298 /* 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
|
299 current_buffer->undo_list = XCDR (current_buffer->undo_list); |
239 | 300 |
301 /* 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
|
302 if (!CHARACTERP (last_command_event)) |
239 | 303 bitch_at_user (); |
48228
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
304 { |
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
305 int character = translate_char (Vtranslation_table_for_input, |
110514
8e5fcc5dd96b
Clean up EMACS_INT/int in cmds.c, as well as USE_SAFE_ALLOCA.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110360
diff
changeset
|
306 (int) XINT (last_command_event)); |
110552
66f6be9b4d43
Fix int/EMACS_INT use in ccl.c, cmds.c, data.c, dispnew.c.
Eli Zaretskii <eliz@gnu.org>
parents:
110514
diff
changeset
|
307 int val = internal_self_insert (character, XFASTINT (n)); |
110088
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
308 if (val == 2) |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
309 nonundocount = 0; |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
310 frame_make_pointer_invisible (); |
48228
461d780ae946
(Fself_insert_command): Apply Vtranslation_table_for_input.
Dave Love <fx@gnu.org>
parents:
45618
diff
changeset
|
311 } |
239 | 312 |
313 return Qnil; | |
314 } | |
315 | |
110088
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
316 /* Insert N times character C |
1022
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
317 |
f7e3bac23a06
(internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
318 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
|
319 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
|
320 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
|
321 |
51819
ff438bca7989
(Qexpand_abbrev): New sym.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48228
diff
changeset
|
322 static Lisp_Object Qexpand_abbrev; |
109881
3db1493a6f89
New post-self-insert-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109684
diff
changeset
|
323 static Lisp_Object Qpost_self_insert_hook, Vpost_self_insert_hook; |
51819
ff438bca7989
(Qexpand_abbrev): New sym.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48228
diff
changeset
|
324 |
109509
4b7ca75642a8
Make internal_self_insert static
Andreas Schwab <schwab@linux-m68k.org>
parents:
109179
diff
changeset
|
325 static int |
110552
66f6be9b4d43
Fix int/EMACS_INT use in ccl.c, cmds.c, data.c, dispnew.c.
Eli Zaretskii <eliz@gnu.org>
parents:
110514
diff
changeset
|
326 internal_self_insert (int c, EMACS_INT n) |
239 | 327 { |
328 int hairy = 0; | |
329 Lisp_Object tem; | |
330 register enum syntaxcode synt; | |
110088
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
331 Lisp_Object overwrite; |
17026 | 332 /* Length of multi-byte form of C. */ |
333 int len; | |
334 /* 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
|
335 unsigned char str[MAX_MULTIBYTE_LENGTH]; |
110514
8e5fcc5dd96b
Clean up EMACS_INT/int in cmds.c, as well as USE_SAFE_ALLOCA.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110360
diff
changeset
|
336 EMACS_INT chars_to_delete = 0; |
8e5fcc5dd96b
Clean up EMACS_INT/int in cmds.c, as well as USE_SAFE_ALLOCA.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110360
diff
changeset
|
337 EMACS_INT spaces_to_insert = 0; |
239 | 338 |
6496
e1967b6d9a5c
(internal_self_insert): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
5754
diff
changeset
|
339 overwrite = current_buffer->overwrite_mode; |
29378
141820271eff
(internal_self_insert): Don't check
Dave Love <fx@gnu.org>
parents:
27379
diff
changeset
|
340 if (!NILP (Vbefore_change_functions) || !NILP (Vafter_change_functions)) |
239 | 341 hairy = 1; |
342 | |
17026 | 343 /* At first, get multi-byte form of C in STR. */ |
344 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
|
345 { |
26845
5c3e047bbf23
(internal_self_insert): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26390
diff
changeset
|
346 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
|
347 if (len == 1) |
1944b3595afd
(internal_self_insert): If C has modifier bits, insert
Kenichi Handa <handa@m17n.org>
parents:
23487
diff
changeset
|
348 /* 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
|
349 one-byte char. */ |
1944b3595afd
(internal_self_insert): If C has modifier bits, insert
Kenichi Handa <handa@m17n.org>
parents:
23487
diff
changeset
|
350 c = *str; |
21032
3bf522f06501
(internal_self_insert): Avoid checking enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
20958
diff
changeset
|
351 } |
17026 | 352 else |
22926
436499b7a769
(internal_self_insert): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
353 { |
26845
5c3e047bbf23
(internal_self_insert): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26390
diff
changeset
|
354 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
|
355 ? c |
5c3e047bbf23
(internal_self_insert): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26390
diff
changeset
|
356 : 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
|
357 len = 1; |
436499b7a769
(internal_self_insert): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
358 } |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2159
diff
changeset
|
359 if (!NILP (overwrite) |
17026 | 360 && PT < ZV) |
239 | 361 { |
17026 | 362 /* In overwrite-mode, we substitute a character at point (C2, |
363 hereafter) by C. For that, we delete C2 in advance. But, | |
364 just substituting C2 by C may move a remaining text in the | |
365 line to the right or to the left, which is not preferable. | |
366 So we insert more spaces or delete more characters in the | |
367 following cases: if C is narrower than C2, after deleting C2, | |
368 we fill columns with spaces, if C is wider than C2, we delete | |
369 C2 and several characters following C2. */ | |
370 | |
20615
ddb1eec37783
(internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents:
20541
diff
changeset
|
371 /* This is the character after point. */ |
ddb1eec37783
(internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents:
20541
diff
changeset
|
372 int c2 = FETCH_CHAR (PT_BYTE); |
ddb1eec37783
(internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents:
20541
diff
changeset
|
373 |
19658
063c22255157
(internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents:
18813
diff
changeset
|
374 /* 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
|
375 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
|
376 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
|
377 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
|
378 or before a tab if it doesn't use the whole width of the tab. */ |
110088
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
379 if (EQ (overwrite, Qoverwrite_mode_binary)) |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
380 chars_to_delete = n; |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
381 else if (c != '\n' && c2 != '\n') |
17026 | 382 { |
110514
8e5fcc5dd96b
Clean up EMACS_INT/int in cmds.c, as well as USE_SAFE_ALLOCA.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110360
diff
changeset
|
383 EMACS_INT pos = PT; |
8e5fcc5dd96b
Clean up EMACS_INT/int in cmds.c, as well as USE_SAFE_ALLOCA.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110360
diff
changeset
|
384 EMACS_INT pos_byte = PT_BYTE; |
110088
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
385 /* Column the cursor should be placed at after this insertion. |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
386 The correct value should be calculated only when necessary. */ |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
387 int target_clm = ((int) current_column () /* iftc */ |
110514
8e5fcc5dd96b
Clean up EMACS_INT/int in cmds.c, as well as USE_SAFE_ALLOCA.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110360
diff
changeset
|
388 + n * (int) XINT (Fchar_width (make_number (c)))); |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
389 |
17026 | 390 /* The actual cursor position after the trial of moving |
391 to column TARGET_CLM. It is greater than TARGET_CLM | |
392 if the TARGET_CLM is middle of multi-column | |
393 character. In that case, the new point is set after | |
394 that character. */ | |
18748
6897bd6a1c8d
(Fdelete_backward_char): Convert Finsert_char argument to
Richard M. Stallman <rms@gnu.org>
parents:
18239
diff
changeset
|
395 int actual_clm |
110514
8e5fcc5dd96b
Clean up EMACS_INT/int in cmds.c, as well as USE_SAFE_ALLOCA.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110360
diff
changeset
|
396 = (int) XFASTINT (Fmove_to_column (make_number (target_clm), |
8e5fcc5dd96b
Clean up EMACS_INT/int in cmds.c, as well as USE_SAFE_ALLOCA.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110360
diff
changeset
|
397 Qnil)); |
17026 | 398 |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
399 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
|
400 |
17026 | 401 if (actual_clm > target_clm) |
110088
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
402 { /* We will delete too many columns. Let's fill columns |
17026 | 403 by spaces so that the remaining text won't move. */ |
110088
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
404 EMACS_INT actual = PT_BYTE; |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
405 DEC_POS (actual); |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
406 if (FETCH_CHAR (actual) == '\t') |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
407 /* Rather than add spaces, let's just keep the tab. */ |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
408 chars_to_delete--; |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
409 else |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
410 spaces_to_insert = actual_clm - target_clm; |
17026 | 411 } |
110088
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
412 |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
413 SET_PT_BOTH (pos, pos_byte); |
17026 | 414 } |
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
415 hairy = 2; |
239 | 416 } |
89057
08f4bdc64a89
(internal_self_insert): In a multibyte buffer, insert C
Kenichi Handa <handa@m17n.org>
parents:
88823
diff
changeset
|
417 |
08f4bdc64a89
(internal_self_insert): In a multibyte buffer, insert C
Kenichi Handa <handa@m17n.org>
parents:
88823
diff
changeset
|
418 synt = SYNTAX (c); |
08f4bdc64a89
(internal_self_insert): In a multibyte buffer, insert C
Kenichi Handa <handa@m17n.org>
parents:
88823
diff
changeset
|
419 |
485 | 420 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
|
421 && synt != Sword |
485 | 422 && 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
|
423 && PT > BEGV |
109881
3db1493a6f89
New post-self-insert-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109684
diff
changeset
|
424 && (SYNTAX (!NILP (current_buffer->enable_multibyte_characters) |
3db1493a6f89
New post-self-insert-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109684
diff
changeset
|
425 ? XFASTINT (Fprevious_char ()) |
3db1493a6f89
New post-self-insert-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109684
diff
changeset
|
426 : UNIBYTE_TO_CHAR (XFASTINT (Fprevious_char ()))) |
3db1493a6f89
New post-self-insert-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109684
diff
changeset
|
427 == Sword)) |
239 | 428 { |
1098
79f020f34683
(internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents:
1022
diff
changeset
|
429 int modiff = MODIFF; |
16748
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
430 Lisp_Object sym; |
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
431 |
51819
ff438bca7989
(Qexpand_abbrev): New sym.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48228
diff
changeset
|
432 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
|
433 |
27379 | 434 /* 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
|
435 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
|
436 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
|
437 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
|
438 && 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
|
439 { |
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
440 Lisp_Object prop; |
16809
c378600f005d
(internal_self_insert): Check the property
Richard M. Stallman <rms@gnu.org>
parents:
16748
diff
changeset
|
441 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
|
442 if (! NILP (prop)) |
17376
aef6095be65c
(internal_self_insert): Fix return value.
Karl Heuer <kwzh@gnu.org>
parents:
17026
diff
changeset
|
443 return 1; |
16748
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
444 } |
64f315c0e3f4
(internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents:
16657
diff
changeset
|
445 |
1098
79f020f34683
(internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents:
1022
diff
changeset
|
446 if (MODIFF != modiff) |
8088
a831980bb12e
(internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
447 hairy = 2; |
239 | 448 } |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
449 |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
450 if (chars_to_delete) |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
451 { |
110088
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
452 int mc = ((NILP (current_buffer->enable_multibyte_characters) |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
453 && SINGLE_BYTE_CHAR_P (c)) |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
454 ? UNIBYTE_TO_CHAR (c) : c); |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
455 Lisp_Object string = Fmake_string (make_number (n), make_number (mc)); |
111193 | 456 |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
457 if (spaces_to_insert) |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
458 { |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
459 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
|
460 make_number (' ')); |
110088
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
461 string = concat2 (string, tem); |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
462 } |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
463 |
23062
fec0e9653480
(internal_self_insert): Pass 1 as NOMARKERS to replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
22926
diff
changeset
|
464 replace_range (PT, PT + chars_to_delete, string, 1, 1, 1); |
110088
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
465 Fforward_char (make_number (n + spaces_to_insert)); |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
466 } |
110088
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
467 else if (n > 1) |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
468 { |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
469 USE_SAFE_ALLOCA; |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
470 unsigned char *strn, *p; |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
471 SAFE_ALLOCA (strn, unsigned char*, n * len); |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
472 for (p = strn; n > 0; n--, p += len) |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
473 memcpy (p, str, len); |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
474 insert_and_inherit (strn, p - strn); |
8102180db0fb
* lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109881
diff
changeset
|
475 SAFE_FREE (); |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
476 } |
111194
692eb4db341f
cmds.c: (internal_self_insert): Don't insert for negative arguments.
Eli Zaretskii <eliz@gnu.org>
parents:
111193
diff
changeset
|
477 else if (n > 0) |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
478 insert_and_inherit (str, len); |
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
479 |
23487
6bed0cb78b71
(internal_self_insert): Check Vauto_fill_chars.
Kenichi Handa <handa@m17n.org>
parents:
23062
diff
changeset
|
480 if ((CHAR_TABLE_P (Vauto_fill_chars) |
6bed0cb78b71
(internal_self_insert): Check Vauto_fill_chars.
Kenichi Handa <handa@m17n.org>
parents:
23062
diff
changeset
|
481 ? !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
|
482 : (c == ' ' || c == '\n')) |
10474
caf4440e63e8
(internal_self_insert): Don't test current_column
Richard M. Stallman <rms@gnu.org>
parents:
10425
diff
changeset
|
483 && !NILP (current_buffer->auto_fill_function)) |
239 | 484 { |
15262
b455f3f77823
(internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents:
14436
diff
changeset
|
485 Lisp_Object tem; |
b455f3f77823
(internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents:
14436
diff
changeset
|
486 |
17026 | 487 if (c == '\n') |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
488 /* 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
|
489 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
|
490 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
|
491 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
|
492 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
|
493 /* 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
|
494 if (c == '\n' && PT < ZV) |
20541
0cd7f6f42138
(forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
19658
diff
changeset
|
495 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
|
496 if (!NILP (tem)) |
b455f3f77823
(internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents:
14436
diff
changeset
|
497 hairy = 2; |
239 | 498 } |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
499 |
109881
3db1493a6f89
New post-self-insert-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109684
diff
changeset
|
500 /* Run hooks for electric keys. */ |
3db1493a6f89
New post-self-insert-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109684
diff
changeset
|
501 call1 (Vrun_hooks, Qpost_self_insert_hook); |
18813
498c1590b4a8
(internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents:
18748
diff
changeset
|
502 |
239 | 503 return hairy; |
504 } | |
505 | |
506 /* module initialization */ | |
507 | |
21514 | 508 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109062
diff
changeset
|
509 syms_of_cmds (void) |
239 | 510 { |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
511 Qkill_backward_chars = intern_c_string ("kill-backward-chars"); |
239 | 512 staticpro (&Qkill_backward_chars); |
513 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
514 Qkill_forward_chars = intern_c_string ("kill-forward-chars"); |
239 | 515 staticpro (&Qkill_forward_chars); |
516 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
517 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
|
518 staticpro (&Qoverwrite_mode_binary); |
1948
e7b8107294b7
(syms_of_cmds): New var `overwrite-binary-mode'.
Richard M. Stallman <rms@gnu.org>
parents:
1098
diff
changeset
|
519 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
520 Qexpand_abbrev = intern_c_string ("expand-abbrev"); |
51819
ff438bca7989
(Qexpand_abbrev): New sym.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48228
diff
changeset
|
521 staticpro (&Qexpand_abbrev); |
ff438bca7989
(Qexpand_abbrev): New sym.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48228
diff
changeset
|
522 |
109881
3db1493a6f89
New post-self-insert-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109684
diff
changeset
|
523 Qpost_self_insert_hook = intern_c_string ("post-self-insert-hook"); |
3db1493a6f89
New post-self-insert-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109684
diff
changeset
|
524 staticpro (&Qpost_self_insert_hook); |
10729
fb4f688fc2cf
(Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
10474
diff
changeset
|
525 |
109881
3db1493a6f89
New post-self-insert-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109684
diff
changeset
|
526 DEFVAR_LISP ("post-self-insert-hook", &Vpost_self_insert_hook, |
3db1493a6f89
New post-self-insert-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109684
diff
changeset
|
527 doc: /* Hook run at the end of `self-insert-command'. |
110360
01aabf6189ef
src/cmds.c (syms_of_cmds) <post-self-insert-hook>: Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
110088
diff
changeset
|
528 This is run after inserting the character. */); |
109881
3db1493a6f89
New post-self-insert-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109684
diff
changeset
|
529 Vpost_self_insert_hook = Qnil; |
239 | 530 |
17026 | 531 defsubr (&Sforward_point); |
239 | 532 defsubr (&Sforward_char); |
533 defsubr (&Sbackward_char); | |
534 defsubr (&Sforward_line); | |
535 defsubr (&Sbeginning_of_line); | |
536 defsubr (&Send_of_line); | |
537 | |
538 defsubr (&Sdelete_char); | |
539 defsubr (&Sself_insert_command); | |
540 } | |
541 | |
21514 | 542 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109062
diff
changeset
|
543 keys_of_cmds (void) |
239 | 544 { |
545 int n; | |
546 | |
104235
b729d024f6dc
* cmds.c (nonundocount): New global variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103875
diff
changeset
|
547 nonundocount = 0; |
10425
f44f048966e8
(Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9884
diff
changeset
|
548 initial_define_key (global_map, Ctl ('I'), "self-insert-command"); |
239 | 549 for (n = 040; n < 0177; n++) |
550 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
|
551 #ifdef MSDOS |
3965bf498738
(keys_of_cmds) [MSDOS]: Chars 0200 to 0237 self-insert.
Richard M. Stallman <rms@gnu.org>
parents:
5054
diff
changeset
|
552 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
|
553 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
|
554 #endif |
5054
34c280d4e1af
(keys_of_cmds): Make 0377 self-inserting.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
555 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
|
556 initial_define_key (global_map, n, "self-insert-command"); |
239 | 557 |
558 initial_define_key (global_map, Ctl ('A'), "beginning-of-line"); | |
559 initial_define_key (global_map, Ctl ('B'), "backward-char"); | |
560 initial_define_key (global_map, Ctl ('E'), "end-of-line"); | |
561 initial_define_key (global_map, Ctl ('F'), "forward-char"); | |
562 } | |
52401 | 563 |