annotate src/cmds.c @ 46838:395572099269

(Ffind_operation_coding_system): For write-region, if VISIT is a filename, make it the target.
author Kenichi Handa <handa@m17n.org>
date Thu, 08 Aug 2002 12:34:27 +0000
parents 21c0392ac82a
children 461d780ae946
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1 /* Simple built-in editing commands.
40041
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
2 Copyright (C) 1985, 93, 94, 95, 96, 97, 1998, 2001 Free Software Foundation, Inc.
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4 This file is part of GNU Emacs.
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6 GNU Emacs is free software; you can redistribute it and/or modify
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 it under the terms of the GNU General Public License as published by
647
529171c8b71c entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
8 the Free Software Foundation; either version 2, or (at your option)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9 any later version.
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11 GNU Emacs is distributed in the hope that it will be useful,
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 but WITHOUT ANY WARRANTY; without even the implied warranty of
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 GNU General Public License for more details.
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16 You should have received a copy of the GNU General Public License
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 along with GNU Emacs; see the file COPYING. If not, write to
14186
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14065
diff changeset
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14065
diff changeset
19 Boston, MA 02111-1307, USA. */
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
4696
1fc792473491 Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents: 4561
diff changeset
22 #include <config.h>
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
23 #include "lisp.h"
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
24 #include "commands.h"
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
25 #include "buffer.h"
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
26 #include "charset.h"
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
27 #include "syntax.h"
8755
a6be4973b11f Include window.h.
Richard M. Stallman <rms@gnu.org>
parents: 8649
diff changeset
28 #include "window.h"
12163
4a83c7459b52 (internal_self_insert): Make last_command be kboard-local.
Karl Heuer <kwzh@gnu.org>
parents: 11235
diff changeset
29 #include "keyboard.h"
39748
42b7a798ff79 Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31182
diff changeset
30 #include "keymap.h"
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21254
diff changeset
31 #include "dispextern.h"
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
32
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33 Lisp_Object Qkill_forward_chars, Qkill_backward_chars, Vblink_paren_function;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
34
2214
e5928bec8d5d * cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents: 2159
diff changeset
35 /* A possible value for a buffer's overwrite-mode variable. */
e5928bec8d5d * cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents: 2159
diff changeset
36 Lisp_Object Qoverwrite_mode_binary;
e5928bec8d5d * cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents: 2159
diff changeset
37
10729
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
38 /* Non-nil means put this face on the next self-inserting character. */
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
39 Lisp_Object Vself_insert_face;
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
40
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
41 /* This is the command that set up Vself_insert_face. */
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
42 Lisp_Object Vself_insert_face_command;
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
43
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
44 extern Lisp_Object Qface;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
45
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
46 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
47 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
48 (n)
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
49 Lisp_Object n;
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
50 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40041
diff changeset
51 CHECK_NUMBER (n);
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
52
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
53 return make_number (PT + XINT (n));
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
54 }
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
55
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
56 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
57 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
58 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
59 (n)
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
60 Lisp_Object n;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
61 {
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
62 if (NILP (n))
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
63 XSETFASTINT (n, 1);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
64 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40041
diff changeset
65 CHECK_NUMBER (n);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
66
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
67 /* 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
68 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
69 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
70 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
71 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
72 {
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
73 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
74
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
75 if (new_point < BEGV)
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
76 {
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
77 SET_PT (BEGV);
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
78 Fsignal (Qbeginning_of_buffer, Qnil);
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
79 }
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
80 if (new_point > ZV)
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
81 {
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
82 SET_PT (ZV);
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
83 Fsignal (Qend_of_buffer, Qnil);
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
84 }
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 SET_PT (new_point);
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
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
89 return Qnil;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
90 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
91
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
92 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
93 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
94 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
95 (n)
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
96 Lisp_Object n;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
97 {
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
98 if (NILP (n))
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
99 XSETFASTINT (n, 1);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
100 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40041
diff changeset
101 CHECK_NUMBER (n);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
102
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
103 XSETINT (n, - XINT (n));
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
104 return Fforward_char (n);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
105 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
106
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
107 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
108 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
109 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
110 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
111 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
112 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
113 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
114 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
115 (n)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
116 Lisp_Object n;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
117 {
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
118 int opoint = PT, opoint_byte = PT_BYTE;
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
119 int pos, pos_byte;
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
120 int count, shortage;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
121
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 239
diff changeset
122 if (NILP (n))
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
123 count = 1;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
124 else
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
125 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40041
diff changeset
126 CHECK_NUMBER (n);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
127 count = XINT (n);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
128 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
129
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
130 if (count <= 0)
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
131 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
132 else
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
133 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
134
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
135 /* Since scan_newline does TEMP_SET_PT_BOTH,
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
136 and we want to set PT "for real",
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
137 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
138 pos = PT;
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
139 pos_byte = PT_BYTE;
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
140 TEMP_SET_PT_BOTH (opoint, opoint_byte);
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
141 SET_PT_BOTH (pos, pos_byte);
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
142
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
143 if (shortage > 0
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
144 && (count <= 0
647
529171c8b71c entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
145 || (ZV > BEGV
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
146 && PT != opoint
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
147 && (FETCH_BYTE (PT_BYTE - 1) != '\n'))))
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
148 shortage--;
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
149
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
150 return make_number (count <= 0 ? - shortage : shortage);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
151 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
152
40041
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
153 DEFUN ("beginning-of-line", Fbeginning_of_line, Sbeginning_of_line, 0, 1, "p",
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
154 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
155 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
156 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
157
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
158 This command does not move point across a field boundary unless doing so
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
159 would move beyond there to a different line; If N is nil or 1, and point
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
160 starts at a field boundary, point does not move. To ignore field
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
161 boundaries, either bind `inhibit-field-text-motion' to t, or use the
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
162 `forward-line' function instead. For instance, `(forward-line 0)' does
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
163 the same thing as `(beginning-of-line)', except that it ignores field
45618
21c0392ac82a (Fdelete_backward_char, internal_self_insert): Cast
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44754
diff changeset
164 boundaries. */)
40041
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
165 (n)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
166 Lisp_Object n;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
167 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 239
diff changeset
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
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
175 return Qnil;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
176 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
177
40041
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
178 DEFUN ("end-of-line", Fend_of_line, Send_of_line, 0, 1, "p",
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
179 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
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.
44754
628a697e2315 (Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents: 41001
diff changeset
182 To ignore intangibility, bind `inhibit-text-motion-hooks' to t.
40041
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
183
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
184 This command does not move point across a field boundary unless doing so
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
185 would move beyond there to a different line; if N is nil or 1, and
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
186 point starts at a field boundary, point does not move. To ignore field
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
187 boundaries bind `inhibit-field-text-motion' to t. */)
9d6d2c8564b3 (Fbeginning_of_line, Fend_of_line): Clarify interaction with fields and
Miles Bader <miles@gnu.org>
parents: 39748
diff changeset
188 (n)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
189 Lisp_Object n;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
190 {
44754
628a697e2315 (Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents: 41001
diff changeset
191 int newpos;
628a697e2315 (Fend_of_line): Handle intangible text in mid line.
Richard M. Stallman <rms@gnu.org>
parents: 41001
diff changeset
192
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 239
diff changeset
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
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
223
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
224 return Qnil;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
225 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
226
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
a17c8b15ef1b Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
231 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
232 (n, killflag)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
233 Lisp_Object n, killflag;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
234 {
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
235 int pos;
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
236
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40041
diff changeset
237 CHECK_NUMBER (n);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
238
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
239 pos = PT + XINT (n);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 239
diff changeset
240 if (NILP (killflag))
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
241 {
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
242 if (XINT (n) < 0)
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
243 {
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
244 if (pos < BEGV)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
245 Fsignal (Qbeginning_of_buffer, Qnil);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
246 else
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
247 del_range (pos, PT);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
248 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
249 else
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
250 {
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
251 if (pos > ZV)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
252 Fsignal (Qend_of_buffer, Qnil);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
253 else
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
254 del_range (PT, pos);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
255 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
256 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
257 else
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
258 {
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
259 call1 (Qkill_forward_chars, n);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
260 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
261 return Qnil;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
262 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
263
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
264 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
265 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
266 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
267 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
268 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
269 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
270 (n, killflag)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
271 Lisp_Object n, killflag;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
272 {
14436
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
273 Lisp_Object value;
15875
5ffb83189a1b (Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents: 15262
diff changeset
274 int deleted_special = 0;
20958
806727604be8 (Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents: 20708
diff changeset
275 int pos, pos_byte, i;
14436
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
276
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40041
diff changeset
277 CHECK_NUMBER (n);
14436
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
278
15875
5ffb83189a1b (Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents: 15262
diff changeset
279 /* 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
280 pos = PT;
806727604be8 (Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents: 20708
diff changeset
281 pos_byte = PT_BYTE;
806727604be8 (Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents: 20708
diff changeset
282 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
283 {
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
284 int c;
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
285
20958
806727604be8 (Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents: 20708
diff changeset
286 DEC_BOTH (pos, pos_byte);
806727604be8 (Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents: 20708
diff changeset
287 c = FETCH_BYTE (pos_byte);
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
288 if (c == '\t' || c == '\n')
14436
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
289 {
15875
5ffb83189a1b (Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents: 15262
diff changeset
290 deleted_special = 1;
14436
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
291 break;
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
292 }
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
293 }
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
294
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
295 /* 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
296 unless at end of line. */
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
297 if (XINT (n) > 0
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
298 && ! NILP (current_buffer->overwrite_mode)
15875
5ffb83189a1b (Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents: 15262
diff changeset
299 && ! deleted_special
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
300 && ! (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
301 {
45618
21c0392ac82a (Fdelete_backward_char, internal_self_insert): Cast
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 44754
diff changeset
302 int column = (int) current_column (); /* iftc */
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
303
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
304 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
305 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
306 Finsert_char (make_number (' '), make_number (i), Qnil);
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
307 /* 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
308 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
309 }
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
310 else
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
311 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
312
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
313 return value;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
314 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
315
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
316 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
317 doc: /* Insert the character you type.
a17c8b15ef1b Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
318 Whichever character you type to run this command is inserted. */)
a17c8b15ef1b Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
319 (n)
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
320 Lisp_Object n;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
321 {
17849
a6442e20f768 (nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17376
diff changeset
322 int character = XINT (last_command_char);
a6442e20f768 (nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17376
diff changeset
323
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40041
diff changeset
324 CHECK_NUMBER (n);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
325
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
326 /* Barf if the key that invoked this was not a character. */
9135
551c9e4fa12a (Fself_insert_command): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 8755
diff changeset
327 if (!INTEGERP (last_command_char))
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
328 bitch_at_user ();
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
329 else if (XINT (n) >= 2 && NILP (current_buffer->overwrite_mode))
12869
2304fcfade47 (Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents: 12163
diff changeset
330 {
17849
a6442e20f768 (nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17376
diff changeset
331 int modified_char = character;
a6442e20f768 (nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17376
diff changeset
332 /* Add the offset to the character, for Finsert_char.
a6442e20f768 (nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17376
diff changeset
333 We pass internal_self_insert the unmodified character
a6442e20f768 (nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17376
diff changeset
334 because it itself does this offsetting. */
20701
59ffd6ac16ec (internal_self_insert, Fself_insert_command):
Richard M. Stallman <rms@gnu.org>
parents: 20615
diff changeset
335 if (! NILP (current_buffer->enable_multibyte_characters))
59ffd6ac16ec (internal_self_insert, Fself_insert_command):
Richard M. Stallman <rms@gnu.org>
parents: 20615
diff changeset
336 modified_char = unibyte_char_to_multibyte (modified_char);
17849
a6442e20f768 (nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17376
diff changeset
337
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
338 XSETFASTINT (n, XFASTINT (n) - 2);
12869
2304fcfade47 (Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents: 12163
diff changeset
339 /* The first one might want to expand an abbrev. */
17849
a6442e20f768 (nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17376
diff changeset
340 internal_self_insert (character, 1);
12869
2304fcfade47 (Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents: 12163
diff changeset
341 /* The bulk of the copies of this char can be inserted simply.
2304fcfade47 (Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents: 12163
diff changeset
342 We don't have to handle a user-specified face specially
2304fcfade47 (Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents: 12163
diff changeset
343 because it will get inherited from the first char inserted. */
17849
a6442e20f768 (nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17376
diff changeset
344 Finsert_char (make_number (modified_char), n, Qt);
12869
2304fcfade47 (Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents: 12163
diff changeset
345 /* The last one might want to auto-fill. */
17849
a6442e20f768 (nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17376
diff changeset
346 internal_self_insert (character, 0);
12869
2304fcfade47 (Fself_insert_command): Optimize the case with arg > 2
Richard M. Stallman <rms@gnu.org>
parents: 12163
diff changeset
347 }
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
348 else
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
349 while (XINT (n) > 0)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
350 {
9332
1ff5359ac932 (Fself_insert_command, Fnewline): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9300
diff changeset
351 /* Ok since old and new vals both nonneg */
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
352 XSETFASTINT (n, XFASTINT (n) - 1);
17849
a6442e20f768 (nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17376
diff changeset
353 internal_self_insert (character, XFASTINT (n) != 0);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
354 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
355
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
356 return Qnil;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
357 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
358
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
359 /* 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
360 even if it is enabled.
f7e3bac23a06 (internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents: 647
diff changeset
361
f7e3bac23a06 (internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents: 647
diff changeset
362 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
363 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
364 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
365
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21254
diff changeset
366 int
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
367 internal_self_insert (c, noautofill)
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
368 int c;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
369 int noautofill;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
370 {
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
371 extern Lisp_Object Fexpand_abbrev ();
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
372 int hairy = 0;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
373 Lisp_Object tem;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
374 register enum syntaxcode synt;
18813
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
375 Lisp_Object overwrite, string;
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
376 /* Length of multi-byte form of C. */
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
377 int len;
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
378 /* 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
379 unsigned char str[MAX_MULTIBYTE_LENGTH];
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
380 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
381 int spaces_to_insert = 0;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
382
6496
e1967b6d9a5c (internal_self_insert): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 5754
diff changeset
383 overwrite = current_buffer->overwrite_mode;
29378
141820271eff (internal_self_insert): Don't check
Dave Love <fx@gnu.org>
parents: 27379
diff changeset
384 if (!NILP (Vbefore_change_functions) || !NILP (Vafter_change_functions))
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
385 hairy = 1;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
386
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
387 /* At first, get multi-byte form of C in STR. */
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
388 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
389 {
3bf522f06501 (internal_self_insert): Avoid checking enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents: 20958
diff changeset
390 c = unibyte_char_to_multibyte (c);
26845
5c3e047bbf23 (internal_self_insert): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26390
diff changeset
391 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
392 if (len == 1)
1944b3595afd (internal_self_insert): If C has modifier bits, insert
Kenichi Handa <handa@m17n.org>
parents: 23487
diff changeset
393 /* 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
394 one-byte char. */
1944b3595afd (internal_self_insert): If C has modifier bits, insert
Kenichi Handa <handa@m17n.org>
parents: 23487
diff changeset
395 c = *str;
21032
3bf522f06501 (internal_self_insert): Avoid checking enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents: 20958
diff changeset
396 }
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
397 else
22926
436499b7a769 (internal_self_insert): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents: 21514
diff changeset
398 {
26845
5c3e047bbf23 (internal_self_insert): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26390
diff changeset
399 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
400 ? c
5c3e047bbf23 (internal_self_insert): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents: 26390
diff changeset
401 : 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
402 len = 1;
436499b7a769 (internal_self_insert): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents: 21514
diff changeset
403 }
2214
e5928bec8d5d * cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents: 2159
diff changeset
404 if (!NILP (overwrite)
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
405 && PT < ZV)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
406 {
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
407 /* In overwrite-mode, we substitute a character at point (C2,
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
408 hereafter) by C. For that, we delete C2 in advance. But,
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
409 just substituting C2 by C may move a remaining text in the
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
410 line to the right or to the left, which is not preferable.
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
411 So we insert more spaces or delete more characters in the
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
412 following cases: if C is narrower than C2, after deleting C2,
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
413 we fill columns with spaces, if C is wider than C2, we delete
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
414 C2 and several characters following C2. */
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
415
20615
ddb1eec37783 (internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents: 20541
diff changeset
416 /* This is the character after point. */
ddb1eec37783 (internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents: 20541
diff changeset
417 int c2 = FETCH_CHAR (PT_BYTE);
ddb1eec37783 (internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents: 20541
diff changeset
418
ddb1eec37783 (internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents: 20541
diff changeset
419 /* Column the cursor should be placed at after this insertion.
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
420 The correct value should be calculated only when necessary. */
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
421 int target_clm = 0;
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
422
19658
063c22255157 (internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents: 18813
diff changeset
423 /* 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
424 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
425 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
426 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
427 or before a tab if it doesn't use the whole width of the tab. */
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
428 if (EQ (overwrite, Qoverwrite_mode_binary)
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
429 || (c != '\n'
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
430 && 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
431 && ! (c2 == '\t'
063c22255157 (internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents: 18813
diff changeset
432 && 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
433 && 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
434 && (target_clm = ((int) current_column () /* iftc */
24423
230bace6a57a (internal_self_insert): Calculate column properly
Karl Heuer <kwzh@gnu.org>
parents: 23765
diff changeset
435 + 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
436 target_clm % XFASTINT (current_buffer->tab_width)))))
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
437 {
18813
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
438 int pos = PT;
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
439 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
440
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
441 if (target_clm == 0)
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
442 chars_to_delete = 1;
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
443 else
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
444 {
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
445 /* The actual cursor position after the trial of moving
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
446 to column TARGET_CLM. It is greater than TARGET_CLM
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
447 if the TARGET_CLM is middle of multi-column
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
448 character. In that case, the new point is set after
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
449 that character. */
18748
6897bd6a1c8d (Fdelete_backward_char): Convert Finsert_char argument to
Richard M. Stallman <rms@gnu.org>
parents: 18239
diff changeset
450 int actual_clm
6897bd6a1c8d (Fdelete_backward_char): Convert Finsert_char argument to
Richard M. Stallman <rms@gnu.org>
parents: 18239
diff changeset
451 = XFASTINT (Fmove_to_column (make_number (target_clm), Qnil));
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
452
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
453 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
454
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
455 if (actual_clm > target_clm)
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
456 {
18813
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
457 /* We will delete too many columns. Let's fill columns
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
458 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
459 spaces_to_insert = actual_clm - target_clm;
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
460 }
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
461 }
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
462 SET_PT_BOTH (pos, pos_byte);
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
463 hairy = 2;
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
464 }
8088
a831980bb12e (internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents: 7307
diff changeset
465 hairy = 2;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
466 }
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 239
diff changeset
467 if (!NILP (current_buffer->abbrev_mode)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
468 && SYNTAX (c) != Sword
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 239
diff changeset
469 && NILP (current_buffer->read_only)
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
470 && PT > BEGV && SYNTAX (XFASTINT (Fprevious_char ())) == Sword)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
471 {
1098
79f020f34683 (internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents: 1022
diff changeset
472 int modiff = MODIFF;
16748
64f315c0e3f4 (internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents: 16657
diff changeset
473 Lisp_Object sym;
64f315c0e3f4 (internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents: 16657
diff changeset
474
64f315c0e3f4 (internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents: 16657
diff changeset
475 sym = Fexpand_abbrev ();
64f315c0e3f4 (internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents: 16657
diff changeset
476
27379
48cb03c9d1d8 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 26845
diff changeset
477 /* 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
478 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
479 return right away--don't really self-insert. */
16809
c378600f005d (internal_self_insert): Check the property
Richard M. Stallman <rms@gnu.org>
parents: 16748
diff changeset
480 if (! NILP (sym) && ! NILP (XSYMBOL (sym)->function)
c378600f005d (internal_self_insert): Check the property
Richard M. Stallman <rms@gnu.org>
parents: 16748
diff changeset
481 && 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
482 {
64f315c0e3f4 (internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents: 16657
diff changeset
483 Lisp_Object prop;
16809
c378600f005d (internal_self_insert): Check the property
Richard M. Stallman <rms@gnu.org>
parents: 16748
diff changeset
484 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
485 if (! NILP (prop))
17376
aef6095be65c (internal_self_insert): Fix return value.
Karl Heuer <kwzh@gnu.org>
parents: 17026
diff changeset
486 return 1;
16748
64f315c0e3f4 (internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents: 16657
diff changeset
487 }
64f315c0e3f4 (internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents: 16657
diff changeset
488
1098
79f020f34683 (internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents: 1022
diff changeset
489 if (MODIFF != modiff)
8088
a831980bb12e (internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents: 7307
diff changeset
490 hairy = 2;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
491 }
18813
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
492
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
493 if (chars_to_delete)
18813
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
494 {
21254
d25a091700e5 (internal_self_insert): Use make_string_from_bytes.
Richard M. Stallman <rms@gnu.org>
parents: 21238
diff changeset
495 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
496 if (spaces_to_insert)
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
497 {
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
498 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
499 make_number (' '));
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
500 string = concat2 (tem, string);
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
501 }
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
502
23062
fec0e9653480 (internal_self_insert): Pass 1 as NOMARKERS to replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 22926
diff changeset
503 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
504 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
505 }
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
506 else
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
507 insert_and_inherit (str, len);
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
508
23487
6bed0cb78b71 (internal_self_insert): Check Vauto_fill_chars.
Kenichi Handa <handa@m17n.org>
parents: 23062
diff changeset
509 if ((CHAR_TABLE_P (Vauto_fill_chars)
6bed0cb78b71 (internal_self_insert): Check Vauto_fill_chars.
Kenichi Handa <handa@m17n.org>
parents: 23062
diff changeset
510 ? !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
511 : (c == ' ' || c == '\n'))
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
512 && !noautofill
10474
caf4440e63e8 (internal_self_insert): Don't test current_column
Richard M. Stallman <rms@gnu.org>
parents: 10425
diff changeset
513 && !NILP (current_buffer->auto_fill_function))
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
514 {
15262
b455f3f77823 (internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents: 14436
diff changeset
515 Lisp_Object tem;
b455f3f77823 (internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents: 14436
diff changeset
516
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
517 if (c == '\n')
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
518 /* 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
519 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
520 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
521 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
522 tem = call0 (current_buffer->auto_fill_function);
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
523 if (c == '\n')
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
524 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
525 if (!NILP (tem))
b455f3f77823 (internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents: 14436
diff changeset
526 hairy = 2;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
527 }
10729
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
528
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
529 /* 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
530 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
531 && 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
532 {
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
533 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
534 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
535 Vself_insert_face = Qnil;
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
536 }
18813
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
537
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
538 synt = SYNTAX (c);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
539 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
540 && !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
541 && !noautofill)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
542 {
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
543 call0 (Vblink_paren_function);
8088
a831980bb12e (internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents: 7307
diff changeset
544 hairy = 2;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
545 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
546 return hairy;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
547 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
548
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
549 /* module initialization */
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
550
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21254
diff changeset
551 void
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
552 syms_of_cmds ()
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
553 {
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
554 Qkill_backward_chars = intern ("kill-backward-chars");
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
555 staticpro (&Qkill_backward_chars);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
556
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
557 Qkill_forward_chars = intern ("kill-forward-chars");
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
558 staticpro (&Qkill_forward_chars);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
559
2214
e5928bec8d5d * cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents: 2159
diff changeset
560 Qoverwrite_mode_binary = intern ("overwrite-mode-binary");
e5928bec8d5d * cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents: 2159
diff changeset
561 staticpro (&Qoverwrite_mode_binary);
1948
e7b8107294b7 (syms_of_cmds): New var `overwrite-binary-mode'.
Richard M. Stallman <rms@gnu.org>
parents: 1098
diff changeset
562
10729
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
563 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
564 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
565 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
566 Vself_insert_face = Qnil;
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
567
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
568 DEFVAR_LISP ("self-insert-face-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
569 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
570 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
571 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
572
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
573 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
574 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
575 More precisely, a char with closeparen syntax is self-inserted. */);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
576 Vblink_paren_function = Qnil;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
577
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
578 defsubr (&Sforward_point);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
579 defsubr (&Sforward_char);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
580 defsubr (&Sbackward_char);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
581 defsubr (&Sforward_line);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
582 defsubr (&Sbeginning_of_line);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
583 defsubr (&Send_of_line);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
584
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
585 defsubr (&Sdelete_char);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
586 defsubr (&Sdelete_backward_char);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
587
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
588 defsubr (&Sself_insert_command);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
589 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
590
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21254
diff changeset
591 void
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
592 keys_of_cmds ()
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
593 {
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
594 int n;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
595
10425
f44f048966e8 (Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9884
diff changeset
596 initial_define_key (global_map, Ctl ('I'), "self-insert-command");
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
597 for (n = 040; n < 0177; n++)
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
598 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
599 #ifdef MSDOS
3965bf498738 (keys_of_cmds) [MSDOS]: Chars 0200 to 0237 self-insert.
Richard M. Stallman <rms@gnu.org>
parents: 5054
diff changeset
600 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
601 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
602 #endif
5054
34c280d4e1af (keys_of_cmds): Make 0377 self-inserting.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
603 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
604 initial_define_key (global_map, n, "self-insert-command");
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
605
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
606 initial_define_key (global_map, Ctl ('A'), "beginning-of-line");
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
607 initial_define_key (global_map, Ctl ('B'), "backward-char");
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
608 initial_define_key (global_map, Ctl ('D'), "delete-char");
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
609 initial_define_key (global_map, Ctl ('E'), "end-of-line");
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
610 initial_define_key (global_map, Ctl ('F'), "forward-char");
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
611 initial_define_key (global_map, 0177, "delete-backward-char");
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
612 }