annotate src/insdel.c @ 111204:a5bff5a31837

nnimap.el (nnimap-retrieve-group-data-early): Remove bad comment.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Wed, 27 Oct 2010 08:07:41 +0000
parents b5615f1dafcc
children 6c24c5598611
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1 /* Buffer insertion/deletion and gap motion for GNU Emacs.
64770
a0d1312ede66 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64616
diff changeset
2 Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 106222
diff changeset
3 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
79759
fc2bcd2a8aad Add 2008 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 78602
diff changeset
4 Free Software Foundation, Inc.
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6 This file is part of GNU Emacs.
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93610
diff changeset
8 GNU Emacs is free software: you can redistribute it and/or modify
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9 it under the terms of the GNU General Public License as published by
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93610
diff changeset
10 the Free Software Foundation, either version 3 of the License, or
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93610
diff changeset
11 (at your option) any later version.
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 GNU Emacs is distributed in the hope that it will be useful,
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16 GNU General Public License for more details.
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93610
diff changeset
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20
01ad7ec29c98 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: 4078
diff changeset
22 #include <config.h>
105669
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105661
diff changeset
23 #include <setjmp.h>
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
24 #include "lisp.h"
1289
74b26ab86df4 * insdel.c: #include "intervals.h"
Joseph Arceneaux <jla@gnu.org>
parents: 1247
diff changeset
25 #include "intervals.h"
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
26 #include "buffer.h"
88378
46d69e409b5b Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 43218
diff changeset
27 #include "character.h"
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
28 #include "window.h"
2480
6f4b9c548425 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
29 #include "blockinput.h"
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21323
diff changeset
30 #include "region-cache.h"
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
31
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
32 #ifndef NULL
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
33 #define NULL 0
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
34 #endif
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
35
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
36 static void insert_from_string_1 (Lisp_Object string,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
37 EMACS_INT pos, EMACS_INT pos_byte,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
38 EMACS_INT nchars, EMACS_INT nbytes,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
39 int inherit, int before_markers);
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
40 static void insert_from_buffer_1 (struct buffer *buf,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
41 EMACS_INT from, EMACS_INT nchars,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
42 int inherit);
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
43 static void gap_left (EMACS_INT charpos, EMACS_INT bytepos, int newgap);
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
44 static void gap_right (EMACS_INT charpos, EMACS_INT bytepos);
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
45 static void adjust_markers_gap_motion (EMACS_INT from, EMACS_INT to,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
46 EMACS_INT amount);
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
47 static void adjust_markers_for_insert (EMACS_INT from, EMACS_INT from_byte,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
48 EMACS_INT to, EMACS_INT to_byte,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
49 int before_markers);
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
50 static void adjust_markers_for_replace (EMACS_INT, EMACS_INT, EMACS_INT,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
51 EMACS_INT, EMACS_INT, EMACS_INT);
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
52 static void adjust_point (EMACS_INT nchars, EMACS_INT nbytes);
6739
6b0dd4aeca67 (insert_1): New function, extracted from insert.
Karl Heuer <kwzh@gnu.org>
parents: 6126
diff changeset
53
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108890
diff changeset
54 Lisp_Object Fcombine_after_change_execute (void);
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
55
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
56 /* Non-nil means don't call the after-change-functions right away,
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106815
diff changeset
57 just record an element in combine_after_change_list. */
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
58 Lisp_Object Vcombine_after_change_calls;
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
59
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
60 /* List of elements of the form (BEG-UNCHANGED END-UNCHANGED CHANGE-AMOUNT)
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
61 describing changes which happened while combine_after_change_calls
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
62 was nonzero. We use this to decide how to call them
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
63 once the deferral ends.
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
64
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
65 In each element.
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
66 BEG-UNCHANGED is the number of chars before the changed range.
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
67 END-UNCHANGED is the number of chars after the changed range,
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
68 and CHANGE-AMOUNT is the number of characters inserted by the change
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
69 (negative for a deletion). */
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
70 Lisp_Object combine_after_change_list;
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
71
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
72 /* Buffer which combine_after_change_list is about. */
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
73 Lisp_Object combine_after_change_buffer;
39244
796039437953 (Qinhibit_modification_hooks): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37760
diff changeset
74
796039437953 (Qinhibit_modification_hooks): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37760
diff changeset
75 Lisp_Object Qinhibit_modification_hooks;
796039437953 (Qinhibit_modification_hooks): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37760
diff changeset
76
109802
acc05fd0631b Let all active regions set the primary selection.
Chong Yidong <cyd@stupidchicken.com>
parents: 109680
diff changeset
77 extern Lisp_Object Vselect_active_regions, Vsaved_region_selection, Qonly;
109678
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109313
diff changeset
78
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
79
21307
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
80 /* Check all markers in the current buffer, looking for something invalid. */
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
81
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
82 static int check_markers_debug_flag;
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
83
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
84 #define CHECK_MARKERS() \
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
85 if (check_markers_debug_flag) \
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
86 check_markers (); \
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
87 else
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
88
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
89 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108890
diff changeset
90 check_markers (void)
21307
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
91 {
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
92 register struct Lisp_Marker *tail;
23566
25baa4bda79d (check_markers): Check if markers are at character
Kenichi Handa <handa@m17n.org>
parents: 23555
diff changeset
93 int multibyte = ! NILP (current_buffer->enable_multibyte_characters);
21307
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
94
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
95 for (tail = BUF_MARKERS (current_buffer); tail; tail = tail->next)
21307
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
96 {
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
97 if (tail->buffer->text != current_buffer->text)
21307
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
98 abort ();
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
99 if (tail->charpos > Z)
21307
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
100 abort ();
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
101 if (tail->bytepos > Z_BYTE)
23566
25baa4bda79d (check_markers): Check if markers are at character
Kenichi Handa <handa@m17n.org>
parents: 23555
diff changeset
102 abort ();
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
103 if (multibyte && ! CHAR_HEAD_P (FETCH_BYTE (tail->bytepos)))
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
104 abort ();
21307
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
105 }
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
106 }
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
107
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
108 /* Move gap to position CHARPOS.
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
109 Note that this can quit! */
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
110
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
111 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
112 move_gap (EMACS_INT charpos)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
113 {
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
114 move_gap_both (charpos, charpos_to_bytepos (charpos));
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
115 }
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
116
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
117 /* Move gap to byte position BYTEPOS, which is also char position CHARPOS.
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
118 Note that this can quit! */
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
119
10391
55428c377c84 Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents: 10311
diff changeset
120 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
121 move_gap_both (EMACS_INT charpos, EMACS_INT bytepos)
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
122 {
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
123 if (bytepos < GPT_BYTE)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
124 gap_left (charpos, bytepos, 0);
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
125 else if (bytepos > GPT_BYTE)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
126 gap_right (charpos, bytepos);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
127 }
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
128
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
129 /* Move the gap to a position less than the current GPT.
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
130 BYTEPOS describes the new position as a byte position,
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
131 and CHARPOS is the corresponding char position.
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
132 If NEWGAP is nonzero, then don't update beg_unchanged and end_unchanged. */
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
133
7108
6e6410985d76 Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6787
diff changeset
134 static void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
135 gap_left (EMACS_INT charpos, EMACS_INT bytepos, int newgap)
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
136 {
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
137 register unsigned char *to, *from;
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
138 register EMACS_INT i;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
139 EMACS_INT new_s1;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
140
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
141 if (!newgap)
25373
6e6b29a72e2c (gap_left): Use BUF_COMPUTE_UNCHANGED.
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
142 BUF_COMPUTE_UNCHANGED (current_buffer, charpos, GPT);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
143
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
144 i = GPT_BYTE;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
145 to = GAP_END_ADDR;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
146 from = GPT_ADDR;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
147 new_s1 = GPT_BYTE;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
148
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
149 /* Now copy the characters. To move the gap down,
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
150 copy characters up. */
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
151
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
152 while (1)
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
153 {
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
154 /* I gets number of characters left to copy. */
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
155 i = new_s1 - bytepos;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
156 if (i == 0)
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
157 break;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
158 /* If a quit is requested, stop copying now.
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
159 Change BYTEPOS to be where we have actually moved the gap to. */
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
160 if (QUITP)
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
161 {
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
162 bytepos = new_s1;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
163 charpos = BYTE_TO_CHAR (bytepos);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
164 break;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
165 }
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
166 /* Move at most 32000 chars before checking again for a quit. */
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
167 if (i > 32000)
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
168 i = 32000;
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109126
diff changeset
169 new_s1 -= i;
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109126
diff changeset
170 from -= i, to -= i;
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109126
diff changeset
171 memmove (to, from, i);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
172 }
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
173
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
174 /* Adjust markers, and buffer data structure, to put the gap at BYTEPOS.
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
175 BYTEPOS is where the loop above stopped, which may be what was specified
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
176 or may be where a quit was detected. */
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
177 adjust_markers_gap_motion (bytepos, GPT_BYTE, GAP_SIZE);
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
178 GPT_BYTE = bytepos;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
179 GPT = charpos;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
180 if (bytepos < charpos)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
181 abort ();
17034
02f6d66c3a4b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16547
diff changeset
182 if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
183 QUIT;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
184 }
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
185
105426
d0a6d64c3cfc Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents: 102759
diff changeset
186 /* Move the gap to a position greater than the current GPT.
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
187 BYTEPOS describes the new position as a byte position,
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
188 and CHARPOS is the corresponding char position. */
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
189
7108
6e6410985d76 Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6787
diff changeset
190 static void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
191 gap_right (EMACS_INT charpos, EMACS_INT bytepos)
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
192 {
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
193 register unsigned char *to, *from;
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
194 register EMACS_INT i;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
195 EMACS_INT new_s1;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
196
25373
6e6b29a72e2c (gap_left): Use BUF_COMPUTE_UNCHANGED.
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
197 BUF_COMPUTE_UNCHANGED (current_buffer, charpos, GPT);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
198
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
199 i = GPT_BYTE;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
200 from = GAP_END_ADDR;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
201 to = GPT_ADDR;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
202 new_s1 = GPT_BYTE;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
203
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
204 /* Now copy the characters. To move the gap up,
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
205 copy characters down. */
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
206
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
207 while (1)
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
208 {
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
209 /* I gets number of characters left to copy. */
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
210 i = bytepos - new_s1;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
211 if (i == 0)
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
212 break;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
213 /* If a quit is requested, stop copying now.
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
214 Change BYTEPOS to be where we have actually moved the gap to. */
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
215 if (QUITP)
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
216 {
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
217 bytepos = new_s1;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
218 charpos = BYTE_TO_CHAR (bytepos);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
219 break;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
220 }
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
221 /* Move at most 32000 chars before checking again for a quit. */
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
222 if (i > 32000)
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
223 i = 32000;
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109126
diff changeset
224 new_s1 += i;
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109126
diff changeset
225 memmove (to, from, i);
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109126
diff changeset
226 from += i, to += i;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
227 }
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
228
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
229 adjust_markers_gap_motion (GPT_BYTE + GAP_SIZE, bytepos + GAP_SIZE,
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
230 - GAP_SIZE);
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
231 GPT = charpos;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
232 GPT_BYTE = bytepos;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
233 if (bytepos < charpos)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
234 abort ();
17034
02f6d66c3a4b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16547
diff changeset
235 if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
236 QUIT;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
237 }
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
238
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
239 /* Add AMOUNT to the byte position of every marker in the current buffer
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
240 whose current byte position is between FROM (exclusive) and TO (inclusive).
14479
69fa625812a4 (adjust_markers): When a marker is inside text
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
241
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
242 Also, any markers past the outside of that interval, in the direction
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
243 of adjustment, are first moved back to the near end of the interval
14479
69fa625812a4 (adjust_markers): When a marker is inside text
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
244 and then adjusted by AMOUNT.
69fa625812a4 (adjust_markers): When a marker is inside text
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
245
69fa625812a4 (adjust_markers): When a marker is inside text
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
246 When the latter adjustment is done, if AMOUNT is negative,
69fa625812a4 (adjust_markers): When a marker is inside text
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
247 we record the adjustment for undo. (This case happens only for
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
248 deletion.)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
249
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
250 The markers' character positions are not altered,
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
251 because gap motion does not affect character positions. */
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
252
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
253 int adjust_markers_test;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
254
7108
6e6410985d76 Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6787
diff changeset
255 static void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
256 adjust_markers_gap_motion (EMACS_INT from, EMACS_INT to, EMACS_INT amount)
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
257 {
20568
f0bacfbd9d47 (adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 20555
diff changeset
258 /* Now that a marker has a bytepos, not counting the gap,
f0bacfbd9d47 (adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 20555
diff changeset
259 nothing needs to be done here. */
f0bacfbd9d47 (adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 20555
diff changeset
260 #if 0
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
261 Lisp_Object marker;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
262 register struct Lisp_Marker *m;
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
263 register EMACS_INT mpos;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
264
10311
0de21e27722f Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 10145
diff changeset
265 marker = BUF_MARKERS (current_buffer);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
266
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 251
diff changeset
267 while (!NILP (marker))
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
268 {
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
269 m = XMARKER (marker);
20568
f0bacfbd9d47 (adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 20555
diff changeset
270 mpos = m->bytepos;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
271 if (amount > 0)
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
272 {
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
273 if (mpos > to && mpos < to + amount)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
274 {
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
275 if (adjust_markers_test)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
276 abort ();
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
277 mpos = to + amount;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
278 }
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
279 }
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
280 else
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
281 {
14479
69fa625812a4 (adjust_markers): When a marker is inside text
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
282 /* Here's the case where a marker is inside text being deleted.
69fa625812a4 (adjust_markers): When a marker is inside text
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
283 AMOUNT can be negative for gap motion, too,
69fa625812a4 (adjust_markers): When a marker is inside text
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
284 but then this range contains no markers. */
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
285 if (mpos > from + amount && mpos <= from)
14479
69fa625812a4 (adjust_markers): When a marker is inside text
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
286 {
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
287 if (adjust_markers_test)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
288 abort ();
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
289 mpos = from + amount;
14479
69fa625812a4 (adjust_markers): When a marker is inside text
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
290 }
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
291 }
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
292 if (mpos > from && mpos <= to)
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
293 mpos += amount;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
294 m->bufpos = mpos;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
295 marker = m->chain;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
296 }
20568
f0bacfbd9d47 (adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 20555
diff changeset
297 #endif
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
298 }
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
299
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
300 /* Adjust all markers for a deletion
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
301 whose range in bytes is FROM_BYTE to TO_BYTE.
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
302 The range in charpos is FROM to TO.
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
303
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
304 This function assumes that the gap is adjacent to
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
305 or inside of the range being deleted. */
12997
938dc2491820 (adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12798
diff changeset
306
26731
9b7d48762152 (adjust_markers_for_delete): Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents: 26715
diff changeset
307 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
308 adjust_markers_for_delete (EMACS_INT from, EMACS_INT from_byte,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
309 EMACS_INT to, EMACS_INT to_byte)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
310 {
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
311 Lisp_Object marker;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
312 register struct Lisp_Marker *m;
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
313 register EMACS_INT charpos;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
314
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
315 for (m = BUF_MARKERS (current_buffer); m; m = m->next)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
316 {
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
317 charpos = m->charpos;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
318
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
319 if (charpos > Z)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
320 abort ();
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
321
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
322 /* If the marker is after the deletion,
20568
f0bacfbd9d47 (adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 20555
diff changeset
323 relocate by number of chars / bytes deleted. */
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
324 if (charpos > to)
20568
f0bacfbd9d47 (adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 20555
diff changeset
325 {
f0bacfbd9d47 (adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 20555
diff changeset
326 m->charpos -= to - from;
f0bacfbd9d47 (adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 20555
diff changeset
327 m->bytepos -= to_byte - from_byte;
f0bacfbd9d47 (adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 20555
diff changeset
328 }
f0bacfbd9d47 (adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 20555
diff changeset
329 /* Here's the case where a marker is inside text being deleted. */
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
330 else if (charpos > from)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
331 {
32601
f9b498650e20 (adjust_markers_for_delete): Handle before-insertion markers correctly.
Miles Bader <miles@gnu.org>
parents: 31829
diff changeset
332 if (! m->insertion_type)
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
333 { /* Normal markers will end up at the beginning of the
32601
f9b498650e20 (adjust_markers_for_delete): Handle before-insertion markers correctly.
Miles Bader <miles@gnu.org>
parents: 31829
diff changeset
334 re-inserted text after undoing a deletion, and must be
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48090
diff changeset
335 adjusted to move them to the correct place. */
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
336 XSETMISC (marker, m);
106222
35b575add861 (adjust_markers_for_delete): Move it in the right direction! (bug#4803)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
337 record_marker_adjustment (marker, from - charpos);
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
338 }
32601
f9b498650e20 (adjust_markers_for_delete): Handle before-insertion markers correctly.
Miles Bader <miles@gnu.org>
parents: 31829
diff changeset
339 else if (charpos < to)
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
340 { /* Before-insertion markers will automatically move forward
32601
f9b498650e20 (adjust_markers_for_delete): Handle before-insertion markers correctly.
Miles Bader <miles@gnu.org>
parents: 31829
diff changeset
341 upon re-inserting the deleted text, so we have to arrange
f9b498650e20 (adjust_markers_for_delete): Handle before-insertion markers correctly.
Miles Bader <miles@gnu.org>
parents: 31829
diff changeset
342 for them to move backward to the correct position. */
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
343 XSETMISC (marker, m);
106222
35b575add861 (adjust_markers_for_delete): Move it in the right direction! (bug#4803)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
344 record_marker_adjustment (marker, to - charpos);
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
345 }
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
346 m->charpos = from;
20568
f0bacfbd9d47 (adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 20555
diff changeset
347 m->bytepos = from_byte;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
348 }
32601
f9b498650e20 (adjust_markers_for_delete): Handle before-insertion markers correctly.
Miles Bader <miles@gnu.org>
parents: 31829
diff changeset
349 /* Here's the case where a before-insertion marker is immediately
f9b498650e20 (adjust_markers_for_delete): Handle before-insertion markers correctly.
Miles Bader <miles@gnu.org>
parents: 31829
diff changeset
350 before the deleted region. */
f9b498650e20 (adjust_markers_for_delete): Handle before-insertion markers correctly.
Miles Bader <miles@gnu.org>
parents: 31829
diff changeset
351 else if (charpos == from && m->insertion_type)
f9b498650e20 (adjust_markers_for_delete): Handle before-insertion markers correctly.
Miles Bader <miles@gnu.org>
parents: 31829
diff changeset
352 {
f9b498650e20 (adjust_markers_for_delete): Handle before-insertion markers correctly.
Miles Bader <miles@gnu.org>
parents: 31829
diff changeset
353 /* Undoing the change uses normal insertion, which will
f9b498650e20 (adjust_markers_for_delete): Handle before-insertion markers correctly.
Miles Bader <miles@gnu.org>
parents: 31829
diff changeset
354 incorrectly make MARKER move forward, so we arrange for it
f9b498650e20 (adjust_markers_for_delete): Handle before-insertion markers correctly.
Miles Bader <miles@gnu.org>
parents: 31829
diff changeset
355 to then move backward to the correct place at the beginning
f9b498650e20 (adjust_markers_for_delete): Handle before-insertion markers correctly.
Miles Bader <miles@gnu.org>
parents: 31829
diff changeset
356 of the deleted region. */
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
357 XSETMISC (marker, m);
32601
f9b498650e20 (adjust_markers_for_delete): Handle before-insertion markers correctly.
Miles Bader <miles@gnu.org>
parents: 31829
diff changeset
358 record_marker_adjustment (marker, to - from);
f9b498650e20 (adjust_markers_for_delete): Handle before-insertion markers correctly.
Miles Bader <miles@gnu.org>
parents: 31829
diff changeset
359 }
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
360 }
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
361 }
23259
a3f818e927ba (adjust_markers_for_replace): Don't adjust a byte
Kenichi Handa <handa@m17n.org>
parents: 23212
diff changeset
362
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
363
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
364 /* Adjust markers for an insertion that stretches from FROM / FROM_BYTE
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
365 to TO / TO_BYTE. We have to relocate the charpos of every marker
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
366 that points after the insertion (but not their bytepos).
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
367
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
368 When a marker points at the insertion point,
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
369 we advance it if either its insertion-type is t
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
370 or BEFORE_MARKERS is true. */
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
371
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
372 static void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
373 adjust_markers_for_insert (EMACS_INT from, EMACS_INT from_byte,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
374 EMACS_INT to, EMACS_INT to_byte, int before_markers)
12997
938dc2491820 (adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12798
diff changeset
375 {
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
376 struct Lisp_Marker *m;
17034
02f6d66c3a4b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16547
diff changeset
377 int adjusted = 0;
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
378 EMACS_INT nchars = to - from;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
379 EMACS_INT nbytes = to_byte - from_byte;
12997
938dc2491820 (adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12798
diff changeset
380
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
381 for (m = BUF_MARKERS (current_buffer); m; m = m->next)
12997
938dc2491820 (adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12798
diff changeset
382 {
85016
c7d378d22b24 (adjust_markers_for_insert): Generalize assertion checks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 82394
diff changeset
383 eassert (m->bytepos >= m->charpos
c7d378d22b24 (adjust_markers_for_insert): Generalize assertion checks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 82394
diff changeset
384 && m->bytepos - m->charpos <= Z_BYTE - Z);
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
385
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
386 if (m->bytepos == from_byte)
17034
02f6d66c3a4b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16547
diff changeset
387 {
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
388 if (m->insertion_type || before_markers)
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
389 {
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
390 m->bytepos = to_byte;
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
391 m->charpos = to;
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
392 if (m->insertion_type)
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
393 adjusted = 1;
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
394 }
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
395 }
20568
f0bacfbd9d47 (adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 20555
diff changeset
396 else if (m->bytepos > from_byte)
f0bacfbd9d47 (adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 20555
diff changeset
397 {
f0bacfbd9d47 (adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 20555
diff changeset
398 m->bytepos += nbytes;
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
399 m->charpos += nchars;
20568
f0bacfbd9d47 (adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents: 20555
diff changeset
400 }
12997
938dc2491820 (adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12798
diff changeset
401 }
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
402
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
403 /* Adjusting only markers whose insertion-type is t may result in
108890
d9257436d2b1 Remove obsolete macro BASE_LEADING_CODE_P.
Juanma Barranquero <lekktu@gmail.com>
parents: 107984
diff changeset
404 - disordered start and end in overlays, and
54555
b136a4512609 * insdel.c (adjust_markers_for_insert): Call fix_start_end_in_overlays.
Masatake YAMATO <jet@gyve.org>
parents: 52401
diff changeset
405 - disordered overlays in the slot `overlays_before' of current_buffer. */
17034
02f6d66c3a4b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16547
diff changeset
406 if (adjusted)
54555
b136a4512609 * insdel.c (adjust_markers_for_insert): Call fix_start_end_in_overlays.
Masatake YAMATO <jet@gyve.org>
parents: 52401
diff changeset
407 {
b136a4512609 * insdel.c (adjust_markers_for_insert): Call fix_start_end_in_overlays.
Masatake YAMATO <jet@gyve.org>
parents: 52401
diff changeset
408 fix_start_end_in_overlays(from, to);
b136a4512609 * insdel.c (adjust_markers_for_insert): Call fix_start_end_in_overlays.
Masatake YAMATO <jet@gyve.org>
parents: 52401
diff changeset
409 fix_overlays_before (current_buffer, from, to);
b136a4512609 * insdel.c (adjust_markers_for_insert): Call fix_start_end_in_overlays.
Masatake YAMATO <jet@gyve.org>
parents: 52401
diff changeset
410 }
12997
938dc2491820 (adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12798
diff changeset
411 }
938dc2491820 (adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12798
diff changeset
412
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
413 /* Adjust point for an insertion of NBYTES bytes, which are NCHARS characters.
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
414
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
415 This is used only when the value of point changes due to an insert
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
416 or delete; it does not represent a conceptual change in point as a
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
417 marker. In particular, point is not crossing any interval
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
418 boundaries, so there's no need to use the usual SET_PT macro. In
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
419 fact it would be incorrect to do so, because either the old or the
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
420 new value of point is out of sync with the current set of
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
421 intervals. */
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
422
7109
d4842450463c (adjust_point): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7108
diff changeset
423 static void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
424 adjust_point (EMACS_INT nchars, EMACS_INT nbytes)
7109
d4842450463c (adjust_point): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7108
diff changeset
425 {
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
426 BUF_PT (current_buffer) += nchars;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
427 BUF_PT_BYTE (current_buffer) += nbytes;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
428
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
429 /* In a single-byte buffer, the two positions must be equal. */
85016
c7d378d22b24 (adjust_markers_for_insert): Generalize assertion checks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 82394
diff changeset
430 eassert (PT_BYTE >= PT && PT_BYTE - PT <= ZV_BYTE - ZV);
7109
d4842450463c (adjust_point): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7108
diff changeset
431 }
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
432
21323
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
433 /* Adjust markers for a replacement of a text at FROM (FROM_BYTE) of
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
434 length OLD_CHARS (OLD_BYTES) to a new text of length NEW_CHARS
29065
e8d5eb064973 (adjust_markers_for_replace): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 29012
diff changeset
435 (NEW_BYTES). It is assumed that OLD_CHARS > 0, i.e., this is not
e8d5eb064973 (adjust_markers_for_replace): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 29012
diff changeset
436 an insertion. */
21323
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
437
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
438 static void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
439 adjust_markers_for_replace (EMACS_INT from, EMACS_INT from_byte,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
440 EMACS_INT old_chars, EMACS_INT old_bytes,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
441 EMACS_INT new_chars, EMACS_INT new_bytes)
21323
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
442 {
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
443 register struct Lisp_Marker *m;
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
444 EMACS_INT prev_to_byte = from_byte + old_bytes;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
445 EMACS_INT diff_chars = new_chars - old_chars;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
446 EMACS_INT diff_bytes = new_bytes - old_bytes;
21323
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
447
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
448 for (m = BUF_MARKERS (current_buffer); m; m = m->next)
21323
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
449 {
29065
e8d5eb064973 (adjust_markers_for_replace): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 29012
diff changeset
450 if (m->bytepos >= prev_to_byte)
21323
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
451 {
29065
e8d5eb064973 (adjust_markers_for_replace): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 29012
diff changeset
452 m->charpos += diff_chars;
e8d5eb064973 (adjust_markers_for_replace): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 29012
diff changeset
453 m->bytepos += diff_bytes;
21323
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
454 }
29065
e8d5eb064973 (adjust_markers_for_replace): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 29012
diff changeset
455 else if (m->bytepos > from_byte)
21323
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
456 {
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
457 m->charpos = from;
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
458 m->bytepos = from_byte;
21323
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
459 }
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
460 }
23455
84276318b663 (adjust_markers_for_combining): This function deleted.
Kenichi Handa <handa@m17n.org>
parents: 23400
diff changeset
461
84276318b663 (adjust_markers_for_combining): This function deleted.
Kenichi Handa <handa@m17n.org>
parents: 23400
diff changeset
462 CHECK_MARKERS ();
21323
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
463 }
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
464
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
465
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
466 /* Make the gap NBYTES_ADDED bytes longer. */
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
467
10391
55428c377c84 Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents: 10311
diff changeset
468 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
469 make_gap_larger (EMACS_INT nbytes_added)
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
470 {
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
471 Lisp_Object tem;
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
472 EMACS_INT real_gap_loc;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
473 EMACS_INT real_gap_loc_byte;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
474 EMACS_INT old_gap_size;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
475
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
476 /* If we have to get more space, get enough to last a while. */
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
477 nbytes_added += 2000;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
478
106108
48d6337584da (make_gap_larger): Don't make as many assumptions about the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105877
diff changeset
479 { EMACS_INT total_size = Z_BYTE - BEG_BYTE + GAP_SIZE + nbytes_added;
48d6337584da (make_gap_larger): Don't make as many assumptions about the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105877
diff changeset
480 if (total_size < 0
48d6337584da (make_gap_larger): Don't make as many assumptions about the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105877
diff changeset
481 /* Don't allow a buffer size that won't fit in a Lisp integer. */
48d6337584da (make_gap_larger): Don't make as many assumptions about the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105877
diff changeset
482 || total_size != XINT (make_number (total_size))
48d6337584da (make_gap_larger): Don't make as many assumptions about the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105877
diff changeset
483 /* Don't allow a buffer size that won't fit in an int
48d6337584da (make_gap_larger): Don't make as many assumptions about the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105877
diff changeset
484 even if it will fit in a Lisp integer.
48d6337584da (make_gap_larger): Don't make as many assumptions about the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105877
diff changeset
485 That won't work because so many places still use `int'. */
48d6337584da (make_gap_larger): Don't make as many assumptions about the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105877
diff changeset
486 || total_size != (EMACS_INT) (int) total_size)
48d6337584da (make_gap_larger): Don't make as many assumptions about the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105877
diff changeset
487 error ("Buffer exceeds maximum size");
48d6337584da (make_gap_larger): Don't make as many assumptions about the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105877
diff changeset
488 }
11691
ca7058c74ef3 (make_gap): Don't allow buffer size that won't fit in int.
Richard M. Stallman <rms@gnu.org>
parents: 11657
diff changeset
489
31603
04e50cacc23f (make_gap): Use enlarge_buffer_text.
Gerd Moellmann <gerd@gnu.org>
parents: 29379
diff changeset
490 enlarge_buffer_text (current_buffer, nbytes_added);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
491
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
492 /* Prevent quitting in move_gap. */
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
493 tem = Vinhibit_quit;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
494 Vinhibit_quit = Qt;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
495
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
496 real_gap_loc = GPT;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
497 real_gap_loc_byte = GPT_BYTE;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
498 old_gap_size = GAP_SIZE;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
499
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
500 /* Call the newly allocated space a gap at the end of the whole space. */
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
501 GPT = Z + GAP_SIZE;
20574
928b9aff1e64 (make_gap): Set GPT_BYTE along with GPT.
Richard M. Stallman <rms@gnu.org>
parents: 20568
diff changeset
502 GPT_BYTE = Z_BYTE + GAP_SIZE;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
503 GAP_SIZE = nbytes_added;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
504
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
505 /* Move the new gap down to be consecutive with the end of the old one.
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
506 This adjusts the markers properly too. */
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
507 gap_left (real_gap_loc + old_gap_size, real_gap_loc_byte + old_gap_size, 1);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
508
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
509 /* Now combine the two into one large gap. */
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
510 GAP_SIZE += old_gap_size;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
511 GPT = real_gap_loc;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
512 GPT_BYTE = real_gap_loc_byte;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
513
17034
02f6d66c3a4b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16547
diff changeset
514 /* Put an anchor. */
02f6d66c3a4b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16547
diff changeset
515 *(Z_ADDR) = 0;
02f6d66c3a4b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16547
diff changeset
516
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
517 Vinhibit_quit = tem;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
518 }
41830
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
519
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
520
48090
b7e13d33cf41 Comment.
Dave Love <fx@gnu.org>
parents: 46468
diff changeset
521 /* Make the gap NBYTES_REMOVED bytes shorter. */
41830
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
522
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
523 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
524 make_gap_smaller (EMACS_INT nbytes_removed)
41830
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
525 {
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
526 Lisp_Object tem;
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
527 EMACS_INT real_gap_loc;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
528 EMACS_INT real_gap_loc_byte;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
529 EMACS_INT real_Z;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
530 EMACS_INT real_Z_byte;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
531 EMACS_INT real_beg_unchanged;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
532 EMACS_INT new_gap_size;
41830
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
533
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
534 /* Make sure the gap is at least 20 bytes. */
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
535 if (GAP_SIZE - nbytes_removed < 20)
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
536 nbytes_removed = GAP_SIZE - 20;
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
537
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
538 /* Prevent quitting in move_gap. */
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
539 tem = Vinhibit_quit;
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
540 Vinhibit_quit = Qt;
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
541
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
542 real_gap_loc = GPT;
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
543 real_gap_loc_byte = GPT_BYTE;
43218
a4b638169822 (make_gap_smaller): Preserve BEG_UNCHANGED during gap
Kim F. Storm <storm@cua.dk>
parents: 42662
diff changeset
544 new_gap_size = GAP_SIZE - nbytes_removed;
41830
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
545 real_Z = Z;
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
546 real_Z_byte = Z_BYTE;
43218
a4b638169822 (make_gap_smaller): Preserve BEG_UNCHANGED during gap
Kim F. Storm <storm@cua.dk>
parents: 42662
diff changeset
547 real_beg_unchanged = BEG_UNCHANGED;
41830
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
548
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
549 /* Pretend that the last unwanted part of the gap is the entire gap,
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
550 and that the first desired part of the gap is part of the buffer
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
551 text. */
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109126
diff changeset
552 memset (GPT_ADDR, 0, new_gap_size);
43218
a4b638169822 (make_gap_smaller): Preserve BEG_UNCHANGED during gap
Kim F. Storm <storm@cua.dk>
parents: 42662
diff changeset
553 GPT += new_gap_size;
a4b638169822 (make_gap_smaller): Preserve BEG_UNCHANGED during gap
Kim F. Storm <storm@cua.dk>
parents: 42662
diff changeset
554 GPT_BYTE += new_gap_size;
a4b638169822 (make_gap_smaller): Preserve BEG_UNCHANGED during gap
Kim F. Storm <storm@cua.dk>
parents: 42662
diff changeset
555 Z += new_gap_size;
a4b638169822 (make_gap_smaller): Preserve BEG_UNCHANGED during gap
Kim F. Storm <storm@cua.dk>
parents: 42662
diff changeset
556 Z_BYTE += new_gap_size;
41830
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
557 GAP_SIZE = nbytes_removed;
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
558
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
559 /* Move the unwanted pretend gap to the end of the buffer. This
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
560 adjusts the markers properly too. */
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
561 gap_right (Z, Z_BYTE);
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
562
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
563 enlarge_buffer_text (current_buffer, -nbytes_removed);
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
564
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
565 /* Now restore the desired gap. */
43218
a4b638169822 (make_gap_smaller): Preserve BEG_UNCHANGED during gap
Kim F. Storm <storm@cua.dk>
parents: 42662
diff changeset
566 GAP_SIZE = new_gap_size;
41830
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
567 GPT = real_gap_loc;
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
568 GPT_BYTE = real_gap_loc_byte;
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
569 Z = real_Z;
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
570 Z_BYTE = real_Z_byte;
43218
a4b638169822 (make_gap_smaller): Preserve BEG_UNCHANGED during gap
Kim F. Storm <storm@cua.dk>
parents: 42662
diff changeset
571 BEG_UNCHANGED = real_beg_unchanged;
41830
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
572
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
573 /* Put an anchor. */
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
574 *(Z_ADDR) = 0;
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
575
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
576 Vinhibit_quit = tem;
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
577 }
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
578
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
579 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
580 make_gap (EMACS_INT nbytes_added)
41830
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
581 {
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
582 if (nbytes_added >= 0)
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
583 make_gap_larger (nbytes_added);
41964
79c7c91bc460 (make_gap) [DOUG_LEA_MALLOC]: Call make_gap_smaller if
Andrew Innes <andrewi@gnu.org>
parents: 41830
diff changeset
584 #if defined USE_MMAP_FOR_BUFFERS || defined REL_ALLOC || defined DOUG_LEA_MALLOC
41830
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
585 else
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
586 make_gap_smaller (-nbytes_added);
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
587 #endif
71cbc17f7f8b (make_gap_larger): New function.
Andrew Innes <andrewi@gnu.org>
parents: 41001
diff changeset
588 }
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
589
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
590 /* Copy NBYTES bytes of text from FROM_ADDR to TO_ADDR.
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
591 FROM_MULTIBYTE says whether the incoming text is multibyte.
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
592 TO_MULTIBYTE says whether to store the text as multibyte.
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
593 If FROM_MULTIBYTE != TO_MULTIBYTE, we convert.
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
594
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
595 Return the number of bytes stored at TO_ADDR. */
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
596
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
597 EMACS_INT
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
598 copy_text (const unsigned char *from_addr, unsigned char *to_addr,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
599 EMACS_INT nbytes, int from_multibyte, int to_multibyte)
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
600 {
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
601 if (from_multibyte == to_multibyte)
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
602 {
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109126
diff changeset
603 memcpy (to_addr, from_addr, nbytes);
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
604 return nbytes;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
605 }
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
606 else if (from_multibyte)
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
607 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
608 EMACS_INT nchars = 0;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
609 EMACS_INT bytes_left = nbytes;
25764
72f00825a576 (copy_text): Removed unused variables.
Gerd Moellmann <gerd@gnu.org>
parents: 25662
diff changeset
610 Lisp_Object tbl = Qnil;
22876
8c063663a19d (copy_text): In multibyte to unibyte conversion, take
Kenichi Handa <handa@m17n.org>
parents: 22107
diff changeset
611
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
612 while (bytes_left > 0)
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
613 {
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
614 int thislen, c;
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 106108
diff changeset
615 c = STRING_CHAR_AND_LENGTH (from_addr, thislen);
100761
e55e55a286f4 (copy_text): To convert a non-ASCII char to unibyte,
Kenichi Handa <handa@m17n.org>
parents: 94963
diff changeset
616 if (! ASCII_CHAR_P (c))
e55e55a286f4 (copy_text): To convert a non-ASCII char to unibyte,
Kenichi Handa <handa@m17n.org>
parents: 94963
diff changeset
617 c &= 0xFF;
22876
8c063663a19d (copy_text): In multibyte to unibyte conversion, take
Kenichi Handa <handa@m17n.org>
parents: 22107
diff changeset
618 *to_addr++ = c;
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
619 from_addr += thislen;
21676
81bbd2c2724a (copy_text): Count down bytes_left properly
Richard M. Stallman <rms@gnu.org>
parents: 21526
diff changeset
620 bytes_left -= thislen;
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
621 nchars++;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
622 }
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
623 return nchars;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
624 }
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
625 else
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
626 {
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
627 unsigned char *initial_to_addr = to_addr;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
628
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
629 /* Convert single-byte to multibyte. */
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
630 while (nbytes > 0)
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
631 {
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
632 int c = *from_addr++;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
633
105661
bac26aa40069 Remove leftover table unibyte_to_multibyte_table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105426
diff changeset
634 if (!ASCII_CHAR_P (c))
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
635 {
105661
bac26aa40069 Remove leftover table unibyte_to_multibyte_table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105426
diff changeset
636 c = BYTE8_TO_CHAR (c);
26860
96ecaefd97a0 (copy_text): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
637 to_addr += CHAR_STRING (c, to_addr);
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
638 nbytes--;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
639 }
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
640 else
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
641 /* Special case for speed. */
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
642 *to_addr++ = c, nbytes--;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
643 }
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
644 return to_addr - initial_to_addr;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
645 }
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
646 }
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
647
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
648 /* Return the number of bytes it would take
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
649 to convert some single-byte text to multibyte.
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
650 The single-byte text consists of NBYTES bytes at PTR. */
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
651
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
652 EMACS_INT
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
653 count_size_as_multibyte (const unsigned char *ptr, EMACS_INT nbytes)
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
654 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
655 EMACS_INT i;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
656 EMACS_INT outgoing_nbytes = 0;
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
657
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
658 for (i = 0; i < nbytes; i++)
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
659 {
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
660 unsigned int c = *ptr++;
21037
1290ba9ccec8 (DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents: 20998
diff changeset
661
105661
bac26aa40069 Remove leftover table unibyte_to_multibyte_table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105426
diff changeset
662 if (ASCII_CHAR_P (c))
21037
1290ba9ccec8 (DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents: 20998
diff changeset
663 outgoing_nbytes++;
1290ba9ccec8 (DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents: 20998
diff changeset
664 else
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
665 {
105661
bac26aa40069 Remove leftover table unibyte_to_multibyte_table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105426
diff changeset
666 c = BYTE8_TO_CHAR (c);
23133
48fb93ba8b10 (count_size_as_multibyte): Use macro CHAR_BYTES instead of Fchar_bytes.
Kenichi Handa <handa@m17n.org>
parents: 23053
diff changeset
667 outgoing_nbytes += CHAR_BYTES (c);
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
668 }
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
669 }
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
670
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
671 return outgoing_nbytes;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
672 }
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
673
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
674 /* Insert a string of specified length before point.
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
675 This function judges multibyteness based on
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
676 enable_multibyte_characters in the current buffer;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
677 it never converts between single-byte and multibyte.
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
678
9656
e6cb99e4370c (insert_from_buffer, insert_from_buffer_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 9646
diff changeset
679 DO NOT use this for the contents of a Lisp string or a Lisp buffer!
e6cb99e4370c (insert_from_buffer, insert_from_buffer_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 9646
diff changeset
680 prepare_to_modify_buffer could relocate the text. */
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
681
10391
55428c377c84 Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents: 10311
diff changeset
682 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
683 insert (const unsigned char *string, EMACS_INT nbytes)
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
684 {
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
685 if (nbytes > 0)
6739
6b0dd4aeca67 (insert_1): New function, extracted from insert.
Karl Heuer <kwzh@gnu.org>
parents: 6126
diff changeset
686 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
687 EMACS_INT len = chars_in_text (string, nbytes), opoint;
67773
b0256e43a6b8 (insert, insert_and_inherit, insert_before_markers)
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
688 insert_1_both (string, len, nbytes, 0, 1, 0);
b0256e43a6b8 (insert, insert_and_inherit, insert_before_markers)
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
689 opoint = PT - len;
b0256e43a6b8 (insert, insert_and_inherit, insert_before_markers)
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
690 signal_after_change (opoint, 0, len);
26860
96ecaefd97a0 (copy_text): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
691 update_compositions (opoint, PT, CHECK_BORDER);
6739
6b0dd4aeca67 (insert_1): New function, extracted from insert.
Karl Heuer <kwzh@gnu.org>
parents: 6126
diff changeset
692 }
6b0dd4aeca67 (insert_1): New function, extracted from insert.
Karl Heuer <kwzh@gnu.org>
parents: 6126
diff changeset
693 }
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
694
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
695 /* Likewise, but inherit text properties from neighboring characters. */
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
696
10391
55428c377c84 Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents: 10311
diff changeset
697 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
698 insert_and_inherit (const unsigned char *string, EMACS_INT nbytes)
6739
6b0dd4aeca67 (insert_1): New function, extracted from insert.
Karl Heuer <kwzh@gnu.org>
parents: 6126
diff changeset
699 {
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
700 if (nbytes > 0)
9656
e6cb99e4370c (insert_from_buffer, insert_from_buffer_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 9646
diff changeset
701 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
702 EMACS_INT len = chars_in_text (string, nbytes), opoint;
67773
b0256e43a6b8 (insert, insert_and_inherit, insert_before_markers)
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
703 insert_1_both (string, len, nbytes, 1, 1, 0);
b0256e43a6b8 (insert, insert_and_inherit, insert_before_markers)
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
704 opoint = PT - len;
b0256e43a6b8 (insert, insert_and_inherit, insert_before_markers)
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
705 signal_after_change (opoint, 0, len);
26860
96ecaefd97a0 (copy_text): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
706 update_compositions (opoint, PT, CHECK_BORDER);
9656
e6cb99e4370c (insert_from_buffer, insert_from_buffer_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 9646
diff changeset
707 }
e6cb99e4370c (insert_from_buffer, insert_from_buffer_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 9646
diff changeset
708 }
e6cb99e4370c (insert_from_buffer, insert_from_buffer_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 9646
diff changeset
709
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
710 /* Insert the character C before point. Do not inherit text properties. */
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
711
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
712 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
713 insert_char (int c)
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
714 {
26860
96ecaefd97a0 (copy_text): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
715 unsigned char str[MAX_MULTIBYTE_LENGTH];
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
716 int len;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
717
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
718 if (! NILP (current_buffer->enable_multibyte_characters))
26860
96ecaefd97a0 (copy_text): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
719 len = CHAR_STRING (c, str);
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
720 else
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
721 {
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
722 len = 1;
26860
96ecaefd97a0 (copy_text): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
723 str[0] = c;
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
724 }
17034
02f6d66c3a4b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16547
diff changeset
725
02f6d66c3a4b Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16547
diff changeset
726 insert (str, len);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
727 }
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
728
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
729 /* Insert the null-terminated string S before point. */
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
730
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
731 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
732 insert_string (const char *s)
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
733 {
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
734 insert (s, strlen (s));
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
735 }
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
736
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
737 /* Like `insert' except that all markers pointing at the place where
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
738 the insertion happens are adjusted to point after it.
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
739 Don't use this function to insert part of a Lisp string,
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
740 since gc could happen and relocate it. */
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
741
10391
55428c377c84 Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents: 10311
diff changeset
742 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
743 insert_before_markers (const unsigned char *string, EMACS_INT nbytes)
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
744 {
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
745 if (nbytes > 0)
6739
6b0dd4aeca67 (insert_1): New function, extracted from insert.
Karl Heuer <kwzh@gnu.org>
parents: 6126
diff changeset
746 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
747 EMACS_INT len = chars_in_text (string, nbytes), opoint;
67773
b0256e43a6b8 (insert, insert_and_inherit, insert_before_markers)
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
748 insert_1_both (string, len, nbytes, 0, 1, 1);
b0256e43a6b8 (insert, insert_and_inherit, insert_before_markers)
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
749 opoint = PT - len;
b0256e43a6b8 (insert, insert_and_inherit, insert_before_markers)
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
750 signal_after_change (opoint, 0, len);
26860
96ecaefd97a0 (copy_text): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
751 update_compositions (opoint, PT, CHECK_BORDER);
6739
6b0dd4aeca67 (insert_1): New function, extracted from insert.
Karl Heuer <kwzh@gnu.org>
parents: 6126
diff changeset
752 }
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
753 }
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
754
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
755 /* Likewise, but inherit text properties from neighboring characters. */
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
756
10391
55428c377c84 Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents: 10311
diff changeset
757 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
758 insert_before_markers_and_inherit (const unsigned char *string,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
759 EMACS_INT nbytes)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
760 {
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
761 if (nbytes > 0)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
762 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
763 EMACS_INT len = chars_in_text (string, nbytes), opoint;
67773
b0256e43a6b8 (insert, insert_and_inherit, insert_before_markers)
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
764 insert_1_both (string, len, nbytes, 1, 1, 1);
b0256e43a6b8 (insert, insert_and_inherit, insert_before_markers)
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
765 opoint = PT - len;
b0256e43a6b8 (insert, insert_and_inherit, insert_before_markers)
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
766 signal_after_change (opoint, 0, len);
26860
96ecaefd97a0 (copy_text): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
767 update_compositions (opoint, PT, CHECK_BORDER);
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
768 }
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
769 }
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
770
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
771 /* Subroutine used by the insert functions above. */
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
772
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
773 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
774 insert_1 (const unsigned char *string, EMACS_INT nbytes,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
775 int inherit, int prepare, int before_markers)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
776 {
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
777 insert_1_both (string, chars_in_text (string, nbytes), nbytes,
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
778 inherit, prepare, before_markers);
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
779 }
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
780
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
781
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
782 #ifdef BYTE_COMBINING_DEBUG
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
783
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
784 /* See if the bytes before POS/POS_BYTE combine with bytes
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
785 at the start of STRING to form a single character.
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
786 If so, return the number of bytes at the start of STRING
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
787 which combine in this way. Otherwise, return 0. */
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
788
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
789 int
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
790 count_combining_before (const unsigned char *string, EMACS_INT length,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
791 EMACS_INT pos, EMACS_INT pos_byte)
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
792 {
25509
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
793 int len, combining_bytes;
46468
9648dbb4974e (copy_text, count_size_as_multibyte, insert_1):
Ken Raeburn <raeburn@raeburn.org>
parents: 46426
diff changeset
794 const unsigned char *p;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
795
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
796 if (NILP (current_buffer->enable_multibyte_characters))
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
797 return 0;
25509
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
798
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
799 /* At first, we can exclude the following cases:
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
800 (1) STRING[0] can't be a following byte of multibyte sequence.
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
801 (2) POS is the start of the current buffer.
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
802 (3) A character before POS is not a multibyte character. */
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
803 if (length == 0 || CHAR_HEAD_P (*string)) /* case (1) */
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
804 return 0;
25509
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
805 if (pos_byte == BEG_BYTE) /* case (2) */
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
806 return 0;
25509
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
807 len = 1;
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
808 p = BYTE_POS_ADDR (pos_byte - 1);
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
809 while (! CHAR_HEAD_P (*p)) p--, len++;
108890
d9257436d2b1 Remove obsolete macro BASE_LEADING_CODE_P.
Juanma Barranquero <lekktu@gmail.com>
parents: 107984
diff changeset
810 if (! LEADING_CODE_P (*p)) /* case (3) */
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
811 return 0;
25509
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
812
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
813 combining_bytes = BYTES_BY_CHAR_HEAD (*p) - len;
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
814 if (combining_bytes <= 0)
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
815 /* The character preceding POS is, complete and no room for
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
816 combining bytes (combining_bytes == 0), or an independent 8-bit
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
817 character (combining_bytes < 0). */
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
818 return 0;
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
819
25509
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
820 /* We have a combination situation. Count the bytes at STRING that
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
821 may combine. */
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
822 p = string + 1;
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
823 while (!CHAR_HEAD_P (*p) && p < string + length)
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
824 p++;
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
825
25509
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
826 return (combining_bytes < p - string ? combining_bytes : p - string);
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
827 }
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
828
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
829 /* See if the bytes after POS/POS_BYTE combine with bytes
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
830 at the end of STRING to form a single character.
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
831 If so, return the number of bytes after POS/POS_BYTE
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
832 which combine in this way. Otherwise, return 0. */
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
833
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
834 int
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
835 count_combining_after (const unsigned char *string,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
836 EMACS_INT length, EMACS_INT pos, EMACS_INT pos_byte)
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
837 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
838 EMACS_INT opos_byte = pos_byte;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
839 EMACS_INT i;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
840 EMACS_INT bytes;
25509
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
841 unsigned char *bufp;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
842
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
843 if (NILP (current_buffer->enable_multibyte_characters))
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
844 return 0;
25509
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
845
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
846 /* At first, we can exclude the following cases:
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
847 (1) The last byte of STRING is an ASCII.
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
848 (2) POS is the last of the current buffer.
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
849 (3) A character at POS can't be a following byte of multibyte
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
850 character. */
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
851 if (length > 0 && ASCII_BYTE_P (string[length - 1])) /* case (1) */
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
852 return 0;
25509
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
853 if (pos_byte == Z_BYTE) /* case (2) */
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
854 return 0;
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
855 bufp = BYTE_POS_ADDR (pos_byte);
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
856 if (CHAR_HEAD_P (*bufp)) /* case (3) */
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
857 return 0;
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
858
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
859 i = length - 1;
23203
a4e688757109 (count_combining_after): Check also preceding bytes at
Kenichi Handa <handa@m17n.org>
parents: 23155
diff changeset
860 while (i >= 0 && ! CHAR_HEAD_P (string[i]))
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
861 {
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
862 i--;
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
863 }
23203
a4e688757109 (count_combining_after): Check also preceding bytes at
Kenichi Handa <handa@m17n.org>
parents: 23155
diff changeset
864 if (i < 0)
a4e688757109 (count_combining_after): Check also preceding bytes at
Kenichi Handa <handa@m17n.org>
parents: 23155
diff changeset
865 {
25509
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
866 /* All characters in STRING are not character head. We must
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
867 check also preceding bytes at POS. We are sure that the gap
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
868 is at POS. */
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
869 unsigned char *p = BEG_ADDR;
23203
a4e688757109 (count_combining_after): Check also preceding bytes at
Kenichi Handa <handa@m17n.org>
parents: 23155
diff changeset
870 i = pos_byte - 2;
25509
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
871 while (i >= 0 && ! CHAR_HEAD_P (p[i]))
23203
a4e688757109 (count_combining_after): Check also preceding bytes at
Kenichi Handa <handa@m17n.org>
parents: 23155
diff changeset
872 i--;
108890
d9257436d2b1 Remove obsolete macro BASE_LEADING_CODE_P.
Juanma Barranquero <lekktu@gmail.com>
parents: 107984
diff changeset
873 if (i < 0 || !LEADING_CODE_P (p[i]))
23203
a4e688757109 (count_combining_after): Check also preceding bytes at
Kenichi Handa <handa@m17n.org>
parents: 23155
diff changeset
874 return 0;
26860
96ecaefd97a0 (copy_text): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
875
25509
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
876 bytes = BYTES_BY_CHAR_HEAD (p[i]);
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
877 return (bytes <= pos_byte - 1 - i + length
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
878 ? 0
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
879 : bytes - (pos_byte - 1 - i + length));
23203
a4e688757109 (count_combining_after): Check also preceding bytes at
Kenichi Handa <handa@m17n.org>
parents: 23155
diff changeset
880 }
108890
d9257436d2b1 Remove obsolete macro BASE_LEADING_CODE_P.
Juanma Barranquero <lekktu@gmail.com>
parents: 107984
diff changeset
881 if (!LEADING_CODE_P (string[i]))
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
882 return 0;
25509
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
883
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
884 bytes = BYTES_BY_CHAR_HEAD (string[i]) - (length - i);
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
885 bufp++, pos_byte++;
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
886 while (!CHAR_HEAD_P (*bufp)) bufp++, pos_byte++;
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
887
d1fbe67c3f69 (count_combining_composition): New function.
Kenichi Handa <handa@m17n.org>
parents: 25373
diff changeset
888 return (bytes <= pos_byte - opos_byte ? bytes : pos_byte - opos_byte);
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
889 }
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
890
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
891 #endif
23566
25baa4bda79d (check_markers): Check if markers are at character
Kenichi Handa <handa@m17n.org>
parents: 23555
diff changeset
892
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
893
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
894 /* Insert a sequence of NCHARS chars which occupy NBYTES bytes
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
895 starting at STRING. INHERIT, PREPARE and BEFORE_MARKERS
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
896 are the same as in insert_1. */
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
897
10391
55428c377c84 Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents: 10311
diff changeset
898 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
899 insert_1_both (const unsigned char *string,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
900 EMACS_INT nchars, EMACS_INT nbytes,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
901 int inherit, int prepare, int before_markers)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
902 {
40331
97afe8612d00 (insert_1_both): Do nothing if NCHARS == 0.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
903 if (nchars == 0)
97afe8612d00 (insert_1_both): Do nothing if NCHARS == 0.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
904 return;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48090
diff changeset
905
21054
5d592343630f (insert_1_both): If enable-multibyte-characters is nil,
Kenichi Handa <handa@m17n.org>
parents: 21037
diff changeset
906 if (NILP (current_buffer->enable_multibyte_characters))
5d592343630f (insert_1_both): If enable-multibyte-characters is nil,
Kenichi Handa <handa@m17n.org>
parents: 21037
diff changeset
907 nchars = nbytes;
5d592343630f (insert_1_both): If enable-multibyte-characters is nil,
Kenichi Handa <handa@m17n.org>
parents: 21037
diff changeset
908
21817
4dbf2af94988 (insert_1_both): Call prepare_to_modify_buffer before moving or making gap.
Richard M. Stallman <rms@gnu.org>
parents: 21765
diff changeset
909 if (prepare)
4dbf2af94988 (insert_1_both): Call prepare_to_modify_buffer before moving or making gap.
Richard M. Stallman <rms@gnu.org>
parents: 21765
diff changeset
910 /* Do this before moving and increasing the gap,
4dbf2af94988 (insert_1_both): Call prepare_to_modify_buffer before moving or making gap.
Richard M. Stallman <rms@gnu.org>
parents: 21765
diff changeset
911 because the before-change hooks might move the gap
4dbf2af94988 (insert_1_both): Call prepare_to_modify_buffer before moving or making gap.
Richard M. Stallman <rms@gnu.org>
parents: 21765
diff changeset
912 or make it smaller. */
4dbf2af94988 (insert_1_both): Call prepare_to_modify_buffer before moving or making gap.
Richard M. Stallman <rms@gnu.org>
parents: 21765
diff changeset
913 prepare_to_modify_buffer (PT, PT, NULL);
4dbf2af94988 (insert_1_both): Call prepare_to_modify_buffer before moving or making gap.
Richard M. Stallman <rms@gnu.org>
parents: 21765
diff changeset
914
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
915 if (PT != GPT)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
916 move_gap_both (PT, PT_BYTE);
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
917 if (GAP_SIZE < nbytes)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
918 make_gap (nbytes - GAP_SIZE);
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
919
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
920 #ifdef BYTE_COMBINING_DEBUG
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
921 if (count_combining_before (string, nbytes, PT, PT_BYTE)
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
922 || count_combining_after (string, nbytes, PT, PT_BYTE))
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
923 abort ();
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
924 #endif
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
925
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
926 /* Record deletion of the surrounding text that combines with
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
927 the insertion. This, together with recording the insertion,
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
928 will add up to the right stuff in the undo list. */
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
929 record_insert (PT, nchars);
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
930 MODIFF++;
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 71640
diff changeset
931 CHARS_MODIFF = MODIFF;
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
932
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109126
diff changeset
933 memcpy (GPT_ADDR, string, nbytes);
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
934
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
935 GAP_SIZE -= nbytes;
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
936 GPT += nchars;
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
937 ZV += nchars;
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
938 Z += nchars;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
939 GPT_BYTE += nbytes;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
940 ZV_BYTE += nbytes;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
941 Z_BYTE += nbytes;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
942 if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
943
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
944 if (GPT_BYTE < GPT)
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
945 abort ();
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
946
45818
e70fd49212a0 (insert_1_both, insert_from_string_1)
Kim F. Storm <storm@cua.dk>
parents: 43218
diff changeset
947 /* The insert may have been in the unchanged region, so check again. */
e70fd49212a0 (insert_1_both, insert_from_string_1)
Kim F. Storm <storm@cua.dk>
parents: 43218
diff changeset
948 if (Z - GPT < END_UNCHANGED)
e70fd49212a0 (insert_1_both, insert_from_string_1)
Kim F. Storm <storm@cua.dk>
parents: 43218
diff changeset
949 END_UNCHANGED = Z - GPT;
e70fd49212a0 (insert_1_both, insert_from_string_1)
Kim F. Storm <storm@cua.dk>
parents: 43218
diff changeset
950
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
951 adjust_overlays_for_insert (PT, nchars);
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
952 adjust_markers_for_insert (PT, PT_BYTE,
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
953 PT + nchars, PT_BYTE + nbytes,
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
954 before_markers);
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
955
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
956 if (BUF_INTERVALS (current_buffer) != 0)
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
957 offset_intervals (current_buffer, PT, nchars);
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
958
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
959 if (!inherit && BUF_INTERVALS (current_buffer) != 0)
26604
381c4e70f9fb (insert_1_both): Call set_text_properties with last
Gerd Moellmann <gerd@gnu.org>
parents: 26404
diff changeset
960 set_text_properties (make_number (PT), make_number (PT + nchars),
381c4e70f9fb (insert_1_both): Call set_text_properties with last
Gerd Moellmann <gerd@gnu.org>
parents: 26404
diff changeset
961 Qnil, Qnil, Qnil);
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
962
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
963 adjust_point (nchars, nbytes);
23538
84ad9e201361 (adjust_markers_for_insert): Adjust markers by taking
Kenichi Handa <handa@m17n.org>
parents: 23455
diff changeset
964
84ad9e201361 (adjust_markers_for_insert): Adjust markers by taking
Kenichi Handa <handa@m17n.org>
parents: 23455
diff changeset
965 CHECK_MARKERS ();
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
966 }
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
967
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
968 /* Insert the part of the text of STRING, a Lisp object assumed to be
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
969 of type string, consisting of the LENGTH characters (LENGTH_BYTE bytes)
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
970 starting at position POS / POS_BYTE. If the text of STRING has properties,
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
971 copy them into the buffer.
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
972
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
973 It does not work to use `insert' for this, because a GC could happen
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109126
diff changeset
974 before we copy the stuff into the buffer, and relocate the string
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
975 without insert noticing. */
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
976
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
977 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
978 insert_from_string (Lisp_Object string, EMACS_INT pos, EMACS_INT pos_byte,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
979 EMACS_INT length, EMACS_INT length_byte, int inherit)
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
980 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
981 EMACS_INT opoint = PT;
58735
dc21606c560a (insert_from_string_before_markers)
Richard M. Stallman <rms@gnu.org>
parents: 57878
diff changeset
982
dc21606c560a (insert_from_string_before_markers)
Richard M. Stallman <rms@gnu.org>
parents: 57878
diff changeset
983 if (SCHARS (string) == 0)
dc21606c560a (insert_from_string_before_markers)
Richard M. Stallman <rms@gnu.org>
parents: 57878
diff changeset
984 return;
dc21606c560a (insert_from_string_before_markers)
Richard M. Stallman <rms@gnu.org>
parents: 57878
diff changeset
985
21765
747446245094 (insert_from_string, insert_from_string_before_markers):
Richard M. Stallman <rms@gnu.org>
parents: 21676
diff changeset
986 insert_from_string_1 (string, pos, pos_byte, length, length_byte,
747446245094 (insert_from_string, insert_from_string_before_markers):
Richard M. Stallman <rms@gnu.org>
parents: 21676
diff changeset
987 inherit, 0);
747446245094 (insert_from_string, insert_from_string_before_markers):
Richard M. Stallman <rms@gnu.org>
parents: 21676
diff changeset
988 signal_after_change (opoint, 0, PT - opoint);
26860
96ecaefd97a0 (copy_text): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
989 update_compositions (opoint, PT, CHECK_BORDER);
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
990 }
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
991
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
992 /* Like `insert_from_string' except that all markers pointing
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
993 at the place where the insertion happens are adjusted to point after it. */
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
994
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
995 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
996 insert_from_string_before_markers (Lisp_Object string,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
997 EMACS_INT pos, EMACS_INT pos_byte,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
998 EMACS_INT length, EMACS_INT length_byte,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
999 int inherit)
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1000 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1001 EMACS_INT opoint = PT;
58735
dc21606c560a (insert_from_string_before_markers)
Richard M. Stallman <rms@gnu.org>
parents: 57878
diff changeset
1002
dc21606c560a (insert_from_string_before_markers)
Richard M. Stallman <rms@gnu.org>
parents: 57878
diff changeset
1003 if (SCHARS (string) == 0)
dc21606c560a (insert_from_string_before_markers)
Richard M. Stallman <rms@gnu.org>
parents: 57878
diff changeset
1004 return;
dc21606c560a (insert_from_string_before_markers)
Richard M. Stallman <rms@gnu.org>
parents: 57878
diff changeset
1005
21765
747446245094 (insert_from_string, insert_from_string_before_markers):
Richard M. Stallman <rms@gnu.org>
parents: 21676
diff changeset
1006 insert_from_string_1 (string, pos, pos_byte, length, length_byte,
747446245094 (insert_from_string, insert_from_string_before_markers):
Richard M. Stallman <rms@gnu.org>
parents: 21676
diff changeset
1007 inherit, 1);
747446245094 (insert_from_string, insert_from_string_before_markers):
Richard M. Stallman <rms@gnu.org>
parents: 21676
diff changeset
1008 signal_after_change (opoint, 0, PT - opoint);
26860
96ecaefd97a0 (copy_text): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
1009 update_compositions (opoint, PT, CHECK_BORDER);
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1010 }
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1011
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1012 /* Subroutine of the insertion functions above. */
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1013
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1014 static void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1015 insert_from_string_1 (Lisp_Object string, EMACS_INT pos, EMACS_INT pos_byte,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1016 EMACS_INT nchars, EMACS_INT nbytes,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1017 int inherit, int before_markers)
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1018 {
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1019 struct gcpro gcpro1;
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1020 EMACS_INT outgoing_nbytes = nbytes;
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
1021 INTERVAL intervals;
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1022
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1023 /* Make OUTGOING_NBYTES describe the text
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1024 as it will be inserted in this buffer. */
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1025
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1026 if (NILP (current_buffer->enable_multibyte_characters))
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1027 outgoing_nbytes = nchars;
21246
6c16216d0e69 (insert_from_string_1, replace_range):
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
1028 else if (! STRING_MULTIBYTE (string))
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1029 outgoing_nbytes
46426
d7f3f0434d43 * insdel.c (insert_from_string_1): Use SDATA.
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
1030 = count_size_as_multibyte (SDATA (string) + pos_byte,
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1031 nbytes);
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1032
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1033 GCPRO1 (string);
21817
4dbf2af94988 (insert_1_both): Call prepare_to_modify_buffer before moving or making gap.
Richard M. Stallman <rms@gnu.org>
parents: 21765
diff changeset
1034 /* Do this before moving and increasing the gap,
4dbf2af94988 (insert_1_both): Call prepare_to_modify_buffer before moving or making gap.
Richard M. Stallman <rms@gnu.org>
parents: 21765
diff changeset
1035 because the before-change hooks might move the gap
4dbf2af94988 (insert_1_both): Call prepare_to_modify_buffer before moving or making gap.
Richard M. Stallman <rms@gnu.org>
parents: 21765
diff changeset
1036 or make it smaller. */
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1037 prepare_to_modify_buffer (PT, PT, NULL);
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1038
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1039 if (PT != GPT)
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1040 move_gap_both (PT, PT_BYTE);
25170
dbc159883883 (insert_from_string_1): Check gap size against number
Andreas Schwab <schwab@suse.de>
parents: 25025
diff changeset
1041 if (GAP_SIZE < outgoing_nbytes)
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1042 make_gap (outgoing_nbytes - GAP_SIZE);
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1043 UNGCPRO;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1044
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1045 /* Copy the string text into the buffer, perhaps converting
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1046 between single-byte and multibyte. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1047 copy_text (SDATA (string) + pos_byte, GPT_ADDR, nbytes,
21246
6c16216d0e69 (insert_from_string_1, replace_range):
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
1048 STRING_MULTIBYTE (string),
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1049 ! NILP (current_buffer->enable_multibyte_characters));
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1050
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1051 #ifdef BYTE_COMBINING_DEBUG
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
1052 /* We have copied text into the gap, but we have not altered
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
1053 PT or PT_BYTE yet. So we can pass PT and PT_BYTE
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
1054 to these functions and get the same results as we would
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
1055 have got earlier on. Meanwhile, PT_ADDR does point to
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
1056 the text that has been stored by copy_text. */
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1057 if (count_combining_before (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE)
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1058 || count_combining_after (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE))
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1059 abort ();
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1060 #endif
22107
5507c26908af (insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents: 21817
diff changeset
1061
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1062 record_insert (PT, nchars);
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
1063 MODIFF++;
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 71640
diff changeset
1064 CHARS_MODIFF = MODIFF;
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
1065
20642
818677afe7bc (insert_from_string_1): Decrement GAP_SIZE by
Kenichi Handa <handa@m17n.org>
parents: 20608
diff changeset
1066 GAP_SIZE -= outgoing_nbytes;
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1067 GPT += nchars;
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1068 ZV += nchars;
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1069 Z += nchars;
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1070 GPT_BYTE += outgoing_nbytes;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1071 ZV_BYTE += outgoing_nbytes;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1072 Z_BYTE += outgoing_nbytes;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1073 if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1074
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1075 if (GPT_BYTE < GPT)
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1076 abort ();
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1077
45818
e70fd49212a0 (insert_1_both, insert_from_string_1)
Kim F. Storm <storm@cua.dk>
parents: 43218
diff changeset
1078 /* The insert may have been in the unchanged region, so check again. */
e70fd49212a0 (insert_1_both, insert_from_string_1)
Kim F. Storm <storm@cua.dk>
parents: 43218
diff changeset
1079 if (Z - GPT < END_UNCHANGED)
e70fd49212a0 (insert_1_both, insert_from_string_1)
Kim F. Storm <storm@cua.dk>
parents: 43218
diff changeset
1080 END_UNCHANGED = Z - GPT;
e70fd49212a0 (insert_1_both, insert_from_string_1)
Kim F. Storm <storm@cua.dk>
parents: 43218
diff changeset
1081
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1082 adjust_overlays_for_insert (PT, nchars);
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1083 adjust_markers_for_insert (PT, PT_BYTE, PT + nchars,
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1084 PT_BYTE + outgoing_nbytes,
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1085 before_markers);
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1086
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1087 offset_intervals (current_buffer, PT, nchars);
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1088
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1089 intervals = STRING_INTERVALS (string);
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1090 /* Get the intervals for the part of the string we are inserting. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1091 if (nbytes < SBYTES (string))
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1092 intervals = copy_intervals (intervals, pos, nchars);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48090
diff changeset
1093
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
1094 /* Insert those intervals. */
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1095 graft_intervals_into_buffer (intervals, PT, nchars,
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1096 current_buffer, inherit);
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
1097
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1098 adjust_point (nchars, outgoing_nbytes);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1099
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1100 CHECK_MARKERS ();
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1101 }
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1102
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1103 /* Insert a sequence of NCHARS chars which occupy NBYTES bytes
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1104 starting at GPT_ADDR. */
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1105
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1106 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1107 insert_from_gap (EMACS_INT nchars, EMACS_INT nbytes)
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1108 {
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1109 if (NILP (current_buffer->enable_multibyte_characters))
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1110 nchars = nbytes;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1111
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1112 record_insert (GPT, nchars);
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1113 MODIFF++;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1114
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1115 GAP_SIZE -= nbytes;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1116 GPT += nchars;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1117 ZV += nchars;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1118 Z += nchars;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1119 GPT_BYTE += nbytes;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1120 ZV_BYTE += nbytes;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1121 Z_BYTE += nbytes;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1122 if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1123
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1124 if (GPT_BYTE < GPT)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1125 abort ();
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1126
89598
dd3ec25f37e8 (insert_from_gap): Adjust intervals correctly.
Kenichi Handa <handa@m17n.org>
parents: 89483
diff changeset
1127 adjust_overlays_for_insert (GPT - nchars, nchars);
dd3ec25f37e8 (insert_from_gap): Adjust intervals correctly.
Kenichi Handa <handa@m17n.org>
parents: 89483
diff changeset
1128 adjust_markers_for_insert (GPT - nchars, GPT_BYTE - nbytes,
dd3ec25f37e8 (insert_from_gap): Adjust intervals correctly.
Kenichi Handa <handa@m17n.org>
parents: 89483
diff changeset
1129 GPT, GPT_BYTE, 0);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1130
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1131 if (BUF_INTERVALS (current_buffer) != 0)
89598
dd3ec25f37e8 (insert_from_gap): Adjust intervals correctly.
Kenichi Handa <handa@m17n.org>
parents: 89483
diff changeset
1132 {
dd3ec25f37e8 (insert_from_gap): Adjust intervals correctly.
Kenichi Handa <handa@m17n.org>
parents: 89483
diff changeset
1133 offset_intervals (current_buffer, GPT - nchars, nchars);
dd3ec25f37e8 (insert_from_gap): Adjust intervals correctly.
Kenichi Handa <handa@m17n.org>
parents: 89483
diff changeset
1134 graft_intervals_into_buffer (NULL_INTERVAL, GPT - nchars, nchars,
dd3ec25f37e8 (insert_from_gap): Adjust intervals correctly.
Kenichi Handa <handa@m17n.org>
parents: 89483
diff changeset
1135 current_buffer, 0);
dd3ec25f37e8 (insert_from_gap): Adjust intervals correctly.
Kenichi Handa <handa@m17n.org>
parents: 89483
diff changeset
1136 }
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1137
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1138 if (GPT - nchars < PT)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1139 adjust_point (nchars, nbytes);
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1140
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89326
diff changeset
1141 CHECK_MARKERS ();
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1142 }
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1143
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1144 /* Insert text from BUF, NCHARS characters starting at CHARPOS, into the
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1145 current buffer. If the text in BUF has properties, they are absorbed
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1146 into the current buffer.
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1147
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1148 It does not work to use `insert' for this, because a malloc could happen
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109126
diff changeset
1149 and relocate BUF's text before the copy happens. */
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1150
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1151 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1152 insert_from_buffer (struct buffer *buf,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1153 EMACS_INT charpos, EMACS_INT nchars, int inherit)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1154 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1155 EMACS_INT opoint = PT;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1156
21765
747446245094 (insert_from_string, insert_from_string_before_markers):
Richard M. Stallman <rms@gnu.org>
parents: 21676
diff changeset
1157 insert_from_buffer_1 (buf, charpos, nchars, inherit);
747446245094 (insert_from_string, insert_from_string_before_markers):
Richard M. Stallman <rms@gnu.org>
parents: 21676
diff changeset
1158 signal_after_change (opoint, 0, PT - opoint);
26860
96ecaefd97a0 (copy_text): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
1159 update_compositions (opoint, PT, CHECK_BORDER);
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1160 }
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1161
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1162 static void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1163 insert_from_buffer_1 (struct buffer *buf,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1164 EMACS_INT from, EMACS_INT nchars, int inherit)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1165 {
22107
5507c26908af (insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents: 21817
diff changeset
1166 register Lisp_Object temp;
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1167 EMACS_INT chunk, chunk_expanded;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1168 EMACS_INT from_byte = buf_charpos_to_bytepos (buf, from);
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1169 EMACS_INT to_byte = buf_charpos_to_bytepos (buf, from + nchars);
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1170 EMACS_INT incoming_nbytes = to_byte - from_byte;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1171 EMACS_INT outgoing_nbytes = incoming_nbytes;
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
1172 INTERVAL intervals;
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1173
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1174 /* Make OUTGOING_NBYTES describe the text
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1175 as it will be inserted in this buffer. */
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1176
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1177 if (NILP (current_buffer->enable_multibyte_characters))
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1178 outgoing_nbytes = nchars;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1179 else if (NILP (buf->enable_multibyte_characters))
23850
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1180 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1181 EMACS_INT outgoing_before_gap = 0;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1182 EMACS_INT outgoing_after_gap = 0;
23850
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1183
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1184 if (from < BUF_GPT (buf))
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1185 {
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1186 chunk = BUF_GPT_BYTE (buf) - from_byte;
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1187 if (chunk > incoming_nbytes)
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1188 chunk = incoming_nbytes;
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1189 outgoing_before_gap
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1190 = count_size_as_multibyte (BUF_BYTE_ADDRESS (buf, from_byte),
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1191 chunk);
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1192 }
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1193 else
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1194 chunk = 0;
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1195
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1196 if (chunk < incoming_nbytes)
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1197 outgoing_after_gap
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48090
diff changeset
1198 = count_size_as_multibyte (BUF_BYTE_ADDRESS (buf,
23850
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1199 from_byte + chunk),
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1200 incoming_nbytes - chunk);
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1201
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1202 outgoing_nbytes = outgoing_before_gap + outgoing_after_gap;
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1203 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48090
diff changeset
1204
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1205 /* Make sure point-max won't overflow after this insertion. */
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1206 XSETINT (temp, outgoing_nbytes + Z);
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1207 if (outgoing_nbytes + Z != XINT (temp))
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1208 error ("Maximum buffer size exceeded");
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1209
21817
4dbf2af94988 (insert_1_both): Call prepare_to_modify_buffer before moving or making gap.
Richard M. Stallman <rms@gnu.org>
parents: 21765
diff changeset
1210 /* Do this before moving and increasing the gap,
4dbf2af94988 (insert_1_both): Call prepare_to_modify_buffer before moving or making gap.
Richard M. Stallman <rms@gnu.org>
parents: 21765
diff changeset
1211 because the before-change hooks might move the gap
4dbf2af94988 (insert_1_both): Call prepare_to_modify_buffer before moving or making gap.
Richard M. Stallman <rms@gnu.org>
parents: 21765
diff changeset
1212 or make it smaller. */
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1213 prepare_to_modify_buffer (PT, PT, NULL);
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1214
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1215 if (PT != GPT)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1216 move_gap_both (PT, PT_BYTE);
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1217 if (GAP_SIZE < outgoing_nbytes)
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1218 make_gap (outgoing_nbytes - GAP_SIZE);
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1219
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1220 if (from < BUF_GPT (buf))
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1221 {
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1222 chunk = BUF_GPT_BYTE (buf) - from_byte;
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1223 if (chunk > incoming_nbytes)
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1224 chunk = incoming_nbytes;
23850
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1225 /* Record number of output bytes, so we know where
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1226 to put the output from the second copy_text. */
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1227 chunk_expanded
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1228 = copy_text (BUF_BYTE_ADDRESS (buf, from_byte),
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1229 GPT_ADDR, chunk,
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1230 ! NILP (buf->enable_multibyte_characters),
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1231 ! NILP (current_buffer->enable_multibyte_characters));
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1232 }
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1233 else
23850
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1234 chunk_expanded = chunk = 0;
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1235
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1236 if (chunk < incoming_nbytes)
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1237 copy_text (BUF_BYTE_ADDRESS (buf, from_byte + chunk),
23850
1a0fa0377fb3 (insert_from_buffer_1): Properly count the size
Karl Heuer <kwzh@gnu.org>
parents: 23689
diff changeset
1238 GPT_ADDR + chunk_expanded, incoming_nbytes - chunk,
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1239 ! NILP (buf->enable_multibyte_characters),
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1240 ! NILP (current_buffer->enable_multibyte_characters));
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1241
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1242 #ifdef BYTE_COMBINING_DEBUG
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
1243 /* We have copied text into the gap, but we have not altered
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
1244 PT or PT_BYTE yet. So we can pass PT and PT_BYTE
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
1245 to these functions and get the same results as we would
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1246 have got earlier on. Meanwhile, GPT_ADDR does point to
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
1247 the text that has been stored by copy_text. */
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1248 if (count_combining_before (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE)
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1249 || count_combining_after (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE))
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1250 abort ();
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1251 #endif
22107
5507c26908af (insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents: 21817
diff changeset
1252
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1253 record_insert (PT, nchars);
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
1254 MODIFF++;
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 71640
diff changeset
1255 CHARS_MODIFF = MODIFF;
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
1256
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1257 GAP_SIZE -= outgoing_nbytes;
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1258 GPT += nchars;
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1259 ZV += nchars;
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1260 Z += nchars;
20608
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1261 GPT_BYTE += outgoing_nbytes;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1262 ZV_BYTE += outgoing_nbytes;
a6cca06d5aaf (count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20574
diff changeset
1263 Z_BYTE += outgoing_nbytes;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1264 if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1265
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1266 if (GPT_BYTE < GPT)
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1267 abort ();
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1268
45818
e70fd49212a0 (insert_1_both, insert_from_string_1)
Kim F. Storm <storm@cua.dk>
parents: 43218
diff changeset
1269 /* The insert may have been in the unchanged region, so check again. */
e70fd49212a0 (insert_1_both, insert_from_string_1)
Kim F. Storm <storm@cua.dk>
parents: 43218
diff changeset
1270 if (Z - GPT < END_UNCHANGED)
e70fd49212a0 (insert_1_both, insert_from_string_1)
Kim F. Storm <storm@cua.dk>
parents: 43218
diff changeset
1271 END_UNCHANGED = Z - GPT;
e70fd49212a0 (insert_1_both, insert_from_string_1)
Kim F. Storm <storm@cua.dk>
parents: 43218
diff changeset
1272
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1273 adjust_overlays_for_insert (PT, nchars);
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1274 adjust_markers_for_insert (PT, PT_BYTE, PT + nchars,
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
1275 PT_BYTE + outgoing_nbytes,
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1276 0);
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
1277
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1278 if (BUF_INTERVALS (current_buffer) != 0)
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1279 offset_intervals (current_buffer, PT, nchars);
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
1280
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1281 /* Get the intervals for the part of the string we are inserting. */
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
1282 intervals = BUF_INTERVALS (buf);
93610
f65c3e4b689b (insert_from_buffer_1): Don't compare bytes in destination
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91807
diff changeset
1283 if (nchars < BUF_Z (buf) - BUF_BEG (buf))
28813
12946e495506 (insert_from_buffer_1): Adjust FROM position by number
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1284 {
12946e495506 (insert_from_buffer_1): Adjust FROM position by number
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1285 if (buf == current_buffer && PT <= from)
12946e495506 (insert_from_buffer_1): Adjust FROM position by number
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1286 from += nchars;
12946e495506 (insert_from_buffer_1): Adjust FROM position by number
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1287 intervals = copy_intervals (intervals, from, nchars);
12946e495506 (insert_from_buffer_1): Adjust FROM position by number
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1288 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48090
diff changeset
1289
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
1290 /* Insert those intervals. */
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1291 graft_intervals_into_buffer (intervals, PT, nchars, current_buffer, inherit);
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
1292
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1293 adjust_point (nchars, outgoing_nbytes);
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1294 }
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1295
21323
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1296 /* Record undo information and adjust markers and position keepers for
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1297 a replacement of a text PREV_TEXT at FROM to a new text of LEN
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1298 chars (LEN_BYTE bytes) which resides in the gap just after
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1299 GPT_ADDR.
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1300
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1301 PREV_TEXT nil means the new text was just inserted. */
20937
f77dcb2556c5 (adjust_before_replace): Comment added.
Kenichi Handa <handa@m17n.org>
parents: 20889
diff changeset
1302
20725
bd592c9c3ef6 (adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents: 20708
diff changeset
1303 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1304 adjust_after_replace (EMACS_INT from, EMACS_INT from_byte,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1305 Lisp_Object prev_text, EMACS_INT len, EMACS_INT len_byte)
20725
bd592c9c3ef6 (adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents: 20708
diff changeset
1306 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1307 EMACS_INT nchars_del = 0, nbytes_del = 0;
23597
fda73fa21974 (byte_combining_error): New function.
Kenichi Handa <handa@m17n.org>
parents: 23566
diff changeset
1308
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1309 #ifdef BYTE_COMBINING_DEBUG
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1310 if (count_combining_before (GPT_ADDR, len_byte, from, from_byte)
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1311 || count_combining_after (GPT_ADDR, len_byte, from, from_byte))
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1312 abort ();
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1313 #endif
21139
48b83e612b06 (adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents: 21137
diff changeset
1314
23538
84ad9e201361 (adjust_markers_for_insert): Adjust markers by taking
Kenichi Handa <handa@m17n.org>
parents: 23455
diff changeset
1315 if (STRINGP (prev_text))
84ad9e201361 (adjust_markers_for_insert): Adjust markers by taking
Kenichi Handa <handa@m17n.org>
parents: 23455
diff changeset
1316 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1317 nchars_del = SCHARS (prev_text);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1318 nbytes_del = SBYTES (prev_text);
23538
84ad9e201361 (adjust_markers_for_insert): Adjust markers by taking
Kenichi Handa <handa@m17n.org>
parents: 23455
diff changeset
1319 }
84ad9e201361 (adjust_markers_for_insert): Adjust markers by taking
Kenichi Handa <handa@m17n.org>
parents: 23455
diff changeset
1320
21139
48b83e612b06 (adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents: 21137
diff changeset
1321 /* Update various buffer positions for the new text. */
48b83e612b06 (adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents: 21137
diff changeset
1322 GAP_SIZE -= len_byte;
48b83e612b06 (adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents: 21137
diff changeset
1323 ZV += len; Z+= len;
48b83e612b06 (adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents: 21137
diff changeset
1324 ZV_BYTE += len_byte; Z_BYTE += len_byte;
48b83e612b06 (adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents: 21137
diff changeset
1325 GPT += len; GPT_BYTE += len_byte;
48b83e612b06 (adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents: 21137
diff changeset
1326 if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
48b83e612b06 (adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents: 21137
diff changeset
1327
29065
e8d5eb064973 (adjust_markers_for_replace): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 29012
diff changeset
1328 if (nchars_del > 0)
e8d5eb064973 (adjust_markers_for_replace): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 29012
diff changeset
1329 adjust_markers_for_replace (from, from_byte, nchars_del, nbytes_del,
e8d5eb064973 (adjust_markers_for_replace): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 29012
diff changeset
1330 len, len_byte);
e8d5eb064973 (adjust_markers_for_replace): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 29012
diff changeset
1331 else
e8d5eb064973 (adjust_markers_for_replace): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 29012
diff changeset
1332 adjust_markers_for_insert (from, from_byte,
e8d5eb064973 (adjust_markers_for_replace): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 29012
diff changeset
1333 from + len, from_byte + len_byte, 0);
21139
48b83e612b06 (adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents: 21137
diff changeset
1334
23538
84ad9e201361 (adjust_markers_for_insert): Adjust markers by taking
Kenichi Handa <handa@m17n.org>
parents: 23455
diff changeset
1335 if (! EQ (current_buffer->undo_list, Qt))
84ad9e201361 (adjust_markers_for_insert): Adjust markers by taking
Kenichi Handa <handa@m17n.org>
parents: 23455
diff changeset
1336 {
84ad9e201361 (adjust_markers_for_insert): Adjust markers by taking
Kenichi Handa <handa@m17n.org>
parents: 23455
diff changeset
1337 if (nchars_del > 0)
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1338 record_delete (from, prev_text);
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1339 record_insert (from, len);
23538
84ad9e201361 (adjust_markers_for_insert): Adjust markers by taking
Kenichi Handa <handa@m17n.org>
parents: 23455
diff changeset
1340 }
21323
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1341
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1342 if (len > nchars_del)
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1343 adjust_overlays_for_insert (from, len - nchars_del);
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1344 else if (len < nchars_del)
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1345 adjust_overlays_for_delete (from, nchars_del - len);
21139
48b83e612b06 (adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents: 21137
diff changeset
1346 if (BUF_INTERVALS (current_buffer) != 0)
23137
fed2ba47003f (adjust_after_replace): Fix the code to recode undo
Kenichi Handa <handa@m17n.org>
parents: 23133
diff changeset
1347 {
fed2ba47003f (adjust_after_replace): Fix the code to recode undo
Kenichi Handa <handa@m17n.org>
parents: 23133
diff changeset
1348 offset_intervals (current_buffer, from, len - nchars_del);
fed2ba47003f (adjust_after_replace): Fix the code to recode undo
Kenichi Handa <handa@m17n.org>
parents: 23133
diff changeset
1349 }
21139
48b83e612b06 (adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents: 21137
diff changeset
1350
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1351 if (from < PT)
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1352 adjust_point (len - nchars_del, len_byte - nbytes_del);
21139
48b83e612b06 (adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents: 21137
diff changeset
1353
23566
25baa4bda79d (check_markers): Check if markers are at character
Kenichi Handa <handa@m17n.org>
parents: 23555
diff changeset
1354 /* As byte combining will decrease Z, we must check this again. */
25373
6e6b29a72e2c (gap_left): Use BUF_COMPUTE_UNCHANGED.
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
1355 if (Z - GPT < END_UNCHANGED)
6e6b29a72e2c (gap_left): Use BUF_COMPUTE_UNCHANGED.
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
1356 END_UNCHANGED = Z - GPT;
23566
25baa4bda79d (check_markers): Check if markers are at character
Kenichi Handa <handa@m17n.org>
parents: 23555
diff changeset
1357
21307
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
1358 CHECK_MARKERS ();
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
1359
20725
bd592c9c3ef6 (adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents: 20708
diff changeset
1360 if (len == 0)
bd592c9c3ef6 (adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents: 20708
diff changeset
1361 evaporate_overlays (from);
bd592c9c3ef6 (adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents: 20708
diff changeset
1362 MODIFF++;
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 71640
diff changeset
1363 CHARS_MODIFF = MODIFF;
20725
bd592c9c3ef6 (adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents: 20708
diff changeset
1364 }
bd592c9c3ef6 (adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents: 20708
diff changeset
1365
42662
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1366 /* Like adjust_after_replace, but doesn't require PREV_TEXT.
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1367 This is for use when undo is not enabled in the current buffer. */
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1368
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1369 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1370 adjust_after_replace_noundo (EMACS_INT from, EMACS_INT from_byte,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1371 EMACS_INT nchars_del, EMACS_INT nbytes_del,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1372 EMACS_INT len, EMACS_INT len_byte)
42662
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1373 {
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1374 #ifdef BYTE_COMBINING_DEBUG
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1375 if (count_combining_before (GPT_ADDR, len_byte, from, from_byte)
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1376 || count_combining_after (GPT_ADDR, len_byte, from, from_byte))
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1377 abort ();
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1378 #endif
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1379
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1380 /* Update various buffer positions for the new text. */
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1381 GAP_SIZE -= len_byte;
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1382 ZV += len; Z+= len;
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1383 ZV_BYTE += len_byte; Z_BYTE += len_byte;
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1384 GPT += len; GPT_BYTE += len_byte;
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1385 if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1386
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1387 if (nchars_del > 0)
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1388 adjust_markers_for_replace (from, from_byte, nchars_del, nbytes_del,
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1389 len, len_byte);
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1390 else
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1391 adjust_markers_for_insert (from, from_byte,
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1392 from + len, from_byte + len_byte, 0);
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1393
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1394 if (len > nchars_del)
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1395 adjust_overlays_for_insert (from, len - nchars_del);
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1396 else if (len < nchars_del)
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1397 adjust_overlays_for_delete (from, nchars_del - len);
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1398 if (BUF_INTERVALS (current_buffer) != 0)
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1399 {
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1400 offset_intervals (current_buffer, from, len - nchars_del);
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1401 }
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1402
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1403 if (from < PT)
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1404 adjust_point (len - nchars_del, len_byte - nbytes_del);
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1405
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1406 /* As byte combining will decrease Z, we must check this again. */
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1407 if (Z - GPT < END_UNCHANGED)
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1408 END_UNCHANGED = Z - GPT;
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1409
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1410 CHECK_MARKERS ();
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1411
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1412 if (len == 0)
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1413 evaporate_overlays (from);
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1414 MODIFF++;
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 71640
diff changeset
1415 CHARS_MODIFF = MODIFF;
42662
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1416 }
e95258418289 (adjust_after_replace_noundo): New function.
Richard M. Stallman <rms@gnu.org>
parents: 42581
diff changeset
1417
21323
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1418 /* Record undo information, adjust markers and position keepers for an
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1419 insertion of a text from FROM (FROM_BYTE) to TO (TO_BYTE). The
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1420 text already exists in the current buffer but character length (TO
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1421 - FROM) may be incorrect, the correct length is NEWLEN. */
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1422
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1423 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1424 adjust_after_insert (EMACS_INT from, EMACS_INT from_byte,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1425 EMACS_INT to, EMACS_INT to_byte, EMACS_INT newlen)
21323
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1426 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1427 EMACS_INT len = to - from, len_byte = to_byte - from_byte;
21323
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1428
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1429 if (GPT != to)
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1430 move_gap_both (to, to_byte);
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1431 GAP_SIZE += len_byte;
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1432 GPT -= len; GPT_BYTE -= len_byte;
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1433 ZV -= len; ZV_BYTE -= len_byte;
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1434 Z -= len; Z_BYTE -= len_byte;
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1435 adjust_after_replace (from, from_byte, Qnil, newlen, len_byte);
6fe4f59fab8c (adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents: 21307
diff changeset
1436 }
57878
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1437
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1438 /* Replace the text from character positions FROM to TO with NEW,
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1439 If PREPARE is nonzero, call prepare_to_modify_buffer.
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1440 If INHERIT, the newly inserted text should inherit text properties
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1441 from the surrounding non-deleted text. */
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1442
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1443 /* Note that this does not yet handle markers quite right.
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1444 Also it needs to record a single undo-entry that does a replacement
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1445 rather than a separate delete and insert.
23053
09d1521f9984 (replace_range): Rename NOMARKERS arg to MARKERS.
Richard M. Stallman <rms@gnu.org>
parents: 23028
diff changeset
1446 That way, undo will also handle markers properly.
09d1521f9984 (replace_range): Rename NOMARKERS arg to MARKERS.
Richard M. Stallman <rms@gnu.org>
parents: 23028
diff changeset
1447
09d1521f9984 (replace_range): Rename NOMARKERS arg to MARKERS.
Richard M. Stallman <rms@gnu.org>
parents: 23028
diff changeset
1448 But if MARKERS is 0, don't relocate markers. */
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1449
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1450 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1451 replace_range (EMACS_INT from, EMACS_INT to, Lisp_Object new,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1452 int prepare, int inherit, int markers)
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1453 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1454 EMACS_INT inschars = SCHARS (new);
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1455 EMACS_INT insbytes = SBYTES (new);
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1456 EMACS_INT from_byte, to_byte;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1457 EMACS_INT nbytes_del, nchars_del;
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1458 register Lisp_Object temp;
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1459 struct gcpro gcpro1;
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
1460 INTERVAL intervals;
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1461 EMACS_INT outgoing_insbytes = insbytes;
23259
a3f818e927ba (adjust_markers_for_replace): Don't adjust a byte
Kenichi Handa <handa@m17n.org>
parents: 23212
diff changeset
1462 Lisp_Object deletion;
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1463
21307
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
1464 CHECK_MARKERS ();
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
1465
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1466 GCPRO1 (new);
31829
43566b0aec59 Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents: 31603
diff changeset
1467 deletion = Qnil;
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1468
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1469 if (prepare)
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1470 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1471 EMACS_INT range_length = to - from;
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1472 prepare_to_modify_buffer (from, to, &from);
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1473 to = from + range_length;
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1474 }
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1475
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1476 UNGCPRO;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1477
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1478 /* Make args be valid */
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1479 if (from < BEGV)
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1480 from = BEGV;
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1481 if (to > ZV)
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1482 to = ZV;
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1483
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1484 from_byte = CHAR_TO_BYTE (from);
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1485 to_byte = CHAR_TO_BYTE (to);
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1486
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1487 nchars_del = to - from;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1488 nbytes_del = to_byte - from_byte;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1489
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1490 if (nbytes_del <= 0 && insbytes == 0)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1491 return;
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1492
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1493 /* Make OUTGOING_INSBYTES describe the text
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1494 as it will be inserted in this buffer. */
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1495
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1496 if (NILP (current_buffer->enable_multibyte_characters))
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1497 outgoing_insbytes = inschars;
21246
6c16216d0e69 (insert_from_string_1, replace_range):
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
1498 else if (! STRING_MULTIBYTE (new))
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1499 outgoing_insbytes
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1500 = count_size_as_multibyte (SDATA (new), insbytes);
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1501
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1502 /* Make sure point-max won't overflow after this insertion. */
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1503 XSETINT (temp, Z_BYTE - nbytes_del + insbytes);
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1504 if (Z_BYTE - nbytes_del + insbytes != XINT (temp))
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1505 error ("Maximum buffer size exceeded");
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1506
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1507 GCPRO1 (new);
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1508
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1509 /* Make sure the gap is somewhere in or next to what we are deleting. */
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1510 if (from > GPT)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1511 gap_right (from, from_byte);
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1512 if (to < GPT)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1513 gap_left (to, to_byte, 0);
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1514
23597
fda73fa21974 (byte_combining_error): New function.
Kenichi Handa <handa@m17n.org>
parents: 23566
diff changeset
1515 /* Even if we don't record for undo, we must keep the original text
fda73fa21974 (byte_combining_error): New function.
Kenichi Handa <handa@m17n.org>
parents: 23566
diff changeset
1516 because we may have to recover it because of inappropriate byte
fda73fa21974 (byte_combining_error): New function.
Kenichi Handa <handa@m17n.org>
parents: 23566
diff changeset
1517 combining. */
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1518 if (! EQ (current_buffer->undo_list, Qt))
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1519 deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1);
23259
a3f818e927ba (adjust_markers_for_replace): Don't adjust a byte
Kenichi Handa <handa@m17n.org>
parents: 23212
diff changeset
1520
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1521 GAP_SIZE += nbytes_del;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1522 ZV -= nchars_del;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1523 Z -= nchars_del;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1524 ZV_BYTE -= nbytes_del;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1525 Z_BYTE -= nbytes_del;
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1526 GPT = from;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1527 GPT_BYTE = from_byte;
55740
eba675d00657 (del_range_2, replace_range): Don't write an anchor if the gap is empty.
Richard M. Stallman <rms@gnu.org>
parents: 54555
diff changeset
1528 if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1529
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1530 if (GPT_BYTE < GPT)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1531 abort ();
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1532
25373
6e6b29a72e2c (gap_left): Use BUF_COMPUTE_UNCHANGED.
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
1533 if (GPT - BEG < BEG_UNCHANGED)
6e6b29a72e2c (gap_left): Use BUF_COMPUTE_UNCHANGED.
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
1534 BEG_UNCHANGED = GPT - BEG;
6e6b29a72e2c (gap_left): Use BUF_COMPUTE_UNCHANGED.
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
1535 if (Z - GPT < END_UNCHANGED)
6e6b29a72e2c (gap_left): Use BUF_COMPUTE_UNCHANGED.
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
1536 END_UNCHANGED = Z - GPT;
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1537
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1538 if (GAP_SIZE < insbytes)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1539 make_gap (insbytes - GAP_SIZE);
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1540
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1541 /* Copy the string text into the buffer, perhaps converting
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1542 between single-byte and multibyte. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1543 copy_text (SDATA (new), GPT_ADDR, insbytes,
21246
6c16216d0e69 (insert_from_string_1, replace_range):
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
1544 STRING_MULTIBYTE (new),
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1545 ! NILP (current_buffer->enable_multibyte_characters));
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1546
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1547 #ifdef BYTE_COMBINING_DEBUG
22896
6d368c9a689e (replace_range): Don't assume PT is at the place
Richard M. Stallman <rms@gnu.org>
parents: 22876
diff changeset
1548 /* We have copied text into the gap, but we have not marked
6d368c9a689e (replace_range): Don't assume PT is at the place
Richard M. Stallman <rms@gnu.org>
parents: 22876
diff changeset
1549 it as part of the buffer. So we can use the old FROM and FROM_BYTE
6d368c9a689e (replace_range): Don't assume PT is at the place
Richard M. Stallman <rms@gnu.org>
parents: 22876
diff changeset
1550 here, for both the previous text and the following text.
6d368c9a689e (replace_range): Don't assume PT is at the place
Richard M. Stallman <rms@gnu.org>
parents: 22876
diff changeset
1551 Meanwhile, GPT_ADDR does point to
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
1552 the text that has been stored by copy_text. */
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1553 if (count_combining_before (GPT_ADDR, outgoing_insbytes, from, from_byte)
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1554 || count_combining_after (GPT_ADDR, outgoing_insbytes, from, from_byte))
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1555 abort ();
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1556 #endif
21126
7628e474e89f (adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents: 21054
diff changeset
1557
23259
a3f818e927ba (adjust_markers_for_replace): Don't adjust a byte
Kenichi Handa <handa@m17n.org>
parents: 23212
diff changeset
1558 if (! EQ (current_buffer->undo_list, Qt))
a3f818e927ba (adjust_markers_for_replace): Don't adjust a byte
Kenichi Handa <handa@m17n.org>
parents: 23212
diff changeset
1559 {
77621
beb7c0b976bd (replace_range): For undo, record insertion first.
Richard M. Stallman <rms@gnu.org>
parents: 76240
diff changeset
1560 /* Record the insertion first, so that when we undo,
beb7c0b976bd (replace_range): For undo, record insertion first.
Richard M. Stallman <rms@gnu.org>
parents: 76240
diff changeset
1561 the deletion will be undone first. Thus, undo
beb7c0b976bd (replace_range): For undo, record insertion first.
Richard M. Stallman <rms@gnu.org>
parents: 76240
diff changeset
1562 will insert before deleting, and thus will keep
beb7c0b976bd (replace_range): For undo, record insertion first.
Richard M. Stallman <rms@gnu.org>
parents: 76240
diff changeset
1563 the markers before and after this text separate. */
beb7c0b976bd (replace_range): For undo, record insertion first.
Richard M. Stallman <rms@gnu.org>
parents: 76240
diff changeset
1564 record_insert (from + SCHARS (deletion), inschars);
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1565 record_delete (from, deletion);
23259
a3f818e927ba (adjust_markers_for_replace): Don't adjust a byte
Kenichi Handa <handa@m17n.org>
parents: 23212
diff changeset
1566 }
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1567
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1568 GAP_SIZE -= outgoing_insbytes;
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1569 GPT += inschars;
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1570 ZV += inschars;
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1571 Z += inschars;
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1572 GPT_BYTE += outgoing_insbytes;
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1573 ZV_BYTE += outgoing_insbytes;
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1574 Z_BYTE += outgoing_insbytes;
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1575 if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1576
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1577 if (GPT_BYTE < GPT)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1578 abort ();
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1579
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1580 /* Adjust the overlay center as needed. This must be done after
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1581 adjusting the markers that bound the overlays. */
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1582 adjust_overlays_for_delete (from, nchars_del);
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1583 adjust_overlays_for_insert (from, inschars);
40923
5ed9e7521ec5 (replace_range): Use adjust_markers_for_replace
Richard M. Stallman <rms@gnu.org>
parents: 40331
diff changeset
1584
5ed9e7521ec5 (replace_range): Use adjust_markers_for_replace
Richard M. Stallman <rms@gnu.org>
parents: 40331
diff changeset
1585 /* Adjust markers for the deletion and the insertion. */
23053
09d1521f9984 (replace_range): Rename NOMARKERS arg to MARKERS.
Richard M. Stallman <rms@gnu.org>
parents: 23028
diff changeset
1586 if (markers)
40923
5ed9e7521ec5 (replace_range): Use adjust_markers_for_replace
Richard M. Stallman <rms@gnu.org>
parents: 40331
diff changeset
1587 adjust_markers_for_replace (from, from_byte, nchars_del, nbytes_del,
5ed9e7521ec5 (replace_range): Use adjust_markers_for_replace
Richard M. Stallman <rms@gnu.org>
parents: 40331
diff changeset
1588 inschars, outgoing_insbytes);
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1589
22896
6d368c9a689e (replace_range): Don't assume PT is at the place
Richard M. Stallman <rms@gnu.org>
parents: 22876
diff changeset
1590 offset_intervals (current_buffer, from, inschars - nchars_del);
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
1591
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
1592 /* Get the intervals for the part of the string we are inserting--
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
1593 not including the combined-before bytes. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1594 intervals = STRING_INTERVALS (new);
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
1595 /* Insert those intervals. */
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1596 graft_intervals_into_buffer (intervals, from, inschars,
21136
be04baf3d970 (adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents: 21135
diff changeset
1597 current_buffer, inherit);
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1598
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1599 /* Relocate point as if it were a marker. */
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1600 if (from < PT)
23212
42fcd022d4e5 (adjust_after_replace): Don't add combining bytes to
Kenichi Handa <handa@m17n.org>
parents: 23203
diff changeset
1601 adjust_point ((from + inschars - (PT < to ? PT : to)),
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1602 (from_byte + outgoing_insbytes
23212
42fcd022d4e5 (adjust_after_replace): Don't add combining bytes to
Kenichi Handa <handa@m17n.org>
parents: 23203
diff changeset
1603 - (PT_BYTE < to_byte ? PT_BYTE : to_byte)));
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1604
21137
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1605 if (outgoing_insbytes == 0)
f4df45f5a0e2 (combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21136
diff changeset
1606 evaporate_overlays (from);
21135
42badfae3618 (insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents: 21126
diff changeset
1607
21307
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
1608 CHECK_MARKERS ();
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
1609
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1610 MODIFF++;
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 71640
diff changeset
1611 CHARS_MODIFF = MODIFF;
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1612 UNGCPRO;
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1613
22896
6d368c9a689e (replace_range): Don't assume PT is at the place
Richard M. Stallman <rms@gnu.org>
parents: 22876
diff changeset
1614 signal_after_change (from, nchars_del, GPT - from);
26860
96ecaefd97a0 (copy_text): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
1615 update_compositions (from, GPT, CHECK_BORDER);
18830
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1616 }
ac0f5f1912c0 (replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 18446
diff changeset
1617
57878
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1618 /* Replace the text from character positions FROM to TO with
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1619 the text in INS of length INSCHARS.
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1620 Keep the text properties that applied to the old characters
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1621 (extending them to all the new chars if there are more new chars).
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1622
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1623 Note that this does not yet handle markers quite right.
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1624
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1625 If MARKERS is nonzero, relocate markers.
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1626
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1627 Unlike most functions at this level, never call
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1628 prepare_to_modify_buffer and never call signal_after_change. */
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1629
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1630 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1631 replace_range_2 (EMACS_INT from, EMACS_INT from_byte,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1632 EMACS_INT to, EMACS_INT to_byte,
109313
e856a274549b Constify functions taking char *
Andreas Schwab <schwab@linux-m68k.org>
parents: 109179
diff changeset
1633 const char *ins, EMACS_INT inschars, EMACS_INT insbytes,
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1634 int markers)
57878
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1635 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1636 EMACS_INT nbytes_del, nchars_del;
57878
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1637 Lisp_Object temp;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1638
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1639 CHECK_MARKERS ();
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1640
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1641 nchars_del = to - from;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1642 nbytes_del = to_byte - from_byte;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1643
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1644 if (nbytes_del <= 0 && insbytes == 0)
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1645 return;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1646
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1647 /* Make sure point-max won't overflow after this insertion. */
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1648 XSETINT (temp, Z_BYTE - nbytes_del + insbytes);
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1649 if (Z_BYTE - nbytes_del + insbytes != XINT (temp))
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1650 error ("Maximum buffer size exceeded");
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1651
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1652 /* Make sure the gap is somewhere in or next to what we are deleting. */
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1653 if (from > GPT)
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1654 gap_right (from, from_byte);
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1655 if (to < GPT)
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1656 gap_left (to, to_byte, 0);
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1657
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1658 GAP_SIZE += nbytes_del;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1659 ZV -= nchars_del;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1660 Z -= nchars_del;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1661 ZV_BYTE -= nbytes_del;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1662 Z_BYTE -= nbytes_del;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1663 GPT = from;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1664 GPT_BYTE = from_byte;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1665 if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1666
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1667 if (GPT_BYTE < GPT)
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1668 abort ();
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1669
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1670 if (GPT - BEG < BEG_UNCHANGED)
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1671 BEG_UNCHANGED = GPT - BEG;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1672 if (Z - GPT < END_UNCHANGED)
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1673 END_UNCHANGED = Z - GPT;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1674
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1675 if (GAP_SIZE < insbytes)
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1676 make_gap (insbytes - GAP_SIZE);
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1677
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1678 /* Copy the replacement text into the buffer. */
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109126
diff changeset
1679 memcpy (GPT_ADDR, ins, insbytes);
57878
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1680
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1681 #ifdef BYTE_COMBINING_DEBUG
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1682 /* We have copied text into the gap, but we have not marked
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1683 it as part of the buffer. So we can use the old FROM and FROM_BYTE
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1684 here, for both the previous text and the following text.
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1685 Meanwhile, GPT_ADDR does point to
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1686 the text that has been stored by copy_text. */
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1687 if (count_combining_before (GPT_ADDR, insbytes, from, from_byte)
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1688 || count_combining_after (GPT_ADDR, insbytes, from, from_byte))
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1689 abort ();
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1690 #endif
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1691
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1692 GAP_SIZE -= insbytes;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1693 GPT += inschars;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1694 ZV += inschars;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1695 Z += inschars;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1696 GPT_BYTE += insbytes;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1697 ZV_BYTE += insbytes;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1698 Z_BYTE += insbytes;
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1699 if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1700
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1701 if (GPT_BYTE < GPT)
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1702 abort ();
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1703
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1704 /* Adjust the overlay center as needed. This must be done after
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1705 adjusting the markers that bound the overlays. */
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1706 if (nchars_del != inschars)
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1707 {
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1708 adjust_overlays_for_insert (from, inschars);
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1709 adjust_overlays_for_delete (from + inschars, nchars_del);
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1710 }
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1711
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1712 /* Adjust markers for the deletion and the insertion. */
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1713 if (markers
59853
d0109a1ac6a0 (replace_range_2): Fix bugs in adjusting markers and point.
Kenichi Handa <handa@m17n.org>
parents: 58735
diff changeset
1714 && ! (nchars_del == 1 && inschars == 1 && nbytes_del == insbytes))
57878
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1715 adjust_markers_for_replace (from, from_byte, nchars_del, nbytes_del,
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1716 inschars, insbytes);
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1717
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1718 offset_intervals (current_buffer, from, inschars - nchars_del);
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1719
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1720 /* Relocate point as if it were a marker. */
59853
d0109a1ac6a0 (replace_range_2): Fix bugs in adjusting markers and point.
Kenichi Handa <handa@m17n.org>
parents: 58735
diff changeset
1721 if (from < PT && (nchars_del != inschars || nbytes_del != insbytes))
d0109a1ac6a0 (replace_range_2): Fix bugs in adjusting markers and point.
Kenichi Handa <handa@m17n.org>
parents: 58735
diff changeset
1722 {
d0109a1ac6a0 (replace_range_2): Fix bugs in adjusting markers and point.
Kenichi Handa <handa@m17n.org>
parents: 58735
diff changeset
1723 if (PT < to)
d0109a1ac6a0 (replace_range_2): Fix bugs in adjusting markers and point.
Kenichi Handa <handa@m17n.org>
parents: 58735
diff changeset
1724 /* PT was within the deleted text. Move it to FROM. */
d0109a1ac6a0 (replace_range_2): Fix bugs in adjusting markers and point.
Kenichi Handa <handa@m17n.org>
parents: 58735
diff changeset
1725 adjust_point (from - PT, from_byte - PT_BYTE);
d0109a1ac6a0 (replace_range_2): Fix bugs in adjusting markers and point.
Kenichi Handa <handa@m17n.org>
parents: 58735
diff changeset
1726 else
d0109a1ac6a0 (replace_range_2): Fix bugs in adjusting markers and point.
Kenichi Handa <handa@m17n.org>
parents: 58735
diff changeset
1727 adjust_point (inschars - nchars_del, insbytes - nbytes_del);
d0109a1ac6a0 (replace_range_2): Fix bugs in adjusting markers and point.
Kenichi Handa <handa@m17n.org>
parents: 58735
diff changeset
1728 }
57878
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1729
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1730 if (insbytes == 0)
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1731 evaporate_overlays (from);
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1732
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1733 CHECK_MARKERS ();
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1734
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1735 MODIFF++;
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 71640
diff changeset
1736 CHARS_MODIFF = MODIFF;
57878
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1737 }
57a0b4f747a1 (replace_range_2): New function.
Richard M. Stallman <rms@gnu.org>
parents: 55740
diff changeset
1738
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1739 /* Delete characters in current buffer
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1740 from FROM up to (but not including) TO.
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1741 If TO comes before FROM, we delete nothing. */
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1742
10391
55428c377c84 Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents: 10311
diff changeset
1743 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1744 del_range (EMACS_INT from, EMACS_INT to)
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1745 {
26742
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1746 del_range_1 (from, to, 1, 0);
6126
47d2f8f84309 (del_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5237
diff changeset
1747 }
47d2f8f84309 (del_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5237
diff changeset
1748
26742
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1749 /* Like del_range; PREPARE says whether to call prepare_to_modify_buffer.
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1750 RET_STRING says to return the deleted text. */
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1751
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1752 Lisp_Object
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1753 del_range_1 (EMACS_INT from, EMACS_INT to, int prepare, int ret_string)
6126
47d2f8f84309 (del_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5237
diff changeset
1754 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1755 EMACS_INT from_byte, to_byte;
26742
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1756 Lisp_Object deletion;
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1757 struct gcpro gcpro1;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1758
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1759 /* Make args be valid */
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1760 if (from < BEGV)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1761 from = BEGV;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1762 if (to > ZV)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1763 to = ZV;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1764
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1765 if (to <= from)
26742
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1766 return Qnil;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1767
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
1768 if (prepare)
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
1769 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1770 EMACS_INT range_length = to - from;
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
1771 prepare_to_modify_buffer (from, to, &from);
36070
2a1ee495a194 (del_range_1, del_range_byte, del_range_both): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 34974
diff changeset
1772 to = min (ZV, from + range_length);
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
1773 }
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
1774
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1775 from_byte = CHAR_TO_BYTE (from);
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1776 to_byte = CHAR_TO_BYTE (to);
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1777
26742
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1778 deletion = del_range_2 (from, from_byte, to, to_byte, ret_string);
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1779 GCPRO1(deletion);
24041
2eed8853546f (del_range_1): Call signal_after_change.
Kenichi Handa <handa@m17n.org>
parents: 23929
diff changeset
1780 signal_after_change (from, to - from, 0);
27664
c5c27d509bdf (del_range_1): Call update_compositions.
Kenichi Handa <handa@m17n.org>
parents: 26860
diff changeset
1781 update_compositions (from, from, CHECK_HEAD);
26742
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1782 UNGCPRO;
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1783 return deletion;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1784 }
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1785
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1786 /* Like del_range_1 but args are byte positions, not char positions. */
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1787
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1788 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1789 del_range_byte (EMACS_INT from_byte, EMACS_INT to_byte, int prepare)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1790 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1791 EMACS_INT from, to;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1792
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1793 /* Make args be valid */
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1794 if (from_byte < BEGV_BYTE)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1795 from_byte = BEGV_BYTE;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1796 if (to_byte > ZV_BYTE)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1797 to_byte = ZV_BYTE;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1798
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1799 if (to_byte <= from_byte)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1800 return;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1801
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1802 from = BYTE_TO_CHAR (from_byte);
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1803 to = BYTE_TO_CHAR (to_byte);
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1804
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1805 if (prepare)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1806 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1807 EMACS_INT old_from = from, old_to = Z - to;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1808 EMACS_INT range_length = to - from;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1809 prepare_to_modify_buffer (from, to, &from);
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1810 to = from + range_length;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1811
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1812 if (old_from != from)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1813 from_byte = CHAR_TO_BYTE (from);
36070
2a1ee495a194 (del_range_1, del_range_byte, del_range_both): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 34974
diff changeset
1814 if (to > ZV)
2a1ee495a194 (del_range_1, del_range_byte, del_range_both): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 34974
diff changeset
1815 {
2a1ee495a194 (del_range_1, del_range_byte, del_range_both): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 34974
diff changeset
1816 to = ZV;
2a1ee495a194 (del_range_1, del_range_byte, del_range_both): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 34974
diff changeset
1817 to_byte = ZV_BYTE;
2a1ee495a194 (del_range_1, del_range_byte, del_range_both): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 34974
diff changeset
1818 }
2a1ee495a194 (del_range_1, del_range_byte, del_range_both): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 34974
diff changeset
1819 else if (old_to == Z - to)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1820 to_byte = CHAR_TO_BYTE (to);
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1821 }
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1822
26742
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1823 del_range_2 (from, from_byte, to, to_byte, 0);
24041
2eed8853546f (del_range_1): Call signal_after_change.
Kenichi Handa <handa@m17n.org>
parents: 23929
diff changeset
1824 signal_after_change (from, to - from, 0);
26860
96ecaefd97a0 (copy_text): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
1825 update_compositions (from, from, CHECK_HEAD);
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1826 }
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1827
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1828 /* Like del_range_1, but positions are specified both as charpos
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1829 and bytepos. */
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1830
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1831 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1832 del_range_both (EMACS_INT from, EMACS_INT from_byte,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1833 EMACS_INT to, EMACS_INT to_byte, int prepare)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1834 {
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1835 /* Make args be valid */
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1836 if (from_byte < BEGV_BYTE)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1837 from_byte = BEGV_BYTE;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1838 if (to_byte > ZV_BYTE)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1839 to_byte = ZV_BYTE;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1840
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1841 if (to_byte <= from_byte)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1842 return;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1843
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1844 if (from < BEGV)
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1845 from = BEGV;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1846 if (to > ZV)
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1847 to = ZV;
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1848
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1849 if (prepare)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1850 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1851 EMACS_INT old_from = from, old_to = Z - to;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1852 EMACS_INT range_length = to - from;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1853 prepare_to_modify_buffer (from, to, &from);
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1854 to = from + range_length;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1855
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1856 if (old_from != from)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1857 from_byte = CHAR_TO_BYTE (from);
36070
2a1ee495a194 (del_range_1, del_range_byte, del_range_both): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 34974
diff changeset
1858 if (to > ZV)
2a1ee495a194 (del_range_1, del_range_byte, del_range_both): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 34974
diff changeset
1859 {
2a1ee495a194 (del_range_1, del_range_byte, del_range_both): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 34974
diff changeset
1860 to = ZV;
2a1ee495a194 (del_range_1, del_range_byte, del_range_both): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 34974
diff changeset
1861 to_byte = ZV_BYTE;
2a1ee495a194 (del_range_1, del_range_byte, del_range_both): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 34974
diff changeset
1862 }
2a1ee495a194 (del_range_1, del_range_byte, del_range_both): Handle
Gerd Moellmann <gerd@gnu.org>
parents: 34974
diff changeset
1863 else if (old_to == Z - to)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1864 to_byte = CHAR_TO_BYTE (to);
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1865 }
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1866
26742
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1867 del_range_2 (from, from_byte, to, to_byte, 0);
24041
2eed8853546f (del_range_1): Call signal_after_change.
Kenichi Handa <handa@m17n.org>
parents: 23929
diff changeset
1868 signal_after_change (from, to - from, 0);
26860
96ecaefd97a0 (copy_text): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
1869 update_compositions (from, from, CHECK_HEAD);
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1870 }
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1871
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1872 /* Delete a range of text, specified both as character positions
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1873 and byte positions. FROM and TO are character positions,
26742
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1874 while FROM_BYTE and TO_BYTE are byte positions.
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1875 If RET_STRING is true, the deleted area is returned as a string. */
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1876
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1877 Lisp_Object
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1878 del_range_2 (EMACS_INT from, EMACS_INT from_byte,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1879 EMACS_INT to, EMACS_INT to_byte, int ret_string)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1880 {
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1881 register EMACS_INT nbytes_del, nchars_del;
21236
90e90245e679 (insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents: 21228
diff changeset
1882 Lisp_Object deletion;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1883
21307
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
1884 CHECK_MARKERS ();
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
1885
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1886 nchars_del = to - from;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1887 nbytes_del = to_byte - from_byte;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1888
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1889 /* Make sure the gap is somewhere in or next to what we are deleting. */
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1890 if (from > GPT)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1891 gap_right (from, from_byte);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1892 if (to < GPT)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1893 gap_left (to, to_byte, 0);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1894
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1895 #ifdef BYTE_COMBINING_DEBUG
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1896 if (count_combining_before (BUF_BYTE_ADDRESS (current_buffer, to_byte),
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1897 Z_BYTE - to_byte, from, from_byte))
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1898 abort ();
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1899 #endif
21236
90e90245e679 (insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents: 21228
diff changeset
1900
26742
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1901 if (ret_string || ! EQ (current_buffer->undo_list, Qt))
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1902 deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1);
26742
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1903 else
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1904 deletion = Qnil;
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1905
14479
69fa625812a4 (adjust_markers): When a marker is inside text
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
1906 /* Relocate all markers pointing into the new, larger gap
69fa625812a4 (adjust_markers): When a marker is inside text
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
1907 to point at the end of the text before the gap.
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1908 Do this before recording the deletion,
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1909 so that undo handles this after reinserting the text. */
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1910 adjust_markers_for_delete (from, from_byte, to, to_byte);
21228
31a2889105f0 (del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents: 21191
diff changeset
1911
22107
5507c26908af (insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents: 21817
diff changeset
1912 if (! EQ (current_buffer->undo_list, Qt))
29012
9e67ee582342 (adjust_markers_for_record_delete): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 28813
diff changeset
1913 record_delete (from, deletion);
1247
8dce1588f37f (del_range): Call record_delete before updating point.
Richard M. Stallman <rms@gnu.org>
parents: 484
diff changeset
1914 MODIFF++;
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 71640
diff changeset
1915 CHARS_MODIFF = MODIFF;
1247
8dce1588f37f (del_range): Call record_delete before updating point.
Richard M. Stallman <rms@gnu.org>
parents: 484
diff changeset
1916
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1917 /* Relocate point as if it were a marker. */
7108
6e6410985d76 Use PT, not point.
Karl Heuer <kwzh@gnu.org>
parents: 6787
diff changeset
1918 if (from < PT)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1919 adjust_point (from - (PT < to ? PT : to),
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1920 from_byte - (PT_BYTE < to_byte ? PT_BYTE : to_byte));
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1921
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1922 offset_intervals (current_buffer, from, - nchars_del);
1963
05dd60327cc4 (del_range): Update point before offset_intervals.
Richard M. Stallman <rms@gnu.org>
parents: 1821
diff changeset
1923
11474
510885be2758 (insert_1): Adjust overlay center after inserting.
Karl Heuer <kwzh@gnu.org>
parents: 11235
diff changeset
1924 /* Adjust the overlay center as needed. This must be done after
12617
2a4a6e89558d Comment change.
Karl Heuer <kwzh@gnu.org>
parents: 12244
diff changeset
1925 adjusting the markers that bound the overlays. */
21191
b4e925500a71 (ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents: 21185
diff changeset
1926 adjust_overlays_for_delete (from, nchars_del);
11474
510885be2758 (insert_1): Adjust overlay center after inserting.
Karl Heuer <kwzh@gnu.org>
parents: 11235
diff changeset
1927
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1928 GAP_SIZE += nbytes_del;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1929 ZV_BYTE -= nbytes_del;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1930 Z_BYTE -= nbytes_del;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1931 ZV -= nchars_del;
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1932 Z -= nchars_del;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1933 GPT = from;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1934 GPT_BYTE = from_byte;
102185
d6a2f8a116ac (del_range_2): Don't modify gap contents when called
Andreas Schwab <schwab@suse.de>
parents: 100951
diff changeset
1935 if (GAP_SIZE > 0 && !current_buffer->text->inhibit_shrinking)
d6a2f8a116ac (del_range_2): Don't modify gap contents when called
Andreas Schwab <schwab@suse.de>
parents: 100951
diff changeset
1936 /* Put an anchor, unless called from decode_coding_object which
d6a2f8a116ac (del_range_2): Don't modify gap contents when called
Andreas Schwab <schwab@suse.de>
parents: 100951
diff changeset
1937 needs to access the previous gap contents. */
d6a2f8a116ac (del_range_2): Don't modify gap contents when called
Andreas Schwab <schwab@suse.de>
parents: 100951
diff changeset
1938 *(GPT_ADDR) = 0;
21191
b4e925500a71 (ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents: 21185
diff changeset
1939
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1940 if (GPT_BYTE < GPT)
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1941 abort ();
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1942
25373
6e6b29a72e2c (gap_left): Use BUF_COMPUTE_UNCHANGED.
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
1943 if (GPT - BEG < BEG_UNCHANGED)
6e6b29a72e2c (gap_left): Use BUF_COMPUTE_UNCHANGED.
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
1944 BEG_UNCHANGED = GPT - BEG;
6e6b29a72e2c (gap_left): Use BUF_COMPUTE_UNCHANGED.
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
1945 if (Z - GPT < END_UNCHANGED)
6e6b29a72e2c (gap_left): Use BUF_COMPUTE_UNCHANGED.
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
1946 END_UNCHANGED = Z - GPT;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1947
21307
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
1948 CHECK_MARKERS ();
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
1949
8840
7242936baf4e (del_range_1): Call evaporate_overlays after deleting text.
Karl Heuer <kwzh@gnu.org>
parents: 8687
diff changeset
1950 evaporate_overlays (from);
26742
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1951
936b39bd05b4 * editfns.c (Fdelete_and_extract_region): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26731
diff changeset
1952 return deletion;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1953 }
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1954
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1955 /* Call this if you're about to change the region of BUFFER from
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1956 character positions START to END. This checks the read-only
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1957 properties of the region, calls the necessary modification hooks,
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1958 and warns the next redisplay that it should pay attention to that
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 71640
diff changeset
1959 area.
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 71640
diff changeset
1960
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 71640
diff changeset
1961 If PRESERVE_CHARS_MODIFF is non-zero, do not update CHARS_MODIFF.
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 71640
diff changeset
1962 Otherwise set CHARS_MODIFF to the new value of MODIFF. */
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1963
10391
55428c377c84 Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents: 10311
diff changeset
1964 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1965 modify_region (struct buffer *buffer, EMACS_INT start, EMACS_INT end,
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
1966 int preserve_chars_modiff)
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1967 {
2783
789c11177579 The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents: 2480
diff changeset
1968 struct buffer *old_buffer = current_buffer;
789c11177579 The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents: 2480
diff changeset
1969
789c11177579 The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents: 2480
diff changeset
1970 if (buffer != old_buffer)
789c11177579 The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents: 2480
diff changeset
1971 set_buffer_internal (buffer);
789c11177579 The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents: 2480
diff changeset
1972
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
1973 prepare_to_modify_buffer (start, end, NULL);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1974
25373
6e6b29a72e2c (gap_left): Use BUF_COMPUTE_UNCHANGED.
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
1975 BUF_COMPUTE_UNCHANGED (buffer, start - 1, end);
5237
378540cf056f (del_range): Second argument in call to
Richard M. Stallman <rms@gnu.org>
parents: 5168
diff changeset
1976
10311
0de21e27722f Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 10145
diff changeset
1977 if (MODIFF <= SAVE_MODIFF)
5237
378540cf056f (del_range): Second argument in call to
Richard M. Stallman <rms@gnu.org>
parents: 5168
diff changeset
1978 record_first_change ();
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1979 MODIFF++;
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 71640
diff changeset
1980 if (! preserve_chars_modiff)
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 71640
diff changeset
1981 CHARS_MODIFF = MODIFF;
2783
789c11177579 The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents: 2480
diff changeset
1982
10564
69cae342dde5 (modify_region): Clear point_before_scroll field.
Richard M. Stallman <rms@gnu.org>
parents: 10391
diff changeset
1983 buffer->point_before_scroll = Qnil;
69cae342dde5 (modify_region): Clear point_before_scroll field.
Richard M. Stallman <rms@gnu.org>
parents: 10391
diff changeset
1984
2783
789c11177579 The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents: 2480
diff changeset
1985 if (buffer != old_buffer)
789c11177579 The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents: 2480
diff changeset
1986 set_buffer_internal (old_buffer);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1987 }
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
1988
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1989 /* Check that it is okay to modify the buffer between START and END,
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1990 which are char positions.
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
1991
1289
74b26ab86df4 * insdel.c: #include "intervals.h"
Joseph Arceneaux <jla@gnu.org>
parents: 1247
diff changeset
1992 Run the before-change-function, if any. If intervals are in use,
74b26ab86df4 * insdel.c: #include "intervals.h"
Joseph Arceneaux <jla@gnu.org>
parents: 1247
diff changeset
1993 verify that the text to be modified is not read-only, and call
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
1994 any modification properties the text may have.
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
1995
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
1996 If PRESERVE_PTR is nonzero, we relocate *PRESERVE_PTR
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
1997 by holding its value temporarily in a marker. */
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1998
10391
55428c377c84 Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents: 10311
diff changeset
1999 void
102759
ec3ec7f5d54e * editfns.c (general_insert_function): Adjust to insdel.c changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102753
diff changeset
2000 prepare_to_modify_buffer (EMACS_INT start, EMACS_INT end,
ec3ec7f5d54e * editfns.c (general_insert_function): Adjust to insdel.c changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102753
diff changeset
2001 EMACS_INT *preserve_ptr)
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2002 {
71640
5cdc253a3479 * insdel.c (prepare_to_modify_buffer): For an indirect buffer, do
Chong Yidong <cyd@stupidchicken.com>
parents: 68651
diff changeset
2003 struct buffer *base_buffer;
5cdc253a3479 * insdel.c (prepare_to_modify_buffer): For an indirect buffer, do
Chong Yidong <cyd@stupidchicken.com>
parents: 68651
diff changeset
2004
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 251
diff changeset
2005 if (!NILP (current_buffer->read_only))
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2006 Fbarf_if_buffer_read_only ();
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2007
25025
be2881684382 (prepare_to_modify_buffer): Set windows_or_buffers_changed,
Gerd Moellmann <gerd@gnu.org>
parents: 24342
diff changeset
2008 /* Let redisplay consider other windows than selected_window
be2881684382 (prepare_to_modify_buffer): Set windows_or_buffers_changed,
Gerd Moellmann <gerd@gnu.org>
parents: 24342
diff changeset
2009 if modifying another buffer. */
be2881684382 (prepare_to_modify_buffer): Set windows_or_buffers_changed,
Gerd Moellmann <gerd@gnu.org>
parents: 24342
diff changeset
2010 if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer)
be2881684382 (prepare_to_modify_buffer): Set windows_or_buffers_changed,
Gerd Moellmann <gerd@gnu.org>
parents: 24342
diff changeset
2011 ++windows_or_buffers_changed;
be2881684382 (prepare_to_modify_buffer): Set windows_or_buffers_changed,
Gerd Moellmann <gerd@gnu.org>
parents: 24342
diff changeset
2012
10311
0de21e27722f Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 10145
diff changeset
2013 if (BUF_INTERVALS (current_buffer) != 0)
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2014 {
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2015 if (preserve_ptr)
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2016 {
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2017 Lisp_Object preserve_marker;
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2018 struct gcpro gcpro1;
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2019 preserve_marker = Fcopy_marker (make_number (*preserve_ptr), Qnil);
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2020 GCPRO1 (preserve_marker);
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2021 verify_interval_modification (current_buffer, start, end);
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2022 *preserve_ptr = marker_position (preserve_marker);
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
2023 unchain_marker (XMARKER (preserve_marker));
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2024 UNGCPRO;
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2025 }
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2026 else
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2027 verify_interval_modification (current_buffer, start, end);
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2028 }
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2029
71640
5cdc253a3479 * insdel.c (prepare_to_modify_buffer): For an indirect buffer, do
Chong Yidong <cyd@stupidchicken.com>
parents: 68651
diff changeset
2030 /* For indirect buffers, use the base buffer to check clashes. */
5cdc253a3479 * insdel.c (prepare_to_modify_buffer): For an indirect buffer, do
Chong Yidong <cyd@stupidchicken.com>
parents: 68651
diff changeset
2031 if (current_buffer->base_buffer != 0)
5cdc253a3479 * insdel.c (prepare_to_modify_buffer): For an indirect buffer, do
Chong Yidong <cyd@stupidchicken.com>
parents: 68651
diff changeset
2032 base_buffer = current_buffer->base_buffer;
5cdc253a3479 * insdel.c (prepare_to_modify_buffer): For an indirect buffer, do
Chong Yidong <cyd@stupidchicken.com>
parents: 68651
diff changeset
2033 else
5cdc253a3479 * insdel.c (prepare_to_modify_buffer): For an indirect buffer, do
Chong Yidong <cyd@stupidchicken.com>
parents: 68651
diff changeset
2034 base_buffer = current_buffer;
5cdc253a3479 * insdel.c (prepare_to_modify_buffer): For an indirect buffer, do
Chong Yidong <cyd@stupidchicken.com>
parents: 68651
diff changeset
2035
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2036 #ifdef CLASH_DETECTION
71640
5cdc253a3479 * insdel.c (prepare_to_modify_buffer): For an indirect buffer, do
Chong Yidong <cyd@stupidchicken.com>
parents: 68651
diff changeset
2037 if (!NILP (base_buffer->file_truename)
12621
e71c530e5ae5 (prepare_to_modify_buffer): Don't lock the file
Richard M. Stallman <rms@gnu.org>
parents: 12617
diff changeset
2038 /* Make binding buffer-file-name to nil effective. */
71640
5cdc253a3479 * insdel.c (prepare_to_modify_buffer): For an indirect buffer, do
Chong Yidong <cyd@stupidchicken.com>
parents: 68651
diff changeset
2039 && !NILP (base_buffer->filename)
10311
0de21e27722f Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 10145
diff changeset
2040 && SAVE_MODIFF >= MODIFF)
71640
5cdc253a3479 * insdel.c (prepare_to_modify_buffer): For an indirect buffer, do
Chong Yidong <cyd@stupidchicken.com>
parents: 68651
diff changeset
2041 lock_file (base_buffer->file_truename);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2042 #else
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2043 /* At least warn if this file has changed on disk since it was visited. */
71640
5cdc253a3479 * insdel.c (prepare_to_modify_buffer): For an indirect buffer, do
Chong Yidong <cyd@stupidchicken.com>
parents: 68651
diff changeset
2044 if (!NILP (base_buffer->filename)
10311
0de21e27722f Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 10145
diff changeset
2045 && SAVE_MODIFF >= MODIFF
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 251
diff changeset
2046 && NILP (Fverify_visited_file_modtime (Fcurrent_buffer ()))
71640
5cdc253a3479 * insdel.c (prepare_to_modify_buffer): For an indirect buffer, do
Chong Yidong <cyd@stupidchicken.com>
parents: 68651
diff changeset
2047 && !NILP (Ffile_exists_p (base_buffer->filename)))
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2048 call1 (intern ("ask-user-about-supersession-threat"),
71640
5cdc253a3479 * insdel.c (prepare_to_modify_buffer): For an indirect buffer, do
Chong Yidong <cyd@stupidchicken.com>
parents: 68651
diff changeset
2049 base_buffer->filename);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2050 #endif /* not CLASH_DETECTION */
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2051
109678
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109313
diff changeset
2052 /* If `select-active-regions' is non-nil, save the region text. */
109802
acc05fd0631b Let all active regions set the primary selection.
Chong Yidong <cyd@stupidchicken.com>
parents: 109680
diff changeset
2053 if (!NILP (current_buffer->mark_active)
111080
b5615f1dafcc * insdel.c (prepare_to_modify_buffer): Don't set
Chong Yidong <cyd@stupidchicken.com>
parents: 110576
diff changeset
2054 && !inhibit_modification_hooks
110576
54834381dfd9 * src/insdel.c (prepare_to_modify_buffer): Ensure the mark marker is alive
Chong Yidong <cyd@stupidchicken.com>
parents: 110480
diff changeset
2055 && XMARKER (current_buffer->mark)->buffer
109802
acc05fd0631b Let all active regions set the primary selection.
Chong Yidong <cyd@stupidchicken.com>
parents: 109680
diff changeset
2056 && NILP (Vsaved_region_selection)
acc05fd0631b Let all active regions set the primary selection.
Chong Yidong <cyd@stupidchicken.com>
parents: 109680
diff changeset
2057 && (EQ (Vselect_active_regions, Qonly)
acc05fd0631b Let all active regions set the primary selection.
Chong Yidong <cyd@stupidchicken.com>
parents: 109680
diff changeset
2058 ? EQ (CAR_SAFE (Vtransient_mark_mode), Qonly)
acc05fd0631b Let all active regions set the primary selection.
Chong Yidong <cyd@stupidchicken.com>
parents: 109680
diff changeset
2059 : (!NILP (Vselect_active_regions)
acc05fd0631b Let all active regions set the primary selection.
Chong Yidong <cyd@stupidchicken.com>
parents: 109680
diff changeset
2060 && !NILP (Vtransient_mark_mode))))
109678
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109313
diff changeset
2061 {
110576
54834381dfd9 * src/insdel.c (prepare_to_modify_buffer): Ensure the mark marker is alive
Chong Yidong <cyd@stupidchicken.com>
parents: 110480
diff changeset
2062 EMACS_INT b = XMARKER (current_buffer->mark)->charpos;
110480
5290c80fda43 Fix some uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109802
diff changeset
2063 EMACS_INT e = PT;
109680
b6edc1ea12d7 Avoid restrictions when copying window selection.
Chong Yidong <cyd@stupidchicken.com>
parents: 109678
diff changeset
2064 if (b < e)
b6edc1ea12d7 Avoid restrictions when copying window selection.
Chong Yidong <cyd@stupidchicken.com>
parents: 109678
diff changeset
2065 Vsaved_region_selection = make_buffer_string (b, e, 0);
b6edc1ea12d7 Avoid restrictions when copying window selection.
Chong Yidong <cyd@stupidchicken.com>
parents: 109678
diff changeset
2066 else if (b > e)
b6edc1ea12d7 Avoid restrictions when copying window selection.
Chong Yidong <cyd@stupidchicken.com>
parents: 109678
diff changeset
2067 Vsaved_region_selection = make_buffer_string (e, b, 0);
109678
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109313
diff changeset
2068 }
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109313
diff changeset
2069
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2070 signal_before_change (start, end, preserve_ptr);
2050
3ffbf2314074 (prepare_to_modify_buffer): Set Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 2019
diff changeset
2071
9409
f5590c0b1756 * insdel.c (prepare_to_modify_buffer): Invalidate width run and
Jim Blandy <jimb@redhat.com>
parents: 9391
diff changeset
2072 if (current_buffer->newline_cache)
f5590c0b1756 * insdel.c (prepare_to_modify_buffer): Invalidate width run and
Jim Blandy <jimb@redhat.com>
parents: 9391
diff changeset
2073 invalidate_region_cache (current_buffer,
f5590c0b1756 * insdel.c (prepare_to_modify_buffer): Invalidate width run and
Jim Blandy <jimb@redhat.com>
parents: 9391
diff changeset
2074 current_buffer->newline_cache,
f5590c0b1756 * insdel.c (prepare_to_modify_buffer): Invalidate width run and
Jim Blandy <jimb@redhat.com>
parents: 9391
diff changeset
2075 start - BEG, Z - end);
f5590c0b1756 * insdel.c (prepare_to_modify_buffer): Invalidate width run and
Jim Blandy <jimb@redhat.com>
parents: 9391
diff changeset
2076 if (current_buffer->width_run_cache)
f5590c0b1756 * insdel.c (prepare_to_modify_buffer): Invalidate width run and
Jim Blandy <jimb@redhat.com>
parents: 9391
diff changeset
2077 invalidate_region_cache (current_buffer,
f5590c0b1756 * insdel.c (prepare_to_modify_buffer): Invalidate width run and
Jim Blandy <jimb@redhat.com>
parents: 9391
diff changeset
2078 current_buffer->width_run_cache,
f5590c0b1756 * insdel.c (prepare_to_modify_buffer): Invalidate width run and
Jim Blandy <jimb@redhat.com>
parents: 9391
diff changeset
2079 start - BEG, Z - end);
f5590c0b1756 * insdel.c (prepare_to_modify_buffer): Invalidate width run and
Jim Blandy <jimb@redhat.com>
parents: 9391
diff changeset
2080
2050
3ffbf2314074 (prepare_to_modify_buffer): Set Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 2019
diff changeset
2081 Vdeactivate_mark = Qt;
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2082 }
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2083
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2084 /* These macros work with an argument named `preserve_ptr'
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2085 and a local variable named `preserve_marker'. */
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2086
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2087 #define PRESERVE_VALUE \
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2088 if (preserve_ptr && NILP (preserve_marker)) \
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2089 preserve_marker = Fcopy_marker (make_number (*preserve_ptr), Qnil)
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2090
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2091 #define RESTORE_VALUE \
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2092 if (! NILP (preserve_marker)) \
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2093 { \
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2094 *preserve_ptr = marker_position (preserve_marker); \
51671
54f0e48f9f7d (check_markers, adjust_markers_for_delete)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
2095 unchain_marker (XMARKER (preserve_marker)); \
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2096 }
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2097
19331
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2098 #define PRESERVE_START_END \
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2099 if (NILP (start_marker)) \
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2100 start_marker = Fcopy_marker (start, Qnil); \
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2101 if (NILP (end_marker)) \
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2102 end_marker = Fcopy_marker (end, Qnil);
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2103
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2104 #define FETCH_START \
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2105 (! NILP (start_marker) ? Fmarker_position (start_marker) : start)
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2106
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2107 #define FETCH_END \
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2108 (! NILP (end_marker) ? Fmarker_position (end_marker) : end)
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2109
78602
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2110 /* Set a variable to nil if an error occurred.
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2111 Don't change the variable if there was no error.
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2112 VAL is a cons-cell (VARIABLE . NO-ERROR-FLAG).
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2113 VARIABLE is the variable to maybe set to nil.
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2114 NO-ERROR-FLAG is nil if there was an error,
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2115 anything else meaning no error (so this function does nothing). */
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2116 Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108890
diff changeset
2117 reset_var_on_error (Lisp_Object val)
78602
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2118 {
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2119 if (NILP (XCDR (val)))
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2120 Fset (XCAR (val), Qnil);
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2121 return Qnil;
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2122 }
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2123
3591
507f64624555 Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
2124 /* Signal a change to the buffer immediately before it happens.
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2125 START_INT and END_INT are the bounds of the text to be changed.
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2126
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2127 If PRESERVE_PTR is nonzero, we relocate *PRESERVE_PTR
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2128 by holding its value temporarily in a marker. */
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2129
10391
55428c377c84 Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents: 10311
diff changeset
2130 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
2131 signal_before_change (EMACS_INT start_int, EMACS_INT end_int,
102759
ec3ec7f5d54e * editfns.c (general_insert_function): Adjust to insdel.c changes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102753
diff changeset
2132 EMACS_INT *preserve_ptr)
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2133 {
16102
76bd16bb5906 (prepare_to_modify_buffer): Take integer arguments.
Richard M. Stallman <rms@gnu.org>
parents: 15123
diff changeset
2134 Lisp_Object start, end;
19331
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2135 Lisp_Object start_marker, end_marker;
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2136 Lisp_Object preserve_marker;
19331
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2137 struct gcpro gcpro1, gcpro2, gcpro3;
78602
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2138 int count = SPECPDL_INDEX ();
16102
76bd16bb5906 (prepare_to_modify_buffer): Take integer arguments.
Richard M. Stallman <rms@gnu.org>
parents: 15123
diff changeset
2139
23400
8a51c720f8d7 (signal_before_change): If inhibit_modification_hooks
Kenichi Handa <handa@m17n.org>
parents: 23340
diff changeset
2140 if (inhibit_modification_hooks)
8a51c720f8d7 (signal_before_change): If inhibit_modification_hooks
Kenichi Handa <handa@m17n.org>
parents: 23340
diff changeset
2141 return;
8a51c720f8d7 (signal_before_change): If inhibit_modification_hooks
Kenichi Handa <handa@m17n.org>
parents: 23340
diff changeset
2142
16102
76bd16bb5906 (prepare_to_modify_buffer): Take integer arguments.
Richard M. Stallman <rms@gnu.org>
parents: 15123
diff changeset
2143 start = make_number (start_int);
76bd16bb5906 (prepare_to_modify_buffer): Take integer arguments.
Richard M. Stallman <rms@gnu.org>
parents: 15123
diff changeset
2144 end = make_number (end_int);
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2145 preserve_marker = Qnil;
19331
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2146 start_marker = Qnil;
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2147 end_marker = Qnil;
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2148 GCPRO3 (preserve_marker, start_marker, end_marker);
16102
76bd16bb5906 (prepare_to_modify_buffer): Take integer arguments.
Richard M. Stallman <rms@gnu.org>
parents: 15123
diff changeset
2149
78602
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2150 specbind (Qinhibit_modification_hooks, Qt);
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2151
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2152 /* If buffer is unmodified, run a special hook for that case. */
10311
0de21e27722f Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 10145
diff changeset
2153 if (SAVE_MODIFF >= MODIFF
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1289
diff changeset
2154 && !NILP (Vfirst_change_hook)
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1289
diff changeset
2155 && !NILP (Vrun_hooks))
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2156 {
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2157 PRESERVE_VALUE;
19331
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2158 PRESERVE_START_END;
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2159 call1 (Vrun_hooks, Qfirst_change_hook);
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2160 }
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1289
diff changeset
2161
12784
0dea0aa2f32d (signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 12655
diff changeset
2162 /* Now run the before-change-functions if any. */
6787
4fcd24cee757 (before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents: 6739
diff changeset
2163 if (!NILP (Vbefore_change_functions))
4fcd24cee757 (before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents: 6739
diff changeset
2164 {
12784
0dea0aa2f32d (signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 12655
diff changeset
2165 Lisp_Object args[3];
78602
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2166 Lisp_Object rvoe_arg = Fcons (Qbefore_change_functions, Qnil);
6787
4fcd24cee757 (before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents: 6739
diff changeset
2167
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2168 PRESERVE_VALUE;
19331
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2169 PRESERVE_START_END;
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2170
78602
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2171 /* Mark before-change-functions to be reset to nil in case of error. */
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2172 record_unwind_protect (reset_var_on_error, rvoe_arg);
6787
4fcd24cee757 (before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents: 6739
diff changeset
2173
12784
0dea0aa2f32d (signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 12655
diff changeset
2174 /* Actually run the hook functions. */
0dea0aa2f32d (signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 12655
diff changeset
2175 args[0] = Qbefore_change_functions;
19331
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2176 args[1] = FETCH_START;
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2177 args[2] = FETCH_END;
78602
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2178 Frun_hook_with_args (3, args);
12784
0dea0aa2f32d (signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 12655
diff changeset
2179
78602
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2180 /* There was no error: unarm the reset_on_error. */
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2181 XSETCDR (rvoe_arg, Qt);
6787
4fcd24cee757 (before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents: 6739
diff changeset
2182 }
10144
607074ed1c6d (signal_before_change, signal_after_change):
Richard M. Stallman <rms@gnu.org>
parents: 9685
diff changeset
2183
51837
87ec975874ab (signal_before_change, signal_after_change): Use new type for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51671
diff changeset
2184 if (current_buffer->overlays_before || current_buffer->overlays_after)
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2185 {
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2186 PRESERVE_VALUE;
19331
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2187 report_overlay_modification (FETCH_START, FETCH_END, 0,
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2188 FETCH_START, FETCH_END, Qnil);
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2189 }
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2190
19331
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2191 if (! NILP (start_marker))
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2192 free_marker (start_marker);
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2193 if (! NILP (end_marker))
bc4c4e15a135 (signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents: 18830
diff changeset
2194 free_marker (end_marker);
18446
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2195 RESTORE_VALUE;
59d2f2a0a36e (prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents: 17446
diff changeset
2196 UNGCPRO;
78602
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2197
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2198 unbind_to (count, Qnil);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2199 }
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2200
3591
507f64624555 Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents: 2783
diff changeset
2201 /* Signal a change immediately after it happens.
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
2202 CHARPOS is the character position of the start of the changed text.
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2203 LENDEL is the number of characters of the text before the change.
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2204 (Not the whole buffer; just the part that was changed.)
15123
d6106d651a71 (signal_after_change): Correct the arg to report_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 14479
diff changeset
2205 LENINS is the number of characters in that part of the text
d6106d651a71 (signal_after_change): Correct the arg to report_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 14479
diff changeset
2206 after the change. */
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2207
10391
55428c377c84 Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents: 10311
diff changeset
2208 void
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
2209 signal_after_change (EMACS_INT charpos, EMACS_INT lendel, EMACS_INT lenins)
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2210 {
78602
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2211 int count = SPECPDL_INDEX ();
23400
8a51c720f8d7 (signal_before_change): If inhibit_modification_hooks
Kenichi Handa <handa@m17n.org>
parents: 23340
diff changeset
2212 if (inhibit_modification_hooks)
8a51c720f8d7 (signal_before_change): If inhibit_modification_hooks
Kenichi Handa <handa@m17n.org>
parents: 23340
diff changeset
2213 return;
8a51c720f8d7 (signal_before_change): If inhibit_modification_hooks
Kenichi Handa <handa@m17n.org>
parents: 23340
diff changeset
2214
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2215 /* If we are deferring calls to the after-change functions
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2216 and there are no before-change functions,
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2217 just record the args that we were going to use. */
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2218 if (! NILP (Vcombine_after_change_calls)
29379
ad856393dab2 (signal_before_change, signal_after_change): Don't check
Dave Love <fx@gnu.org>
parents: 29065
diff changeset
2219 && NILP (Vbefore_change_functions)
51837
87ec975874ab (signal_before_change, signal_after_change): Use new type for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51671
diff changeset
2220 && !current_buffer->overlays_before
87ec975874ab (signal_before_change, signal_after_change): Use new type for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51671
diff changeset
2221 && !current_buffer->overlays_after)
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2222 {
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2223 Lisp_Object elt;
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2224
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2225 if (!NILP (combine_after_change_list)
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2226 && current_buffer != XBUFFER (combine_after_change_buffer))
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2227 Fcombine_after_change_execute ();
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2228
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
2229 elt = Fcons (make_number (charpos - BEG),
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
2230 Fcons (make_number (Z - (charpos - lendel + lenins)),
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2231 Fcons (make_number (lenins - lendel), Qnil)));
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2232 combine_after_change_list
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2233 = Fcons (elt, combine_after_change_list);
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2234 combine_after_change_buffer = Fcurrent_buffer ();
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2235
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2236 return;
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2237 }
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2238
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48090
diff changeset
2239 if (!NILP (combine_after_change_list))
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2240 Fcombine_after_change_execute ();
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2241
78602
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2242 specbind (Qinhibit_modification_hooks, Qt);
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2243
6787
4fcd24cee757 (before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents: 6739
diff changeset
2244 if (!NILP (Vafter_change_functions))
4fcd24cee757 (before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents: 6739
diff changeset
2245 {
12784
0dea0aa2f32d (signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 12655
diff changeset
2246 Lisp_Object args[4];
78602
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2247 Lisp_Object rvoe_arg = Fcons (Qafter_change_functions, Qnil);
6787
4fcd24cee757 (before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents: 6739
diff changeset
2248
78602
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2249 /* Mark after-change-functions to be reset to nil in case of error. */
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2250 record_unwind_protect (reset_var_on_error, rvoe_arg);
6787
4fcd24cee757 (before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents: 6739
diff changeset
2251
12784
0dea0aa2f32d (signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 12655
diff changeset
2252 /* Actually run the hook functions. */
0dea0aa2f32d (signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 12655
diff changeset
2253 args[0] = Qafter_change_functions;
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
2254 XSETFASTINT (args[1], charpos);
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
2255 XSETFASTINT (args[2], charpos + lenins);
12784
0dea0aa2f32d (signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 12655
diff changeset
2256 XSETFASTINT (args[3], lendel);
78602
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2257 Frun_hook_with_args (4, args);
12784
0dea0aa2f32d (signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 12655
diff changeset
2258
78602
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2259 /* There was no error: unarm the reset_on_error. */
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2260 XSETCDR (rvoe_arg, Qt);
6787
4fcd24cee757 (before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents: 6739
diff changeset
2261 }
10144
607074ed1c6d (signal_before_change, signal_after_change):
Richard M. Stallman <rms@gnu.org>
parents: 9685
diff changeset
2262
51837
87ec975874ab (signal_before_change, signal_after_change): Use new type for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51671
diff changeset
2263 if (current_buffer->overlays_before || current_buffer->overlays_after)
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
2264 report_overlay_modification (make_number (charpos),
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
2265 make_number (charpos + lenins),
10144
607074ed1c6d (signal_before_change, signal_after_change):
Richard M. Stallman <rms@gnu.org>
parents: 9685
diff changeset
2266 1,
20555
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
2267 make_number (charpos),
80a546059cbd (move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents: 19331
diff changeset
2268 make_number (charpos + lenins),
10144
607074ed1c6d (signal_before_change, signal_after_change):
Richard M. Stallman <rms@gnu.org>
parents: 9685
diff changeset
2269 make_number (lendel));
13026
3ff15e408e2c (signal_after_change): Call report_interval_modification.
Richard M. Stallman <rms@gnu.org>
parents: 12997
diff changeset
2270
3ff15e408e2c (signal_after_change): Call report_interval_modification.
Richard M. Stallman <rms@gnu.org>
parents: 12997
diff changeset
2271 /* After an insertion, call the text properties
3ff15e408e2c (signal_after_change): Call report_interval_modification.
Richard M. Stallman <rms@gnu.org>
parents: 12997
diff changeset
2272 insert-behind-hooks or insert-in-front-hooks. */
3ff15e408e2c (signal_after_change): Call report_interval_modification.
Richard M. Stallman <rms@gnu.org>
parents: 12997
diff changeset
2273 if (lendel == 0)
21526
fff9425b9230 (signal_after_change): Fix mixing of Lisp_Object and
Andreas Schwab <schwab@suse.de>
parents: 21514
diff changeset
2274 report_interval_modification (make_number (charpos),
fff9425b9230 (signal_after_change): Fix mixing of Lisp_Object and
Andreas Schwab <schwab@suse.de>
parents: 21514
diff changeset
2275 make_number (charpos + lenins));
78602
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2276
b86e73d7c635 (reset_var_on_error): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78260
diff changeset
2277 unbind_to (count, Qnil);
157
01ad7ec29c98 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2278 }
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2279
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2280 Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108890
diff changeset
2281 Fcombine_after_change_execute_1 (Lisp_Object val)
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2282 {
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2283 Vcombine_after_change_calls = val;
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2284 return val;
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2285 }
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2286
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2287 DEFUN ("combine-after-change-execute", Fcombine_after_change_execute,
41001
a17c8b15ef1b Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 40923
diff changeset
2288 Scombine_after_change_execute, 0, 0, 0,
a17c8b15ef1b Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 40923
diff changeset
2289 doc: /* This function is for use internally in `combine-after-change-calls'. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
2290 (void)
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2291 {
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45818
diff changeset
2292 int count = SPECPDL_INDEX ();
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
2293 EMACS_INT beg, end, change;
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
2294 EMACS_INT begpos, endpos;
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2295 Lisp_Object tail;
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2296
23646
595d8a052b71 (Fcombine_after_change_execute): Return nil, not junk.
Karl Heuer <kwzh@gnu.org>
parents: 23600
diff changeset
2297 if (NILP (combine_after_change_list))
595d8a052b71 (Fcombine_after_change_execute): Return nil, not junk.
Karl Heuer <kwzh@gnu.org>
parents: 23600
diff changeset
2298 return Qnil;
595d8a052b71 (Fcombine_after_change_execute): Return nil, not junk.
Karl Heuer <kwzh@gnu.org>
parents: 23600
diff changeset
2299
76240
f8d6199cdf00 (Fcombine_after_change_execute): Return nil if
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
2300 /* It is rare for combine_after_change_buffer to be invalid, but
f8d6199cdf00 (Fcombine_after_change_execute): Return nil if
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
2301 possible. It can happen when combine-after-change-calls is
f8d6199cdf00 (Fcombine_after_change_execute): Return nil if
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
2302 non-nil, and insertion calls a file handler (e.g. through
f8d6199cdf00 (Fcombine_after_change_execute): Return nil if
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
2303 lock_file) which scribbles into a temp file -- cyd */
f8d6199cdf00 (Fcombine_after_change_execute): Return nil if
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
2304 if (!BUFFERP (combine_after_change_buffer)
f8d6199cdf00 (Fcombine_after_change_execute): Return nil if
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
2305 || NILP (XBUFFER (combine_after_change_buffer)->name))
f8d6199cdf00 (Fcombine_after_change_execute): Return nil if
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
2306 {
f8d6199cdf00 (Fcombine_after_change_execute): Return nil if
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
2307 combine_after_change_list = Qnil;
f8d6199cdf00 (Fcombine_after_change_execute): Return nil if
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
2308 return Qnil;
f8d6199cdf00 (Fcombine_after_change_execute): Return nil if
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
2309 }
f8d6199cdf00 (Fcombine_after_change_execute): Return nil if
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
2310
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2311 record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2312
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2313 Fset_buffer (combine_after_change_buffer);
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2314
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2315 /* # chars unchanged at beginning of buffer. */
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2316 beg = Z - BEG;
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2317 /* # chars unchanged at end of buffer. */
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2318 end = beg;
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2319 /* Total amount of insertion (negative for deletion). */
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2320 change = 0;
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2321
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2322 /* Scan the various individual changes,
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2323 accumulating the range info in BEG, END and CHANGE. */
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2324 for (tail = combine_after_change_list; CONSP (tail);
25662
0a7261c1d487 Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25648
diff changeset
2325 tail = XCDR (tail))
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2326 {
17373
4f931fa4c0be (Fcombine_after_change_execute): Fix Lisp_Object/integer confusion.
Karl Heuer <kwzh@gnu.org>
parents: 17034
diff changeset
2327 Lisp_Object elt;
102753
b6116169967f * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102185
diff changeset
2328 EMACS_INT thisbeg, thisend, thischange;
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2329
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2330 /* Extract the info from the next element. */
25662
0a7261c1d487 Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25648
diff changeset
2331 elt = XCAR (tail);
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2332 if (! CONSP (elt))
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2333 continue;
25662
0a7261c1d487 Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25648
diff changeset
2334 thisbeg = XINT (XCAR (elt));
0a7261c1d487 Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25648
diff changeset
2335
0a7261c1d487 Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25648
diff changeset
2336 elt = XCDR (elt);
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2337 if (! CONSP (elt))
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2338 continue;
25662
0a7261c1d487 Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25648
diff changeset
2339 thisend = XINT (XCAR (elt));
0a7261c1d487 Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25648
diff changeset
2340
0a7261c1d487 Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25648
diff changeset
2341 elt = XCDR (elt);
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2342 if (! CONSP (elt))
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2343 continue;
25662
0a7261c1d487 Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25648
diff changeset
2344 thischange = XINT (XCAR (elt));
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2345
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2346 /* Merge this range into the accumulated range. */
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2347 change += thischange;
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2348 if (thisbeg < beg)
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2349 beg = thisbeg;
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2350 if (thisend < end)
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2351 end = thisend;
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2352 }
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2353
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2354 /* Get the current start and end positions of the range
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2355 that was changed. */
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2356 begpos = BEG + beg;
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2357 endpos = Z - end;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48090
diff changeset
2358
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2359 /* We are about to handle these, so discard them. */
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2360 combine_after_change_list = Qnil;
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2361
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2362 /* Now run the after-change functions for real.
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2363 Turn off the flag that defers them. */
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2364 record_unwind_protect (Fcombine_after_change_execute_1,
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2365 Vcombine_after_change_calls);
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2366 signal_after_change (begpos, endpos - begpos - change, endpos - begpos);
26860
96ecaefd97a0 (copy_text): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26742
diff changeset
2367 update_compositions (begpos, endpos, CHECK_ALL);
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2368
23646
595d8a052b71 (Fcombine_after_change_execute): Return nil, not junk.
Karl Heuer <kwzh@gnu.org>
parents: 23600
diff changeset
2369 return unbind_to (count, Qnil);
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2370 }
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2371
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21323
diff changeset
2372 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108890
diff changeset
2373 syms_of_insdel (void)
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2374 {
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2375 staticpro (&combine_after_change_list);
64616
bd56ec807f9a (syms_of_insdel): staticpro combine_after_change_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 64084
diff changeset
2376 staticpro (&combine_after_change_buffer);
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2377 combine_after_change_list = Qnil;
23646
595d8a052b71 (Fcombine_after_change_execute): Return nil, not junk.
Karl Heuer <kwzh@gnu.org>
parents: 23600
diff changeset
2378 combine_after_change_buffer = Qnil;
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2379
21307
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
2380 DEFVAR_BOOL ("check-markers-debug-flag", &check_markers_debug_flag,
41001
a17c8b15ef1b Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 40923
diff changeset
2381 doc: /* Non-nil means enable debugging checks for invalid marker positions. */);
21307
9ac5045a93ce (check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21274
diff changeset
2382 check_markers_debug_flag = 0;
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2383 DEFVAR_LISP ("combine-after-change-calls", &Vcombine_after_change_calls,
41001
a17c8b15ef1b Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 40923
diff changeset
2384 doc: /* Used internally by the `combine-after-change-calls' macro. */);
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2385 Vcombine_after_change_calls = Qnil;
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2386
25579
5662c18836ae (syms_of_insdel): Define Lisp variable inhibit-modification-hooks.
Richard M. Stallman <rms@gnu.org>
parents: 25509
diff changeset
2387 DEFVAR_BOOL ("inhibit-modification-hooks", &inhibit_modification_hooks,
41001
a17c8b15ef1b Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 40923
diff changeset
2388 doc: /* Non-nil means don't run any of the hooks that respond to buffer changes.
a17c8b15ef1b Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 40923
diff changeset
2389 This affects `before-change-functions' and `after-change-functions',
a17c8b15ef1b Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 40923
diff changeset
2390 as well as hooks attached to text properties and overlays. */);
25579
5662c18836ae (syms_of_insdel): Define Lisp variable inhibit-modification-hooks.
Richard M. Stallman <rms@gnu.org>
parents: 25509
diff changeset
2391 inhibit_modification_hooks = 0;
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
2392 Qinhibit_modification_hooks = intern_c_string ("inhibit-modification-hooks");
39244
796039437953 (Qinhibit_modification_hooks): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37760
diff changeset
2393 staticpro (&Qinhibit_modification_hooks);
25579
5662c18836ae (syms_of_insdel): Define Lisp variable inhibit-modification-hooks.
Richard M. Stallman <rms@gnu.org>
parents: 25509
diff changeset
2394
16547
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2395 defsubr (&Scombine_after_change_execute);
96ae48c20664 (signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents: 16194
diff changeset
2396 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 51837
diff changeset
2397
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 51837
diff changeset
2398 /* arch-tag: 9b34b886-47d7-465e-a234-299af411b23d
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 51837
diff changeset
2399 (do not change this comment) */