annotate src/cmds.c @ 23323:0800a4f84757

(underlying_strftime): Set the buffer to a nonzero value before calling strftime, and check to see whether strftime has set the buffer to zero. This lets us distinguish between an empty buffer and an error. I'm installing this patch by hand now; it will be superseded whenever the glibc sources are propagated back to fsf.org.
author Paul Eggert <eggert@twinsun.com>
date Fri, 25 Sep 1998 21:40:23 +0000
parents fec0e9653480
children 6bed0cb78b71
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.
20708
ed9ed828415e Update copyright year.
Richard M. Stallman <rms@gnu.org>
parents: 20701
diff changeset
2 Copyright (C) 1985, 93, 94, 95, 96, 97, 1998 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"
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21254
diff changeset
30 #include "dispextern.h"
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
31
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
32 Lisp_Object Qkill_forward_chars, Qkill_backward_chars, Vblink_paren_function;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33
2214
e5928bec8d5d * cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents: 2159
diff changeset
34 /* 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
35 Lisp_Object Qoverwrite_mode_binary;
e5928bec8d5d * cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents: 2159
diff changeset
36
10729
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
37 /* 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
38 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
39
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
40 /* 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
41 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
42
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
43 extern Lisp_Object Qface;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
44
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
45 DEFUN ("forward-point", Fforward_point, Sforward_point, 1, 1, 0,
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
46 "Return buffer position N characters after (before if N negative) point.")
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
47 (n)
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
48 Lisp_Object n;
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
49 {
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
50 CHECK_NUMBER (n, 0);
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
51
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
52 return make_number (PT + XINT (n));
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
53 }
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
54
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
55 DEFUN ("forward-char", Fforward_char, Sforward_char, 0, 1, "p",
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
56 "Move point right N characters (left if N is negative).\n\
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
57 On reaching end of buffer, stop and signal error.")
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
58 (n)
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
59 Lisp_Object n;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
60 {
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
61 if (NILP (n))
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
62 XSETFASTINT (n, 1);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
63 else
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
64 CHECK_NUMBER (n, 0);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
65
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
66 /* 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
67 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
68 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
69 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
70 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
71 {
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
72 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
73
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
74 if (new_point < BEGV)
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
75 {
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
76 SET_PT (BEGV);
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
77 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
78 }
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
79 if (new_point > ZV)
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
80 {
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
81 SET_PT (ZV);
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
82 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
83 }
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
84
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
85 SET_PT (new_point);
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
86 }
40e00789f1c1 * cmds.c (Fforward_char): Check proposed new position, and then
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
87
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
88 return Qnil;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
89 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
90
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
91 DEFUN ("backward-char", Fbackward_char, Sbackward_char, 0, 1, "p",
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
92 "Move point left N characters (right if N is negative).\n\
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
93 On attempt to pass beginning or end of buffer, stop and signal error.")
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
94 (n)
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
95 Lisp_Object n;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
96 {
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
97 if (NILP (n))
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
98 XSETFASTINT (n, 1);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
99 else
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
100 CHECK_NUMBER (n, 0);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
101
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
102 XSETINT (n, - XINT (n));
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
103 return Fforward_char (n);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
104 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
105
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
106 DEFUN ("forward-line", Fforward_line, Sforward_line, 0, 1, "p",
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
107 "Move N lines forward (backward if N is negative).\n\
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
108 Precisely, if point is on line I, move to the start of line I + N.\n\
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
109 If there isn't room, go as far as possible (no error).\n\
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
110 Returns the count of lines left to move. If moving forward,\n\
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
111 that is N - number of lines moved; if backward, N + number moved.\n\
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
112 With positive N, a non-empty line at the end counts as one line\n\
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
113 successfully moved (for the return value).")
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
114 (n)
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
115 Lisp_Object n;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
116 {
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
117 int opoint = PT, opoint_byte = PT_BYTE;
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
118 int pos, pos_byte;
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
119 int count, shortage;
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
120 int temp;
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 {
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
126 CHECK_NUMBER (n, 0);
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
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
153 DEFUN ("beginning-of-line", Fbeginning_of_line, Sbeginning_of_line,
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
154 0, 1, "p",
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
155 "Move point to beginning of current line.\n\
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
156 With argument N not nil or 1, move forward N - 1 lines first.\n\
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
157 If scan reaches end of buffer, stop there without error.")
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
158 (n)
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
159 Lisp_Object n;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
160 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 239
diff changeset
161 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
162 XSETFASTINT (n, 1);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
163 else
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
164 CHECK_NUMBER (n, 0);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
165
16657
f31cab608aa9 (Fend_of_line, Fbeginning_of_line):
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
166 SET_PT (XINT (Fline_beginning_position (n)));
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
167 return Qnil;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
168 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
169
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
170 DEFUN ("end-of-line", Fend_of_line, Send_of_line,
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
171 0, 1, "p",
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
172 "Move point to end of current line.\n\
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
173 With argument N not nil or 1, move forward N - 1 lines first.\n\
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
174 If scan reaches end of buffer, stop there without error.")
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
175 (n)
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
176 Lisp_Object n;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
177 {
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
178 register int pos;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
179 register int stop;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
180
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 239
diff changeset
181 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
182 XSETFASTINT (n, 1);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
183 else
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
184 CHECK_NUMBER (n, 0);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
185
16657
f31cab608aa9 (Fend_of_line, Fbeginning_of_line):
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
186 SET_PT (XINT (Fline_end_position (n)));
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
187
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
188 return Qnil;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
189 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
190
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
191 DEFUN ("delete-char", Fdelete_char, Sdelete_char, 1, 2, "p\nP",
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
192 "Delete the following N characters (previous if N is negative).\n\
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
193 Optional second arg KILLFLAG non-nil means kill instead (save in kill ring).\n\
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
194 Interactively, N is the prefix arg, and KILLFLAG is set if\n\
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
195 N was explicitly specified.")
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
196 (n, killflag)
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
197 Lisp_Object n, killflag;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
198 {
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
199 int pos;
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
200
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
201 CHECK_NUMBER (n, 0);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
202
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
203 pos = PT + XINT (n);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 239
diff changeset
204 if (NILP (killflag))
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
205 {
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
206 if (XINT (n) < 0)
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
207 {
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
208 if (pos < BEGV)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
209 Fsignal (Qbeginning_of_buffer, Qnil);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
210 else
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
211 del_range (pos, PT);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
212 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
213 else
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
214 {
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
215 if (pos > ZV)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
216 Fsignal (Qend_of_buffer, Qnil);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
217 else
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
218 del_range (PT, pos);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
219 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
220 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
221 else
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
222 {
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
223 call1 (Qkill_forward_chars, n);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
224 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
225 return Qnil;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
226 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
227
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
228 DEFUN ("delete-backward-char", Fdelete_backward_char, Sdelete_backward_char,
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
229 1, 2, "p\nP",
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
230 "Delete the previous N characters (following if N is negative).\n\
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
231 Optional second arg KILLFLAG non-nil means kill instead (save in kill ring).\n\
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
232 Interactively, N is the prefix arg, and KILLFLAG is set if\n\
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
233 N was explicitly specified.")
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
234 (n, killflag)
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
235 Lisp_Object n, killflag;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
236 {
14436
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
237 Lisp_Object value;
15875
5ffb83189a1b (Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents: 15262
diff changeset
238 int deleted_special = 0;
20958
806727604be8 (Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents: 20708
diff changeset
239 int pos, pos_byte, i;
14436
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
240
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
241 CHECK_NUMBER (n, 0);
14436
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
242
15875
5ffb83189a1b (Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents: 15262
diff changeset
243 /* 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
244 pos = PT;
806727604be8 (Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents: 20708
diff changeset
245 pos_byte = PT_BYTE;
806727604be8 (Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents: 20708
diff changeset
246 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
247 {
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
248 int c;
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
249
20958
806727604be8 (Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents: 20708
diff changeset
250 DEC_BOTH (pos, pos_byte);
806727604be8 (Fdelete_backward_char): Count both bytes and chars.
Karl Heuer <kwzh@gnu.org>
parents: 20708
diff changeset
251 c = FETCH_BYTE (pos_byte);
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
252 if (c == '\t' || c == '\n')
14436
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
253 {
15875
5ffb83189a1b (Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents: 15262
diff changeset
254 deleted_special = 1;
14436
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
255 break;
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
256 }
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
257 }
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
258
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
259 /* 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
260 unless at end of line. */
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
261 if (XINT (n) > 0
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
262 && ! NILP (current_buffer->overwrite_mode)
15875
5ffb83189a1b (Fdelete_backward_char): Fix off-by-one error.
Karl Heuer <kwzh@gnu.org>
parents: 15262
diff changeset
263 && ! deleted_special
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
264 && ! (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
265 {
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
266 int column = current_column ();
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
267
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
268 value = Fdelete_char (make_number (-XINT (n)), killflag);
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
269 i = column - current_column ();
18748
6897bd6a1c8d (Fdelete_backward_char): Convert Finsert_char argument to
Richard M. Stallman <rms@gnu.org>
parents: 18239
diff changeset
270 Finsert_char (make_number (' '), make_number (i), Qnil);
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
271 /* 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
272 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
273 }
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
274 else
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
275 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
276
b56083146a42 (Fdelete_backward_char): In overwrite mode,
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
277 return value;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
278 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
279
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
280 DEFUN ("self-insert-command", Fself_insert_command, Sself_insert_command, 1, 1, "p",
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
281 "Insert the character you type.\n\
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
282 Whichever character you type to run this command is inserted.")
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
283 (n)
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
284 Lisp_Object n;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
285 {
17849
a6442e20f768 (nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17376
diff changeset
286 int character = XINT (last_command_char);
a6442e20f768 (nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17376
diff changeset
287
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
288 CHECK_NUMBER (n, 0);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
289
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
290 /* 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
291 if (!INTEGERP (last_command_char))
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
292 bitch_at_user ();
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
293 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
294 {
17849
a6442e20f768 (nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17376
diff changeset
295 int modified_char = character;
a6442e20f768 (nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17376
diff changeset
296 /* 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
297 We pass internal_self_insert the unmodified character
a6442e20f768 (nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17376
diff changeset
298 because it itself does this offsetting. */
20701
59ffd6ac16ec (internal_self_insert, Fself_insert_command):
Richard M. Stallman <rms@gnu.org>
parents: 20615
diff changeset
299 if (! NILP (current_buffer->enable_multibyte_characters))
59ffd6ac16ec (internal_self_insert, Fself_insert_command):
Richard M. Stallman <rms@gnu.org>
parents: 20615
diff changeset
300 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
301
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
302 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
303 /* 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
304 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
305 /* 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
306 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
307 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
308 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
309 /* 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
310 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
311 }
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
312 else
14065
60600bcfe5f1 (Fforward_line, Fbeginning_of_line, Fend_of_line, Fdelete_char,
Erik Naggum <erik@naggum.no>
parents: 13825
diff changeset
313 while (XINT (n) > 0)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
314 {
9332
1ff5359ac932 (Fself_insert_command, Fnewline): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9300
diff changeset
315 /* 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
316 XSETFASTINT (n, XFASTINT (n) - 1);
17849
a6442e20f768 (nonascii_insert_offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17376
diff changeset
317 internal_self_insert (character, XFASTINT (n) != 0);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
318 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
319
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
320 return Qnil;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
321 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
322
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
323 /* 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
324 even if it is enabled.
f7e3bac23a06 (internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents: 647
diff changeset
325
f7e3bac23a06 (internal_self_insert): Ignore value of Fexpand_abbrev;
Richard M. Stallman <rms@gnu.org>
parents: 647
diff changeset
326 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
327 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
328 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
329
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21254
diff changeset
330 int
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
331 internal_self_insert (c, noautofill)
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
332 int c;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
333 int noautofill;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
334 {
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
335 extern Lisp_Object Fexpand_abbrev ();
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
336 int hairy = 0;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
337 Lisp_Object tem;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
338 register enum syntaxcode synt;
18813
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
339 Lisp_Object overwrite, string;
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
340 /* Length of multi-byte form of C. */
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
341 int len;
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
342 /* Working buffer and pointer for multi-byte form of C. */
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
343 unsigned char workbuf[4], *str;
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
344 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
345 int spaces_to_insert = 0;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
346
6496
e1967b6d9a5c (internal_self_insert): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 5754
diff changeset
347 overwrite = current_buffer->overwrite_mode;
6788
4c912c5779f5 (internal_self_insert): Test Vafter_change_functions,
Richard M. Stallman <rms@gnu.org>
parents: 6496
diff changeset
348 if (!NILP (Vbefore_change_function) || !NILP (Vafter_change_function)
4c912c5779f5 (internal_self_insert): Test Vafter_change_functions,
Richard M. Stallman <rms@gnu.org>
parents: 6496
diff changeset
349 || !NILP (Vbefore_change_functions) || !NILP (Vafter_change_functions))
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
350 hairy = 1;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
351
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
352 /* At first, get multi-byte form of C in STR. */
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
353 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
354 {
3bf522f06501 (internal_self_insert): Avoid checking enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents: 20958
diff changeset
355 c = unibyte_char_to_multibyte (c);
3bf522f06501 (internal_self_insert): Avoid checking enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents: 20958
diff changeset
356 len = CHAR_STRING (c, workbuf, str);
3bf522f06501 (internal_self_insert): Avoid checking enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents: 20958
diff changeset
357 }
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
358 else
22926
436499b7a769 (internal_self_insert): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents: 21514
diff changeset
359 {
436499b7a769 (internal_self_insert): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents: 21514
diff changeset
360 workbuf[0] = (SINGLE_BYTE_CHAR_P (c)
436499b7a769 (internal_self_insert): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents: 21514
diff changeset
361 ? c
436499b7a769 (internal_self_insert): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents: 21514
diff changeset
362 : multibyte_char_to_unibyte (c, Qnil));
436499b7a769 (internal_self_insert): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents: 21514
diff changeset
363 str = workbuf;
436499b7a769 (internal_self_insert): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents: 21514
diff changeset
364 len = 1;
436499b7a769 (internal_self_insert): If enable-multibyte-characters is
Kenichi Handa <handa@m17n.org>
parents: 21514
diff changeset
365 }
2214
e5928bec8d5d * cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents: 2159
diff changeset
366 if (!NILP (overwrite)
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
367 && PT < ZV)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
368 {
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
369 /* In overwrite-mode, we substitute a character at point (C2,
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
370 hereafter) by C. For that, we delete C2 in advance. But,
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
371 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
372 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
373 So we insert more spaces or delete more characters in the
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
374 following cases: if C is narrower than C2, after deleting C2,
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
375 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
376 C2 and several characters following C2. */
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
377
20615
ddb1eec37783 (internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents: 20541
diff changeset
378 /* This is the character after point. */
ddb1eec37783 (internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents: 20541
diff changeset
379 int c2 = FETCH_CHAR (PT_BYTE);
ddb1eec37783 (internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents: 20541
diff changeset
380
ddb1eec37783 (internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents: 20541
diff changeset
381 /* Column the cursor should be placed at after this insertion.
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
382 The correct value should be calculated only when necessary. */
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
383 int target_clm = 0;
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
384
19658
063c22255157 (internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents: 18813
diff changeset
385 /* 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
386 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
387 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
388 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
389 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
390 if (EQ (overwrite, Qoverwrite_mode_binary)
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
391 || (c != '\n'
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
392 && 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
393 && ! (c2 == '\t'
063c22255157 (internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents: 18813
diff changeset
394 && 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
395 && XFASTINT (current_buffer->tab_width) < 20
20615
ddb1eec37783 (internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents: 20541
diff changeset
396 && (target_clm = (current_column ()
ddb1eec37783 (internal_self_insert): Simplify handling of c2;
Richard M. Stallman <rms@gnu.org>
parents: 20541
diff changeset
397 + XINT (Fchar_width (make_number (c2)))),
19658
063c22255157 (internal_self_insert): Only set TARGET_CLM when C2 is tab.
Richard M. Stallman <rms@gnu.org>
parents: 18813
diff changeset
398 target_clm % XFASTINT (current_buffer->tab_width)))))
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
399 {
18813
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
400 int pos = PT;
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
401 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
402
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
403 if (target_clm == 0)
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
404 chars_to_delete = 1;
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
405 else
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
406 {
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
407 /* The actual cursor position after the trial of moving
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
408 to column TARGET_CLM. It is greater than TARGET_CLM
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
409 if the TARGET_CLM is middle of multi-column
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
410 character. In that case, the new point is set after
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
411 that character. */
18748
6897bd6a1c8d (Fdelete_backward_char): Convert Finsert_char argument to
Richard M. Stallman <rms@gnu.org>
parents: 18239
diff changeset
412 int actual_clm
6897bd6a1c8d (Fdelete_backward_char): Convert Finsert_char argument to
Richard M. Stallman <rms@gnu.org>
parents: 18239
diff changeset
413 = XFASTINT (Fmove_to_column (make_number (target_clm), Qnil));
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
414
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
415 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
416
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
417 if (actual_clm > target_clm)
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
418 {
18813
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
419 /* We will delete too many columns. Let's fill columns
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
420 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
421 spaces_to_insert = actual_clm - target_clm;
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
422 }
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
423 }
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
424 SET_PT_BOTH (pos, pos_byte);
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
425 hairy = 2;
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
426 }
8088
a831980bb12e (internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents: 7307
diff changeset
427 hairy = 2;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
428 }
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 239
diff changeset
429 if (!NILP (current_buffer->abbrev_mode)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
430 && SYNTAX (c) != Sword
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 239
diff changeset
431 && NILP (current_buffer->read_only)
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
432 && PT > BEGV && SYNTAX (XFASTINT (Fprevious_char ())) == Sword)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
433 {
1098
79f020f34683 (internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents: 1022
diff changeset
434 int modiff = MODIFF;
16748
64f315c0e3f4 (internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents: 16657
diff changeset
435 Lisp_Object sym;
64f315c0e3f4 (internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents: 16657
diff changeset
436
64f315c0e3f4 (internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents: 16657
diff changeset
437 sym = Fexpand_abbrev ();
64f315c0e3f4 (internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents: 16657
diff changeset
438
64f315c0e3f4 (internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents: 16657
diff changeset
439 /* If we expanded an abbrev which has only a hook,
16809
c378600f005d (internal_self_insert): Check the property
Richard M. Stallman <rms@gnu.org>
parents: 16748
diff changeset
440 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
441 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
442 if (! NILP (sym) && ! NILP (XSYMBOL (sym)->function)
c378600f005d (internal_self_insert): Check the property
Richard M. Stallman <rms@gnu.org>
parents: 16748
diff changeset
443 && 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
444 {
64f315c0e3f4 (internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents: 16657
diff changeset
445 Lisp_Object prop;
16809
c378600f005d (internal_self_insert): Check the property
Richard M. Stallman <rms@gnu.org>
parents: 16748
diff changeset
446 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
447 if (! NILP (prop))
17376
aef6095be65c (internal_self_insert): Fix return value.
Karl Heuer <kwzh@gnu.org>
parents: 17026
diff changeset
448 return 1;
16748
64f315c0e3f4 (internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents: 16657
diff changeset
449 }
64f315c0e3f4 (internal_self_insert): If the abbrev has no expansion,
Richard M. Stallman <rms@gnu.org>
parents: 16657
diff changeset
450
1098
79f020f34683 (internal_self_insert): Assume Fexpand_abbrev expanded
Richard M. Stallman <rms@gnu.org>
parents: 1022
diff changeset
451 if (MODIFF != modiff)
8088
a831980bb12e (internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents: 7307
diff changeset
452 hairy = 2;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
453 }
18813
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
454
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
455 if (chars_to_delete)
18813
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
456 {
21254
d25a091700e5 (internal_self_insert): Use make_string_from_bytes.
Richard M. Stallman <rms@gnu.org>
parents: 21238
diff changeset
457 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
458 if (spaces_to_insert)
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
459 {
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
460 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
461 make_number (' '));
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
462 string = concat2 (tem, string);
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
463 }
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
464
23062
fec0e9653480 (internal_self_insert): Pass 1 as NOMARKERS to replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 22926
diff changeset
465 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
466 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
467 }
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
468 else
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
469 insert_and_inherit (str, len);
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
470
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
471 if ((c == ' ' || c == '\n')
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
472 && !noautofill
10474
caf4440e63e8 (internal_self_insert): Don't test current_column
Richard M. Stallman <rms@gnu.org>
parents: 10425
diff changeset
473 && !NILP (current_buffer->auto_fill_function))
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
474 {
15262
b455f3f77823 (internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents: 14436
diff changeset
475 Lisp_Object tem;
b455f3f77823 (internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents: 14436
diff changeset
476
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
477 if (c == '\n')
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
478 /* 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
479 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
480 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
481 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
482 tem = call0 (current_buffer->auto_fill_function);
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
483 if (c == '\n')
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
484 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
485 if (!NILP (tem))
b455f3f77823 (internal_self_insert): Don't return 2 for auto-fill
Karl Heuer <kwzh@gnu.org>
parents: 14436
diff changeset
486 hairy = 2;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
487 }
10729
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
488
11024
636d0fa5a920 (internal_self_insert): Do face code only if HAVE_FACES.
Karl Heuer <kwzh@gnu.org>
parents: 10865
diff changeset
489 #ifdef HAVE_FACES
10729
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
490 /* 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
491 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
492 && 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
493 {
20541
0cd7f6f42138 (forward_point): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 19658
diff changeset
494 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
495 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
496 Vself_insert_face = Qnil;
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
497 }
11024
636d0fa5a920 (internal_self_insert): Do face code only if HAVE_FACES.
Karl Heuer <kwzh@gnu.org>
parents: 10865
diff changeset
498 #endif
18813
498c1590b4a8 (internal_self_insert): When overwriting, use replace_range.
Richard M. Stallman <rms@gnu.org>
parents: 18748
diff changeset
499
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
500 synt = SYNTAX (c);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
501 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
502 && !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
503 && !noautofill)
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
504 {
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
505 call0 (Vblink_paren_function);
8088
a831980bb12e (internal_self_insert): Now can return 2.
Richard M. Stallman <rms@gnu.org>
parents: 7307
diff changeset
506 hairy = 2;
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
507 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
508 return hairy;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
509 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
510
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
511 /* module initialization */
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
512
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21254
diff changeset
513 void
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
514 syms_of_cmds ()
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
515 {
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
516 Qkill_backward_chars = intern ("kill-backward-chars");
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
517 staticpro (&Qkill_backward_chars);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
518
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
519 Qkill_forward_chars = intern ("kill-forward-chars");
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
520 staticpro (&Qkill_forward_chars);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
521
2214
e5928bec8d5d * cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents: 2159
diff changeset
522 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
523 staticpro (&Qoverwrite_mode_binary);
1948
e7b8107294b7 (syms_of_cmds): New var `overwrite-binary-mode'.
Richard M. Stallman <rms@gnu.org>
parents: 1098
diff changeset
524
10729
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
525 DEFVAR_LISP ("self-insert-face", &Vself_insert_face,
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
526 "If non-nil, set the face of the next self-inserting character to this.\n\
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
527 See also `self-insert-face-command'.");
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
528 Vself_insert_face = Qnil;
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
529
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
530 DEFVAR_LISP ("self-insert-face-command", &Vself_insert_face_command,
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
531 "This is the command that set up `self-insert-face'.\n\
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
532 If `last-command' does not equal this value, we ignore `self-insert-face'.");
fb4f688fc2cf (Vself_insert_face, Vself_insert_face_command): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10474
diff changeset
533 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
534
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
535 DEFVAR_LISP ("blink-paren-function", &Vblink_paren_function,
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
536 "Function called, if non-nil, whenever a close parenthesis is inserted.\n\
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
537 More precisely, a char with closeparen syntax is self-inserted.");
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
538 Vblink_paren_function = Qnil;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
539
17026
4557b42ba1dc Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16809
diff changeset
540 defsubr (&Sforward_point);
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
541 defsubr (&Sforward_char);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
542 defsubr (&Sbackward_char);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
543 defsubr (&Sforward_line);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
544 defsubr (&Sbeginning_of_line);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
545 defsubr (&Send_of_line);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
546
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
547 defsubr (&Sdelete_char);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
548 defsubr (&Sdelete_backward_char);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
549
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
550 defsubr (&Sself_insert_command);
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
551 }
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
552
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21254
diff changeset
553 void
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
554 keys_of_cmds ()
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
555 {
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
556 int n;
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
557
10425
f44f048966e8 (Vuse_hard_newlines): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9884
diff changeset
558 initial_define_key (global_map, Ctl ('I'), "self-insert-command");
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
559 for (n = 040; n < 0177; n++)
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
560 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
561 #ifdef MSDOS
3965bf498738 (keys_of_cmds) [MSDOS]: Chars 0200 to 0237 self-insert.
Richard M. Stallman <rms@gnu.org>
parents: 5054
diff changeset
562 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
563 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
564 #endif
5054
34c280d4e1af (keys_of_cmds): Make 0377 self-inserting.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
565 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
566 initial_define_key (global_map, n, "self-insert-command");
239
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
567
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
568 initial_define_key (global_map, Ctl ('A'), "beginning-of-line");
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
569 initial_define_key (global_map, Ctl ('B'), "backward-char");
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
570 initial_define_key (global_map, Ctl ('D'), "delete-char");
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
571 initial_define_key (global_map, Ctl ('E'), "end-of-line");
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
572 initial_define_key (global_map, Ctl ('F'), "forward-char");
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
573 initial_define_key (global_map, 0177, "delete-backward-char");
ed9362406f5f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
574 }