Mercurial > emacs
annotate src/insdel.c @ 22557:52a3a023a9be
(rmail-output): Handle directories properly
in suggestions fro the alist.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 23 Jun 1998 15:53:08 +0000 |
parents | 5507c26908af |
children | 8c063663a19d |
rev | line source |
---|---|
157 | 1 /* Buffer insertion/deletion and gap motion for GNU Emacs. |
20708 | 2 Copyright (C) 1985, 86, 93, 94, 95, 97, 1998 Free Software Foundation, Inc. |
157 | 3 |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 it under the terms of the GNU General Public License as published by | |
12244 | 8 the Free Software Foundation; either version 2, or (at your option) |
157 | 9 any later version. |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
19 Boston, MA 02111-1307, USA. */ |
157 | 20 |
21 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4078
diff
changeset
|
22 #include <config.h> |
157 | 23 #include "lisp.h" |
1289
74b26ab86df4
* insdel.c: #include "intervals.h"
Joseph Arceneaux <jla@gnu.org>
parents:
1247
diff
changeset
|
24 #include "intervals.h" |
157 | 25 #include "buffer.h" |
17034 | 26 #include "charset.h" |
157 | 27 #include "window.h" |
2480 | 28 #include "blockinput.h" |
21514 | 29 #include "region-cache.h" |
157 | 30 |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
31 #ifndef NULL |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
32 #define NULL 0 |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
33 #endif |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
34 |
11703
3c5b974e1c10
(make_gap): Make this new error check also check exceeding VALBITS.
Richard M. Stallman <rms@gnu.org>
parents:
11691
diff
changeset
|
35 #define min(x, y) ((x) < (y) ? (x) : (y)) |
3c5b974e1c10
(make_gap): Make this new error check also check exceeding VALBITS.
Richard M. Stallman <rms@gnu.org>
parents:
11691
diff
changeset
|
36 |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
37 static void insert_from_string_1 P_ ((Lisp_Object, int, int, int, int, int, int)); |
9656
e6cb99e4370c
(insert_from_buffer, insert_from_buffer_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
9646
diff
changeset
|
38 static void insert_from_buffer_1 (); |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
39 static void gap_left P_ ((int, int, int)); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
40 static void gap_right P_ ((int, int)); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
41 static void adjust_markers_gap_motion P_ ((int, int, int)); |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
42 static void adjust_markers_for_insert P_ ((int, int, int, int, int, int, int)); |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
43 static void adjust_markers_for_delete P_ ((int, int, int, int)); |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
44 static void adjust_markers_for_record_delete P_ ((int, int, int, int)); |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
45 static void adjust_point P_ ((int, int)); |
6739
6b0dd4aeca67
(insert_1): New function, extracted from insert.
Karl Heuer <kwzh@gnu.org>
parents:
6126
diff
changeset
|
46 |
16547
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
47 Lisp_Object Fcombine_after_change_execute (); |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
48 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
49 /* Non-nil means don't call the after-change-functions right away, |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
50 just record an element in Vcombine_after_change_calls_list. */ |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
51 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
|
52 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
53 /* 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
|
54 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
|
55 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
|
56 once the deferral ends. |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
57 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
58 In each element. |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
59 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
|
60 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
|
61 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
|
62 (negative for a deletion). */ |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
63 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
|
64 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
65 /* 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
|
66 Lisp_Object combine_after_change_buffer; |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
67 |
21307
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
68 /* 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
|
69 |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
70 static int check_markers_debug_flag; |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
71 |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
72 #define CHECK_MARKERS() \ |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
73 if (check_markers_debug_flag) \ |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
74 check_markers (); \ |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
75 else |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
76 |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
77 void |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
78 check_markers () |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
79 { |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
80 register Lisp_Object tail, prev, next; |
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 tail = BUF_MARKERS (current_buffer); |
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 while (XSYMBOL (tail) != XSYMBOL (Qnil)) |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
85 { |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
86 if (XMARKER (tail)->buffer->text != current_buffer->text) |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
87 abort (); |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
88 if (XMARKER (tail)->charpos > Z) |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
89 abort (); |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
90 if (XMARKER (tail)->bytepos > Z_BYTE) |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
91 abort (); |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
92 |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
93 tail = XMARKER (tail)->chain; |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
94 } |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
95 } |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
96 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
97 /* Move gap to position CHARPOS. |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
98 Note that this can quit! */ |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
99 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
100 void |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
101 move_gap (charpos) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
102 int charpos; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
103 { |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
104 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
|
105 } |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
106 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
107 /* Move gap to byte position BYTEPOS, which is also char position CHARPOS. |
157 | 108 Note that this can quit! */ |
109 | |
10391
55428c377c84
Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents:
10311
diff
changeset
|
110 void |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
111 move_gap_both (charpos, bytepos) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
112 int charpos, bytepos; |
157 | 113 { |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
114 if (bytepos < GPT_BYTE) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
115 gap_left (charpos, bytepos, 0); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
116 else if (bytepos > GPT_BYTE) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
117 gap_right (charpos, bytepos); |
157 | 118 } |
119 | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
120 /* 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
|
121 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
|
122 and CHARPOS is the corresponding char position. |
157 | 123 If NEWGAP is nonzero, then don't update beg_unchanged and end_unchanged. */ |
124 | |
7108 | 125 static void |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
126 gap_left (charpos, bytepos, newgap) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
127 register int charpos, bytepos; |
157 | 128 int newgap; |
129 { | |
130 register unsigned char *to, *from; | |
131 register int i; | |
132 int new_s1; | |
133 | |
134 if (!newgap) | |
135 { | |
16194
aef021e2c167
(gap_left, gap_right, modify_region):
Richard M. Stallman <rms@gnu.org>
parents:
16153
diff
changeset
|
136 if (unchanged_modified == MODIFF |
aef021e2c167
(gap_left, gap_right, modify_region):
Richard M. Stallman <rms@gnu.org>
parents:
16153
diff
changeset
|
137 && overlay_unchanged_modified == OVERLAY_MODIFF) |
157 | 138 { |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
139 beg_unchanged = charpos - BEG; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
140 end_unchanged = Z - charpos; |
157 | 141 } |
142 else | |
143 { | |
144 if (Z - GPT < end_unchanged) | |
145 end_unchanged = Z - GPT; | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
146 if (charpos < beg_unchanged) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
147 beg_unchanged = charpos - BEG; |
157 | 148 } |
149 } | |
150 | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
151 i = GPT_BYTE; |
157 | 152 to = GAP_END_ADDR; |
153 from = GPT_ADDR; | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
154 new_s1 = GPT_BYTE; |
157 | 155 |
156 /* Now copy the characters. To move the gap down, | |
157 copy characters up. */ | |
158 | |
159 while (1) | |
160 { | |
161 /* 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
|
162 i = new_s1 - bytepos; |
157 | 163 if (i == 0) |
164 break; | |
165 /* 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
|
166 Change BYTEPOS to be where we have actually moved the gap to. */ |
157 | 167 if (QUITP) |
168 { | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
169 bytepos = new_s1; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
170 charpos = BYTE_TO_CHAR (bytepos); |
157 | 171 break; |
172 } | |
173 /* Move at most 32000 chars before checking again for a quit. */ | |
174 if (i > 32000) | |
175 i = 32000; | |
176 #ifdef GAP_USE_BCOPY | |
177 if (i >= 128 | |
178 /* bcopy is safe if the two areas of memory do not overlap | |
179 or on systems where bcopy is always safe for moving upward. */ | |
180 && (BCOPY_UPWARD_SAFE | |
181 || to - from >= 128)) | |
182 { | |
183 /* If overlap is not safe, avoid it by not moving too many | |
184 characters at once. */ | |
185 if (!BCOPY_UPWARD_SAFE && i > to - from) | |
186 i = to - from; | |
187 new_s1 -= i; | |
188 from -= i, to -= i; | |
189 bcopy (from, to, i); | |
190 } | |
191 else | |
192 #endif | |
193 { | |
194 new_s1 -= i; | |
195 while (--i >= 0) | |
196 *--to = *--from; | |
197 } | |
198 } | |
199 | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
200 /* 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
|
201 BYTEPOS is where the loop above stopped, which may be what was specified |
157 | 202 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
|
203 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
|
204 GPT_BYTE = bytepos; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
205 GPT = charpos; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
206 if (bytepos < charpos) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
207 abort (); |
17034 | 208 if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */ |
157 | 209 QUIT; |
210 } | |
211 | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
212 /* Move the gap to a position greater than than the current GPT. |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
213 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
|
214 and CHARPOS is the corresponding char position. */ |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
215 |
7108 | 216 static void |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
217 gap_right (charpos, bytepos) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
218 register int charpos, bytepos; |
157 | 219 { |
220 register unsigned char *to, *from; | |
221 register int i; | |
222 int new_s1; | |
223 | |
16194
aef021e2c167
(gap_left, gap_right, modify_region):
Richard M. Stallman <rms@gnu.org>
parents:
16153
diff
changeset
|
224 if (unchanged_modified == MODIFF |
aef021e2c167
(gap_left, gap_right, modify_region):
Richard M. Stallman <rms@gnu.org>
parents:
16153
diff
changeset
|
225 && overlay_unchanged_modified == OVERLAY_MODIFF) |
157 | 226 { |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
227 beg_unchanged = charpos - BEG; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
228 end_unchanged = Z - charpos; |
157 | 229 } |
230 else | |
231 { | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
232 if (Z - charpos - 1 < end_unchanged) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
233 end_unchanged = Z - charpos; |
157 | 234 if (GPT - BEG < beg_unchanged) |
235 beg_unchanged = GPT - BEG; | |
236 } | |
237 | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
238 i = GPT_BYTE; |
157 | 239 from = GAP_END_ADDR; |
240 to = GPT_ADDR; | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
241 new_s1 = GPT_BYTE; |
157 | 242 |
243 /* Now copy the characters. To move the gap up, | |
244 copy characters down. */ | |
245 | |
246 while (1) | |
247 { | |
248 /* 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
|
249 i = bytepos - new_s1; |
157 | 250 if (i == 0) |
251 break; | |
252 /* 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
|
253 Change BYTEPOS to be where we have actually moved the gap to. */ |
157 | 254 if (QUITP) |
255 { | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
256 bytepos = new_s1; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
257 charpos = BYTE_TO_CHAR (bytepos); |
157 | 258 break; |
259 } | |
260 /* Move at most 32000 chars before checking again for a quit. */ | |
261 if (i > 32000) | |
262 i = 32000; | |
263 #ifdef GAP_USE_BCOPY | |
264 if (i >= 128 | |
265 /* bcopy is safe if the two areas of memory do not overlap | |
266 or on systems where bcopy is always safe for moving downward. */ | |
267 && (BCOPY_DOWNWARD_SAFE | |
268 || from - to >= 128)) | |
269 { | |
270 /* If overlap is not safe, avoid it by not moving too many | |
271 characters at once. */ | |
272 if (!BCOPY_DOWNWARD_SAFE && i > from - to) | |
273 i = from - to; | |
274 new_s1 += i; | |
275 bcopy (from, to, i); | |
276 from += i, to += i; | |
277 } | |
278 else | |
279 #endif | |
280 { | |
281 new_s1 += i; | |
282 while (--i >= 0) | |
283 *to++ = *from++; | |
284 } | |
285 } | |
286 | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
287 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
|
288 - GAP_SIZE); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
289 GPT = charpos; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
290 GPT_BYTE = bytepos; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
291 if (bytepos < charpos) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
292 abort (); |
17034 | 293 if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */ |
157 | 294 QUIT; |
295 } | |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
296 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
297 /* 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
|
298 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
|
299 |
157 | 300 Also, any markers past the outside of that interval, in the direction |
301 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
|
302 and then adjusted by AMOUNT. |
69fa625812a4
(adjust_markers): When a marker is inside text
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
303 |
69fa625812a4
(adjust_markers): When a marker is inside text
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
304 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
|
305 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
|
306 deletion.) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
307 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
308 The markers' character positions are not altered, |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
309 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
|
310 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
311 int adjust_markers_test; |
157 | 312 |
7108 | 313 static void |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
314 adjust_markers_gap_motion (from, to, amount) |
157 | 315 register int from, to, amount; |
316 { | |
20568
f0bacfbd9d47
(adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
20555
diff
changeset
|
317 /* 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
|
318 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
|
319 #if 0 |
157 | 320 Lisp_Object marker; |
321 register struct Lisp_Marker *m; | |
322 register int mpos; | |
323 | |
10311
0de21e27722f
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
10145
diff
changeset
|
324 marker = BUF_MARKERS (current_buffer); |
157 | 325 |
484 | 326 while (!NILP (marker)) |
157 | 327 { |
328 m = XMARKER (marker); | |
20568
f0bacfbd9d47
(adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
20555
diff
changeset
|
329 mpos = m->bytepos; |
157 | 330 if (amount > 0) |
331 { | |
332 if (mpos > to && mpos < to + amount) | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
333 { |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
334 if (adjust_markers_test) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
335 abort (); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
336 mpos = to + amount; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
337 } |
157 | 338 } |
339 else | |
340 { | |
14479
69fa625812a4
(adjust_markers): When a marker is inside text
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
341 /* 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
|
342 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
|
343 but then this range contains no markers. */ |
157 | 344 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
|
345 { |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
346 if (adjust_markers_test) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
347 abort (); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
348 mpos = from + amount; |
14479
69fa625812a4
(adjust_markers): When a marker is inside text
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
349 } |
157 | 350 } |
351 if (mpos > from && mpos <= to) | |
352 mpos += amount; | |
353 m->bufpos = mpos; | |
354 marker = m->chain; | |
355 } | |
20568
f0bacfbd9d47
(adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
20555
diff
changeset
|
356 #endif |
157 | 357 } |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
358 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
359 /* Adjust all markers for a deletion |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
360 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
|
361 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
|
362 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
363 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
|
364 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
|
365 |
938dc2491820
(adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12798
diff
changeset
|
366 static void |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
367 adjust_markers_for_delete (from, from_byte, to, to_byte) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
368 register int from, from_byte, to, to_byte; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
369 { |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
370 Lisp_Object marker; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
371 register struct Lisp_Marker *m; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
372 register int charpos; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
373 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
374 marker = BUF_MARKERS (current_buffer); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
375 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
376 while (!NILP (marker)) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
377 { |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
378 m = XMARKER (marker); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
379 charpos = m->charpos; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
380 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
381 if (charpos > Z) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
382 abort (); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
383 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
384 /* 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
|
385 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
|
386 if (charpos > to) |
20568
f0bacfbd9d47
(adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
20555
diff
changeset
|
387 { |
f0bacfbd9d47
(adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
20555
diff
changeset
|
388 m->charpos -= to - from; |
f0bacfbd9d47
(adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
20555
diff
changeset
|
389 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
|
390 } |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
391 |
20568
f0bacfbd9d47
(adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
20555
diff
changeset
|
392 /* 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
|
393 else if (charpos > from) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
394 { |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
395 record_marker_adjustment (marker, from - charpos); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
396 m->charpos = from; |
20568
f0bacfbd9d47
(adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
20555
diff
changeset
|
397 m->bytepos = from_byte; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
398 } |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
399 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
400 marker = m->chain; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
401 } |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
402 } |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
403 |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
404 /* Adjust all markers for calling record_delete for combining bytes. |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
405 whose range in bytes is FROM_BYTE to TO_BYTE. |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
406 The range in charpos is FROM to TO. */ |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
407 |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
408 static void |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
409 adjust_markers_for_record_delete (from, from_byte, to, to_byte) |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
410 register int from, from_byte, to, to_byte; |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
411 { |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
412 Lisp_Object marker; |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
413 register struct Lisp_Marker *m; |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
414 register int charpos; |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
415 |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
416 marker = BUF_MARKERS (current_buffer); |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
417 |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
418 while (!NILP (marker)) |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
419 { |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
420 m = XMARKER (marker); |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
421 charpos = m->charpos; |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
422 |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
423 /* If the marker is after the deletion, |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
424 relocate by number of chars / bytes deleted. */ |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
425 if (charpos > to) |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
426 ; |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
427 /* Here's the case where a marker is inside text being deleted. */ |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
428 else if (charpos > from) |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
429 record_marker_adjustment (marker, from - charpos); |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
430 |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
431 marker = m->chain; |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
432 } |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
433 } |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
434 |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
435 /* 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
|
436 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
|
437 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
|
438 |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
439 COMBINED_BEFORE_BYTES is the number of bytes at the start of the insertion |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
440 that combine into one character with the text before the insertion. |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
441 COMBINED_AFTER_BYTES is the number of bytes after the insertion |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
442 that combine into one character with the last inserted bytes. |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
443 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
444 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
|
445 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
|
446 or BEFORE_MARKERS is true. */ |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
447 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
448 static void |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
449 adjust_markers_for_insert (from, from_byte, to, to_byte, |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
450 combined_before_bytes, combined_after_bytes, |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
451 before_markers) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
452 register int from, from_byte, to, to_byte; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
453 int combined_before_bytes, combined_after_bytes, before_markers; |
12997
938dc2491820
(adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12798
diff
changeset
|
454 { |
938dc2491820
(adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12798
diff
changeset
|
455 Lisp_Object marker; |
17034 | 456 int adjusted = 0; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
457 int nchars = to - from; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
458 int nbytes = to_byte - from_byte; |
12997
938dc2491820
(adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12798
diff
changeset
|
459 |
938dc2491820
(adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12798
diff
changeset
|
460 marker = BUF_MARKERS (current_buffer); |
938dc2491820
(adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12798
diff
changeset
|
461 |
938dc2491820
(adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12798
diff
changeset
|
462 while (!NILP (marker)) |
938dc2491820
(adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12798
diff
changeset
|
463 { |
938dc2491820
(adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12798
diff
changeset
|
464 register struct Lisp_Marker *m = XMARKER (marker); |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
465 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
466 /* In a single-byte buffer, a marker's two positions must be equal. |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
467 (If this insertion is going to combine characters, Z will |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
468 become different from Z_BYTE, but they might be the same now. |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
469 If so, the two OLD positions of the marker should be equal.) */ |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
470 if (Z == Z_BYTE) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
471 { |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
472 if (m->charpos != m->bytepos) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
473 abort (); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
474 } |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
475 |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
476 if (m->bytepos == from_byte) |
17034 | 477 { |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
478 if (m->insertion_type || before_markers) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
479 { |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
480 m->bytepos += nbytes + combined_after_bytes; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
481 m->charpos += nchars + !!combined_after_bytes; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
482 /* Point the marker before the combined character, |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
483 so that undoing the insertion puts it back where it was. */ |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
484 if (combined_after_bytes) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
485 DEC_BOTH (m->charpos, m->bytepos); |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
486 if (m->insertion_type) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
487 adjusted = 1; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
488 } |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
489 else if (combined_before_bytes) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
490 { |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
491 /* This marker doesn't "need relocation", |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
492 but don't leave it pointing in the middle of a character. |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
493 Point the marker after the combined character, |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
494 so that undoing the insertion puts it back where it was. */ |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
495 |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
496 /* Here we depend on the fact that the gap is after |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
497 all of the combining bytes that we are going to skip over. */ |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
498 DEC_BOTH (m->charpos, m->bytepos); |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
499 INC_BOTH (m->charpos, m->bytepos); |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
500 } |
17034 | 501 } |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
502 /* If a marker was pointing into the combining bytes |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
503 after the insertion, don't leave it there |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
504 in the middle of a character. */ |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
505 else if (combined_after_bytes && m->bytepos >= from_byte |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
506 && m->bytepos < from_byte + combined_after_bytes) |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
507 { |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
508 /* Put it after the combining bytes. */ |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
509 m->bytepos = to_byte + combined_after_bytes; |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
510 m->charpos = to + 1; |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
511 /* Now move it back before the combined character, |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
512 so that undoing the insertion will put it where it was. */ |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
513 DEC_BOTH (m->charpos, m->bytepos); |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
514 } |
20568
f0bacfbd9d47
(adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
20555
diff
changeset
|
515 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
|
516 { |
f0bacfbd9d47
(adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
20555
diff
changeset
|
517 m->bytepos += nbytes; |
f0bacfbd9d47
(adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
20555
diff
changeset
|
518 m->charpos += nchars; |
f0bacfbd9d47
(adjust_markers_gap_motion): Now a no-op.
Richard M. Stallman <rms@gnu.org>
parents:
20555
diff
changeset
|
519 } |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
520 |
12997
938dc2491820
(adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12798
diff
changeset
|
521 marker = m->chain; |
938dc2491820
(adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12798
diff
changeset
|
522 } |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
523 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
524 /* Adjusting only markers whose insertion-type is t may result in |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
525 disordered overlays in the slot `overlays_before'. */ |
17034 | 526 if (adjusted) |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
527 fix_overlays_before (current_buffer, from, to); |
12997
938dc2491820
(adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12798
diff
changeset
|
528 } |
938dc2491820
(adjust_markers_for_insert): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12798
diff
changeset
|
529 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
530 /* 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
|
531 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
532 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
|
533 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
|
534 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
|
535 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
|
536 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
|
537 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
|
538 intervals. */ |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
539 |
7109 | 540 static void |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
541 adjust_point (nchars, nbytes) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
542 int nchars, nbytes; |
7109 | 543 { |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
544 BUF_PT (current_buffer) += nchars; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
545 BUF_PT_BYTE (current_buffer) += nbytes; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
546 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
547 /* In a single-byte buffer, the two positions must be equal. */ |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
548 if (ZV == ZV_BYTE |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
549 && PT != PT_BYTE) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
550 abort (); |
7109 | 551 } |
157 | 552 |
21323
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
553 /* 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
|
554 length OLD_CHARS (OLD_BYTES) to a new text of length NEW_CHARS |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
555 (NEW_BYTES). |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
556 |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
557 See the comment of adjust_markers_for_insert for the args |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
558 COMBINED_BEFORE_BYTES and COMBINED_AFTER_BYTES. */ |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
559 |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
560 static void |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
561 adjust_markers_for_replace (from, from_byte, old_chars, old_bytes, |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
562 new_chars, new_bytes, |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
563 combined_before_bytes, combined_after_bytes) |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
564 int from, from_byte, old_chars, old_bytes, new_chars, new_bytes; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
565 int combined_before_bytes, combined_after_bytes; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
566 { |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
567 Lisp_Object marker = BUF_MARKERS (current_buffer); |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
568 int prev_to_byte = from_byte + old_bytes; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
569 int diff_chars = new_chars - old_chars; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
570 int diff_bytes = new_bytes - old_bytes; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
571 |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
572 while (!NILP (marker)) |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
573 { |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
574 register struct Lisp_Marker *m = XMARKER (marker); |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
575 |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
576 if (m->bytepos >= prev_to_byte) |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
577 { |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
578 if (m->bytepos < prev_to_byte + combined_after_bytes) |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
579 { |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
580 /* Put it after the combining bytes. */ |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
581 m->bytepos = from_byte + new_bytes; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
582 m->charpos = from + new_chars; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
583 } |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
584 else |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
585 { |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
586 m->charpos += diff_chars; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
587 m->bytepos += diff_bytes; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
588 } |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
589 if (m->charpos == from + new_chars) |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
590 record_marker_adjustment (marker, - old_chars); |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
591 } |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
592 else if (m->bytepos > from_byte) |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
593 { |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
594 record_marker_adjustment (marker, from - m->charpos); |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
595 m->charpos = from; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
596 m->bytepos = from_byte; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
597 } |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
598 else if (m->bytepos == from_byte) |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
599 { |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
600 if (combined_before_bytes) |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
601 { |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
602 DEC_BOTH (m->charpos, m->bytepos); |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
603 INC_BOTH (m->charpos, m->bytepos); |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
604 } |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
605 } |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
606 |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
607 marker = m->chain; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
608 } |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
609 } |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
610 |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
611 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
612 /* Make the gap NBYTES_ADDED bytes longer. */ |
157 | 613 |
10391
55428c377c84
Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents:
10311
diff
changeset
|
614 void |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
615 make_gap (nbytes_added) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
616 int nbytes_added; |
157 | 617 { |
618 unsigned char *result; | |
619 Lisp_Object tem; | |
620 int real_gap_loc; | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
621 int real_gap_loc_byte; |
157 | 622 int old_gap_size; |
623 | |
624 /* 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
|
625 nbytes_added += 2000; |
157 | 626 |
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
|
627 /* Don't allow a buffer size that won't fit in an int |
ca7058c74ef3
(make_gap): Don't allow buffer size that won't fit in int.
Richard M. Stallman <rms@gnu.org>
parents:
11657
diff
changeset
|
628 even if it will fit in a Lisp integer. |
ca7058c74ef3
(make_gap): Don't allow buffer size that won't fit in int.
Richard M. Stallman <rms@gnu.org>
parents:
11657
diff
changeset
|
629 That won't work because so many places use `int'. */ |
ca7058c74ef3
(make_gap): Don't allow buffer size that won't fit in int.
Richard M. Stallman <rms@gnu.org>
parents:
11657
diff
changeset
|
630 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
631 if (Z_BYTE - BEG_BYTE + GAP_SIZE + nbytes_added |
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13026
diff
changeset
|
632 >= ((unsigned) 1 << (min (BITS_PER_INT, VALBITS) - 1))) |
11703
3c5b974e1c10
(make_gap): Make this new error check also check exceeding VALBITS.
Richard M. Stallman <rms@gnu.org>
parents:
11691
diff
changeset
|
633 error ("Buffer exceeds maximum size"); |
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
|
634 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2050
diff
changeset
|
635 BLOCK_INPUT; |
17034 | 636 /* We allocate extra 1-byte `\0' at the tail for anchoring a search. */ |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
637 result = BUFFER_REALLOC (BEG_ADDR, (Z_BYTE - BEG_BYTE |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
638 + GAP_SIZE + nbytes_added + 1)); |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2050
diff
changeset
|
639 |
157 | 640 if (result == 0) |
9391
6061a432881f
(make_gap): Keep input blocked till after we set BEG_ADDR.
Richard M. Stallman <rms@gnu.org>
parents:
9270
diff
changeset
|
641 { |
6061a432881f
(make_gap): Keep input blocked till after we set BEG_ADDR.
Richard M. Stallman <rms@gnu.org>
parents:
9270
diff
changeset
|
642 UNBLOCK_INPUT; |
6061a432881f
(make_gap): Keep input blocked till after we set BEG_ADDR.
Richard M. Stallman <rms@gnu.org>
parents:
9270
diff
changeset
|
643 memory_full (); |
6061a432881f
(make_gap): Keep input blocked till after we set BEG_ADDR.
Richard M. Stallman <rms@gnu.org>
parents:
9270
diff
changeset
|
644 } |
6061a432881f
(make_gap): Keep input blocked till after we set BEG_ADDR.
Richard M. Stallman <rms@gnu.org>
parents:
9270
diff
changeset
|
645 |
6061a432881f
(make_gap): Keep input blocked till after we set BEG_ADDR.
Richard M. Stallman <rms@gnu.org>
parents:
9270
diff
changeset
|
646 /* We can't unblock until the new address is properly stored. */ |
157 | 647 BEG_ADDR = result; |
9391
6061a432881f
(make_gap): Keep input blocked till after we set BEG_ADDR.
Richard M. Stallman <rms@gnu.org>
parents:
9270
diff
changeset
|
648 UNBLOCK_INPUT; |
157 | 649 |
650 /* Prevent quitting in move_gap. */ | |
651 tem = Vinhibit_quit; | |
652 Vinhibit_quit = Qt; | |
653 | |
654 real_gap_loc = GPT; | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
655 real_gap_loc_byte = GPT_BYTE; |
157 | 656 old_gap_size = GAP_SIZE; |
657 | |
658 /* Call the newly allocated space a gap at the end of the whole space. */ | |
659 GPT = Z + GAP_SIZE; | |
20574
928b9aff1e64
(make_gap): Set GPT_BYTE along with GPT.
Richard M. Stallman <rms@gnu.org>
parents:
20568
diff
changeset
|
660 GPT_BYTE = Z_BYTE + GAP_SIZE; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
661 GAP_SIZE = nbytes_added; |
157 | 662 |
663 /* Move the new gap down to be consecutive with the end of the old one. | |
664 This adjusts the markers properly too. */ | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
665 gap_left (real_gap_loc + old_gap_size, real_gap_loc_byte + old_gap_size, 1); |
157 | 666 |
667 /* Now combine the two into one large gap. */ | |
668 GAP_SIZE += old_gap_size; | |
669 GPT = real_gap_loc; | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
670 GPT_BYTE = real_gap_loc_byte; |
157 | 671 |
17034 | 672 /* Put an anchor. */ |
673 *(Z_ADDR) = 0; | |
674 | |
157 | 675 Vinhibit_quit = tem; |
676 } | |
677 | |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
678 /* 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
|
679 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
|
680 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
|
681 If FROM_MULTIBYTE != TO_MULTIBYTE, we convert. |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
682 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
683 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
|
684 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
685 int |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
686 copy_text (from_addr, to_addr, nbytes, |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
687 from_multibyte, to_multibyte) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
688 unsigned char *from_addr; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
689 unsigned char *to_addr; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
690 int nbytes; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
691 int from_multibyte, to_multibyte; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
692 { |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
693 if (from_multibyte == to_multibyte) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
694 { |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
695 bcopy (from_addr, to_addr, nbytes); |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
696 return nbytes; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
697 } |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
698 else if (from_multibyte) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
699 { |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
700 int nchars = 0; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
701 int bytes_left = nbytes; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
702 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
703 /* Convert multibyte to single byte. */ |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
704 while (bytes_left > 0) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
705 { |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
706 int thislen, c; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
707 c = STRING_CHAR_AND_LENGTH (from_addr, bytes_left, thislen); |
20835
f9fafa0336af
(copy_text): When copying from multibyte to unibyte, do
Kenichi Handa <handa@m17n.org>
parents:
20725
diff
changeset
|
708 *to_addr++ = SINGLE_BYTE_CHAR_P (c) ? c : (c & 0177) + 0200; |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
709 from_addr += thislen; |
21676
81bbd2c2724a
(copy_text): Count down bytes_left properly
Richard M. Stallman <rms@gnu.org>
parents:
21526
diff
changeset
|
710 bytes_left -= thislen; |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
711 nchars++; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
712 } |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
713 return nchars; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
714 } |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
715 else |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
716 { |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
717 unsigned char *initial_to_addr = to_addr; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
718 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
719 /* Convert single-byte to multibyte. */ |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
720 while (nbytes > 0) |
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 int c = *from_addr++; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
723 unsigned char workbuf[4], *str; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
724 int len; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
725 |
21037
1290ba9ccec8
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20998
diff
changeset
|
726 if (c >= 0240 && c < 0400) |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
727 { |
21037
1290ba9ccec8
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20998
diff
changeset
|
728 c = unibyte_char_to_multibyte (c); |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
729 len = CHAR_STRING (c, workbuf, str); |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
730 bcopy (str, to_addr, len); |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
731 to_addr += len; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
732 nbytes--; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
733 } |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
734 else |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
735 /* Special case for speed. */ |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
736 *to_addr++ = c, nbytes--; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
737 } |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
738 return to_addr - initial_to_addr; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
739 } |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
740 } |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
741 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
742 /* 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
|
743 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
|
744 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
|
745 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
746 int |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
747 count_size_as_multibyte (ptr, nbytes) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
748 unsigned char *ptr; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
749 int nbytes; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
750 { |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
751 int i; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
752 int outgoing_nbytes = 0; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
753 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
754 for (i = 0; i < nbytes; i++) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
755 { |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
756 unsigned int c = *ptr++; |
21037
1290ba9ccec8
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20998
diff
changeset
|
757 |
1290ba9ccec8
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20998
diff
changeset
|
758 if (c < 0240) |
1290ba9ccec8
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20998
diff
changeset
|
759 outgoing_nbytes++; |
1290ba9ccec8
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20998
diff
changeset
|
760 else |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
761 { |
21037
1290ba9ccec8
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20998
diff
changeset
|
762 c = unibyte_char_to_multibyte (c); |
1290ba9ccec8
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20998
diff
changeset
|
763 outgoing_nbytes += XINT (Fchar_bytes (make_number (c))); |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
764 } |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
765 } |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
766 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
767 return outgoing_nbytes; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
768 } |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
769 |
157 | 770 /* 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
|
771 This function judges multibyteness based on |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
772 enable_multibyte_characters in the current buffer; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
773 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
|
774 |
9656
e6cb99e4370c
(insert_from_buffer, insert_from_buffer_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
9646
diff
changeset
|
775 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
|
776 prepare_to_modify_buffer could relocate the text. */ |
157 | 777 |
10391
55428c377c84
Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents:
10311
diff
changeset
|
778 void |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
779 insert (string, nbytes) |
157 | 780 register unsigned char *string; |
21514 | 781 register int nbytes; |
157 | 782 { |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
783 if (nbytes > 0) |
6739
6b0dd4aeca67
(insert_1): New function, extracted from insert.
Karl Heuer <kwzh@gnu.org>
parents:
6126
diff
changeset
|
784 { |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
785 int opoint = PT; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
786 insert_1 (string, nbytes, 0, 1, 0); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
787 signal_after_change (opoint, 0, PT - opoint); |
6739
6b0dd4aeca67
(insert_1): New function, extracted from insert.
Karl Heuer <kwzh@gnu.org>
parents:
6126
diff
changeset
|
788 } |
6b0dd4aeca67
(insert_1): New function, extracted from insert.
Karl Heuer <kwzh@gnu.org>
parents:
6126
diff
changeset
|
789 } |
157 | 790 |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
791 /* 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
|
792 |
10391
55428c377c84
Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents:
10311
diff
changeset
|
793 void |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
794 insert_and_inherit (string, nbytes) |
6739
6b0dd4aeca67
(insert_1): New function, extracted from insert.
Karl Heuer <kwzh@gnu.org>
parents:
6126
diff
changeset
|
795 register unsigned char *string; |
21514 | 796 register int nbytes; |
6739
6b0dd4aeca67
(insert_1): New function, extracted from insert.
Karl Heuer <kwzh@gnu.org>
parents:
6126
diff
changeset
|
797 { |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
798 if (nbytes > 0) |
9656
e6cb99e4370c
(insert_from_buffer, insert_from_buffer_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
9646
diff
changeset
|
799 { |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
800 int opoint = PT; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
801 insert_1 (string, nbytes, 1, 1, 0); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
802 signal_after_change (opoint, 0, PT - opoint); |
9656
e6cb99e4370c
(insert_from_buffer, insert_from_buffer_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
9646
diff
changeset
|
803 } |
e6cb99e4370c
(insert_from_buffer, insert_from_buffer_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
9646
diff
changeset
|
804 } |
e6cb99e4370c
(insert_from_buffer, insert_from_buffer_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents:
9646
diff
changeset
|
805 |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
806 /* Insert the character C before point. Do not inherit text properties. */ |
157 | 807 |
808 void | |
809 insert_char (c) | |
17034 | 810 int c; |
157 | 811 { |
17034 | 812 unsigned char workbuf[4], *str; |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
813 int len; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
814 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
815 if (! NILP (current_buffer->enable_multibyte_characters)) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
816 len = CHAR_STRING (c, workbuf, str); |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
817 else |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
818 { |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
819 len = 1; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
820 workbuf[0] = c; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
821 str = workbuf; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
822 } |
17034 | 823 |
824 insert (str, len); | |
157 | 825 } |
826 | |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
827 /* Insert the null-terminated string S before point. */ |
157 | 828 |
829 void | |
830 insert_string (s) | |
831 char *s; | |
832 { | |
833 insert (s, strlen (s)); | |
834 } | |
835 | |
836 /* Like `insert' except that all markers pointing at the place where | |
837 the insertion happens are adjusted to point after it. | |
838 Don't use this function to insert part of a Lisp string, | |
839 since gc could happen and relocate it. */ | |
840 | |
10391
55428c377c84
Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents:
10311
diff
changeset
|
841 void |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
842 insert_before_markers (string, nbytes) |
157 | 843 unsigned char *string; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
844 register int nbytes; |
157 | 845 { |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
846 if (nbytes > 0) |
6739
6b0dd4aeca67
(insert_1): New function, extracted from insert.
Karl Heuer <kwzh@gnu.org>
parents:
6126
diff
changeset
|
847 { |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
848 int opoint = PT; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
849 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
850 insert_1 (string, nbytes, 0, 1, 1); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
851 signal_after_change (opoint, 0, PT - opoint); |
6739
6b0dd4aeca67
(insert_1): New function, extracted from insert.
Karl Heuer <kwzh@gnu.org>
parents:
6126
diff
changeset
|
852 } |
157 | 853 } |
854 | |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
855 /* 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
|
856 |
10391
55428c377c84
Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents:
10311
diff
changeset
|
857 void |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
858 insert_before_markers_and_inherit (string, nbytes) |
8668
011660f7aae9
(insert_before_markers_and_inherit): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8647
diff
changeset
|
859 unsigned char *string; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
860 register int nbytes; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
861 { |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
862 if (nbytes > 0) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
863 { |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
864 int opoint = PT; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
865 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
866 insert_1 (string, nbytes, 1, 1, 1); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
867 signal_after_change (opoint, 0, PT - opoint); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
868 } |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
869 } |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
870 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
871 /* Subroutine used by the insert functions above. */ |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
872 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
873 void |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
874 insert_1 (string, nbytes, inherit, prepare, before_markers) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
875 register unsigned char *string; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
876 register int nbytes; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
877 int inherit, prepare, before_markers; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
878 { |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
879 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
|
880 inherit, prepare, before_markers); |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
881 } |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
882 |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
883 /* 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
|
884 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
|
885 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
|
886 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
|
887 |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
888 int |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
889 count_combining_before (string, length, pos, pos_byte) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
890 unsigned char *string; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
891 int length; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
892 int pos, pos_byte; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
893 { |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
894 int opos = pos, opos_byte = pos_byte; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
895 int c; |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
896 unsigned char *p = string; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
897 |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
898 if (NILP (current_buffer->enable_multibyte_characters)) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
899 return 0; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
900 if (length == 0 || CHAR_HEAD_P (*string)) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
901 return 0; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
902 if (pos == BEGV) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
903 return 0; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
904 c = FETCH_BYTE (pos_byte - 1); |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
905 if (ASCII_BYTE_P (c)) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
906 return 0; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
907 DEC_BOTH (pos, pos_byte); |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
908 c = FETCH_BYTE (pos_byte); |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
909 if (! BASE_LEADING_CODE_P (c)) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
910 return 0; |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
911 |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
912 /* We have a combination situation. |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
913 Count the bytes at STRING that will combine. */ |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
914 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
|
915 p++; |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
916 |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
917 return p - string; |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
918 } |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
919 |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
920 /* 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
|
921 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
|
922 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
|
923 which combine in this way. Otherwise, return 0. */ |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
924 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
925 int |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
926 count_combining_after (string, length, pos, pos_byte) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
927 unsigned char *string; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
928 int length; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
929 int pos, pos_byte; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
930 { |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
931 int opos = pos, opos_byte = pos_byte; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
932 int i; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
933 int c; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
934 |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
935 if (NILP (current_buffer->enable_multibyte_characters)) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
936 return 0; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
937 if (length == 0 || ASCII_BYTE_P (string[length - 1])) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
938 return 0; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
939 i = length - 1; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
940 while (i > 0 && ! CHAR_HEAD_P (string[i])) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
941 { |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
942 i--; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
943 } |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
944 if (! BASE_LEADING_CODE_P (string[i])) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
945 return 0; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
946 |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
947 if (pos == ZV) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
948 return 0; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
949 c = FETCH_BYTE (pos_byte); |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
950 if (CHAR_HEAD_P (c)) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
951 return 0; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
952 while (pos_byte < ZV_BYTE) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
953 { |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
954 c = FETCH_BYTE (pos_byte); |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
955 if (CHAR_HEAD_P (c)) |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
956 break; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
957 pos_byte++; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
958 } |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
959 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
960 return pos_byte - opos_byte; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
961 } |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
962 |
21191
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
963 /* Adjust the position TARGET/TARGET_BYTE for the combining of NBYTES |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
964 following the position POS/POS_BYTE to the character preceding POS. |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
965 If TARGET is after POS+NBYTES, we only have to adjust the character |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
966 position TARGET, else, if TARGET is after POS, we have to adjust |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
967 both the character position TARGET and the byte position |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
968 TARGET_BYTE, else we don't have to do any adjustment. */ |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
969 |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
970 #define ADJUST_CHAR_POS(target, target_byte) \ |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
971 do { \ |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
972 if (target > pos + nbytes) \ |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
973 target -= nbytes; \ |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
974 else if (target >= pos) \ |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
975 { \ |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
976 target = pos; \ |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
977 target_byte = pos_byte + nbytes; \ |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
978 } \ |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
979 } while (0) |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
980 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
981 /* Combine NBYTES stray trailing-codes, which were formerly separate |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
982 characters, with the preceding character. These bytes |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
983 are located after position POS / POS_BYTE, and the preceding character |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
984 is located just before that position. */ |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
985 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
986 static void |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
987 combine_bytes (pos, pos_byte, nbytes) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
988 int pos, pos_byte, nbytes; |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
989 { |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
990 /* Adjust all markers. */ |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
991 adjust_markers_for_delete (pos, pos_byte, pos + nbytes, pos_byte); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
992 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
993 adjust_overlays_for_delete (pos, nbytes); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
994 |
21191
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
995 ADJUST_CHAR_POS (BUF_PT (current_buffer), BUF_PT_BYTE (current_buffer)); |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
996 ADJUST_CHAR_POS (GPT, GPT_BYTE); |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
997 ADJUST_CHAR_POS (Z, Z_BYTE); |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
998 ADJUST_CHAR_POS (ZV, ZV_BYTE); |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
999 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1000 if (BUF_INTERVALS (current_buffer) != 0) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1001 /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES. */ |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1002 offset_intervals (current_buffer, pos, - nbytes); |
21307
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
1003 |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
1004 CHECK_MARKERS (); |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1005 } |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1006 |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1007 /* 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
|
1008 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
|
1009 are the same as in insert_1. */ |
157 | 1010 |
10391
55428c377c84
Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents:
10311
diff
changeset
|
1011 void |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1012 insert_1_both (string, nchars, nbytes, inherit, prepare, before_markers) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1013 register unsigned char *string; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1014 register int nchars, nbytes; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1015 int inherit, prepare, before_markers; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1016 { |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1017 register Lisp_Object temp; |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1018 int combined_before_bytes, combined_after_bytes; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1019 |
21054
5d592343630f
(insert_1_both): If enable-multibyte-characters is nil,
Kenichi Handa <handa@m17n.org>
parents:
21037
diff
changeset
|
1020 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
|
1021 nchars = nbytes; |
5d592343630f
(insert_1_both): If enable-multibyte-characters is nil,
Kenichi Handa <handa@m17n.org>
parents:
21037
diff
changeset
|
1022 |
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
|
1023 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
|
1024 /* 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
|
1025 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
|
1026 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
|
1027 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
|
1028 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1029 if (PT != GPT) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1030 move_gap_both (PT, PT_BYTE); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1031 if (GAP_SIZE < nbytes) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1032 make_gap (nbytes - GAP_SIZE); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1033 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1034 combined_before_bytes |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1035 = count_combining_before (string, nbytes, PT, PT_BYTE); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1036 combined_after_bytes |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1037 = count_combining_after (string, nbytes, PT, PT_BYTE); |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1038 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1039 /* Record deletion of the surrounding text that combines with |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1040 the insertion. This, together with recording the insertion, |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1041 will add up to the right stuff in the undo list. |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1042 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1043 But there is no need to actually delete the combining bytes |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1044 from the buffer and reinsert them. */ |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1045 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1046 if (combined_after_bytes) |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1047 { |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1048 Lisp_Object deletion; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1049 deletion = Qnil; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1050 |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1051 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1052 deletion = make_buffer_string_both (PT, PT_BYTE, |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1053 PT + combined_after_bytes, |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1054 PT_BYTE + combined_after_bytes, 1); |
21236
90e90245e679
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21228
diff
changeset
|
1055 |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1056 adjust_markers_for_record_delete (PT, PT_BYTE, |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1057 PT + combined_after_bytes, |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1058 PT_BYTE + combined_after_bytes); |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1059 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1060 record_delete (PT, deletion); |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1061 } |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1062 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1063 if (combined_before_bytes) |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1064 { |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1065 Lisp_Object deletion; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1066 deletion = Qnil; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1067 |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1068 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1069 deletion = make_buffer_string_both (PT - 1, CHAR_TO_BYTE (PT - 1), |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1070 PT, PT_BYTE, 1); |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1071 adjust_markers_for_record_delete (PT - 1, CHAR_TO_BYTE (PT - 1), |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1072 PT, PT_BYTE); |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1073 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1074 record_delete (PT - 1, deletion); |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1075 } |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1076 |
21185
15d4310cb9e7
(insert_1_both, insert_from_string_1, insert_from_buffer_1)
Richard M. Stallman <rms@gnu.org>
parents:
21139
diff
changeset
|
1077 record_insert (PT - !!combined_before_bytes, |
15d4310cb9e7
(insert_1_both, insert_from_string_1, insert_from_buffer_1)
Richard M. Stallman <rms@gnu.org>
parents:
21139
diff
changeset
|
1078 nchars - combined_before_bytes + !!combined_before_bytes); |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1079 MODIFF++; |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1080 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1081 bcopy (string, GPT_ADDR, nbytes); |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1082 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1083 GAP_SIZE -= nbytes; |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1084 /* When we have combining at the end of the insertion, |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1085 this is the character position before the combined character. */ |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1086 GPT += nchars; |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1087 ZV += nchars; |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1088 Z += nchars; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1089 GPT_BYTE += nbytes; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1090 ZV_BYTE += nbytes; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1091 Z_BYTE += nbytes; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1092 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
|
1093 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1094 if (combined_after_bytes) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1095 move_gap_both (GPT + combined_after_bytes, |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1096 GPT_BYTE + combined_after_bytes); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1097 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1098 if (GPT_BYTE < GPT) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1099 abort (); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1100 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1101 adjust_overlays_for_insert (PT, nchars); |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1102 adjust_markers_for_insert (PT, PT_BYTE, |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1103 PT + nchars, PT_BYTE + nbytes, |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1104 combined_before_bytes, combined_after_bytes, |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1105 before_markers); |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1106 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1107 #ifdef USE_TEXT_PROPERTIES |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1108 if (BUF_INTERVALS (current_buffer) != 0) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1109 /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES. */ |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1110 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
|
1111 |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1112 if (!inherit && BUF_INTERVALS (current_buffer) != 0) |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1113 Fset_text_properties (make_number (PT), make_number (PT + nchars), |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1114 Qnil, Qnil); |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1115 #endif |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1116 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1117 { |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1118 int pos = PT, pos_byte = PT_BYTE; |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1119 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1120 adjust_point (nchars + combined_after_bytes, |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1121 nbytes + combined_after_bytes); |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1122 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1123 if (combined_after_bytes) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1124 combine_bytes (pos + nchars, pos_byte + nbytes, combined_after_bytes); |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1125 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1126 if (combined_before_bytes) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1127 combine_bytes (pos, pos_byte, combined_before_bytes); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1128 } |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1129 } |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1130 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1131 /* 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
|
1132 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
|
1133 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
|
1134 copy them into the buffer. |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1135 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1136 It does not work to use `insert' for this, because a GC could happen |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1137 before we bcopy the stuff into the buffer, and relocate the string |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1138 without insert noticing. */ |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1139 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1140 void |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1141 insert_from_string (string, pos, pos_byte, length, length_byte, inherit) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1142 Lisp_Object string; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1143 register int pos, pos_byte, length, length_byte; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1144 int inherit; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1145 { |
21765
747446245094
(insert_from_string, insert_from_string_before_markers):
Richard M. Stallman <rms@gnu.org>
parents:
21676
diff
changeset
|
1146 int opoint = PT; |
747446245094
(insert_from_string, insert_from_string_before_markers):
Richard M. Stallman <rms@gnu.org>
parents:
21676
diff
changeset
|
1147 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
|
1148 inherit, 0); |
747446245094
(insert_from_string, insert_from_string_before_markers):
Richard M. Stallman <rms@gnu.org>
parents:
21676
diff
changeset
|
1149 signal_after_change (opoint, 0, PT - opoint); |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1150 } |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1151 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1152 /* 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
|
1153 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
|
1154 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1155 void |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1156 insert_from_string_before_markers (string, pos, pos_byte, |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1157 length, length_byte, inherit) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1158 Lisp_Object string; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1159 register int pos, pos_byte, length, length_byte; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1160 int inherit; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1161 { |
21765
747446245094
(insert_from_string, insert_from_string_before_markers):
Richard M. Stallman <rms@gnu.org>
parents:
21676
diff
changeset
|
1162 int opoint = PT; |
747446245094
(insert_from_string, insert_from_string_before_markers):
Richard M. Stallman <rms@gnu.org>
parents:
21676
diff
changeset
|
1163 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
|
1164 inherit, 1); |
747446245094
(insert_from_string, insert_from_string_before_markers):
Richard M. Stallman <rms@gnu.org>
parents:
21676
diff
changeset
|
1165 signal_after_change (opoint, 0, PT - opoint); |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1166 } |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1167 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1168 /* Subroutine of the insertion functions above. */ |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1169 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1170 static void |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1171 insert_from_string_1 (string, pos, pos_byte, nchars, nbytes, |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1172 inherit, before_markers) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1173 Lisp_Object string; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1174 register int pos, pos_byte, nchars, nbytes; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1175 int inherit, before_markers; |
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 register Lisp_Object temp; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1178 struct gcpro gcpro1; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1179 int outgoing_nbytes = nbytes; |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1180 int combined_before_bytes, combined_after_bytes; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1181 int adjusted_nchars; |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1182 INTERVAL intervals; |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1183 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1184 /* Make OUTGOING_NBYTES describe the text |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1185 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
|
1186 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1187 if (NILP (current_buffer->enable_multibyte_characters)) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1188 outgoing_nbytes = nchars; |
21246
6c16216d0e69
(insert_from_string_1, replace_range):
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1189 else if (! STRING_MULTIBYTE (string)) |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1190 outgoing_nbytes |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1191 = count_size_as_multibyte (&XSTRING (string)->data[pos_byte], |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1192 nbytes); |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1193 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1194 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
|
1195 /* 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
|
1196 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
|
1197 or make it smaller. */ |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1198 prepare_to_modify_buffer (PT, PT, NULL); |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1199 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1200 if (PT != GPT) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1201 move_gap_both (PT, PT_BYTE); |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1202 if (GAP_SIZE < nbytes) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1203 make_gap (outgoing_nbytes - GAP_SIZE); |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1204 UNGCPRO; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1205 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1206 /* 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
|
1207 between single-byte and multibyte. */ |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1208 copy_text (XSTRING (string)->data + pos_byte, GPT_ADDR, nbytes, |
21246
6c16216d0e69
(insert_from_string_1, replace_range):
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1209 STRING_MULTIBYTE (string), |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1210 ! NILP (current_buffer->enable_multibyte_characters)); |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1211 |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1212 /* 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
|
1213 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
|
1214 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
|
1215 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
|
1216 the text that has been stored by copy_text. */ |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1217 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1218 combined_before_bytes |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1219 = count_combining_before (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE); |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1220 combined_after_bytes |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1221 = count_combining_after (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE); |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1222 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1223 /* Record deletion of the surrounding text that combines with |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1224 the insertion. This, together with recording the insertion, |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1225 will add up to the right stuff in the undo list. |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1226 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1227 But there is no need to actually delete the combining bytes |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1228 from the buffer and reinsert them. */ |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1229 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1230 if (combined_after_bytes) |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1231 { |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1232 Lisp_Object deletion; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1233 deletion = Qnil; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1234 |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1235 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1236 deletion = make_buffer_string_both (PT, PT_BYTE, |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1237 PT + combined_after_bytes, |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1238 PT_BYTE + combined_after_bytes, 1); |
21236
90e90245e679
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21228
diff
changeset
|
1239 |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1240 adjust_markers_for_record_delete (PT, PT_BYTE, |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1241 PT + combined_after_bytes, |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1242 PT_BYTE + combined_after_bytes); |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1243 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1244 record_delete (PT, deletion); |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1245 } |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1246 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1247 if (combined_before_bytes) |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1248 { |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1249 Lisp_Object deletion; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1250 deletion = Qnil; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1251 |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1252 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1253 deletion = make_buffer_string_both (PT - 1, CHAR_TO_BYTE (PT - 1), |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1254 PT, PT_BYTE, 1); |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1255 adjust_markers_for_record_delete (PT - 1, CHAR_TO_BYTE (PT - 1), |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1256 PT, PT_BYTE); |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1257 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1258 record_delete (PT - 1, deletion); |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1259 } |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1260 |
21185
15d4310cb9e7
(insert_1_both, insert_from_string_1, insert_from_buffer_1)
Richard M. Stallman <rms@gnu.org>
parents:
21139
diff
changeset
|
1261 record_insert (PT - !!combined_before_bytes, |
15d4310cb9e7
(insert_1_both, insert_from_string_1, insert_from_buffer_1)
Richard M. Stallman <rms@gnu.org>
parents:
21139
diff
changeset
|
1262 nchars - combined_before_bytes + !!combined_before_bytes); |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1263 MODIFF++; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1264 |
20642
818677afe7bc
(insert_from_string_1): Decrement GAP_SIZE by
Kenichi Handa <handa@m17n.org>
parents:
20608
diff
changeset
|
1265 GAP_SIZE -= outgoing_nbytes; |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1266 GPT += nchars; |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1267 ZV += nchars; |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1268 Z += nchars; |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1269 GPT_BYTE += outgoing_nbytes; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1270 ZV_BYTE += outgoing_nbytes; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1271 Z_BYTE += outgoing_nbytes; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1272 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
|
1273 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1274 if (combined_after_bytes) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1275 move_gap_both (GPT + combined_after_bytes, |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1276 GPT_BYTE + combined_after_bytes); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1277 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1278 if (GPT_BYTE < GPT) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1279 abort (); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1280 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1281 adjust_overlays_for_insert (PT, nchars); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1282 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
|
1283 PT_BYTE + outgoing_nbytes, |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1284 combined_before_bytes, combined_after_bytes, |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1285 before_markers); |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1286 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1287 /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */ |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1288 offset_intervals (current_buffer, PT, nchars); |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1289 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1290 intervals = XSTRING (string)->intervals; |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1291 /* 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
|
1292 not including the combined-before bytes. */ |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21239
diff
changeset
|
1293 if (nbytes < STRING_BYTES (XSTRING (string))) |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1294 intervals = copy_intervals (intervals, pos, nchars); |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1295 |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1296 /* Insert those intervals. */ |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1297 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
|
1298 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
|
1299 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1300 { |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1301 int pos = PT, pos_byte = PT_BYTE; |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1302 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1303 adjust_point (nchars + combined_after_bytes, |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1304 outgoing_nbytes + combined_after_bytes); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1305 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1306 if (combined_after_bytes) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1307 combine_bytes (pos + nchars, pos_byte + outgoing_nbytes, |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1308 combined_after_bytes); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1309 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1310 if (combined_before_bytes) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1311 combine_bytes (pos, pos_byte, combined_before_bytes); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1312 } |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1313 } |
157 | 1314 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1315 /* 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
|
1316 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
|
1317 into the current buffer. |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1318 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1319 It does not work to use `insert' for this, because a malloc could happen |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1320 and relocate BUF's text before the bcopy happens. */ |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1321 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1322 void |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1323 insert_from_buffer (buf, charpos, nchars, inherit) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1324 struct buffer *buf; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1325 int charpos, nchars; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1326 int inherit; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1327 { |
21765
747446245094
(insert_from_string, insert_from_string_before_markers):
Richard M. Stallman <rms@gnu.org>
parents:
21676
diff
changeset
|
1328 int opoint = PT; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1329 |
21765
747446245094
(insert_from_string, insert_from_string_before_markers):
Richard M. Stallman <rms@gnu.org>
parents:
21676
diff
changeset
|
1330 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
|
1331 signal_after_change (opoint, 0, PT - opoint); |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1332 } |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1333 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1334 static void |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1335 insert_from_buffer_1 (buf, from, nchars, inherit) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1336 struct buffer *buf; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1337 int from, nchars; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1338 int inherit; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1339 { |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1340 register Lisp_Object temp; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1341 int chunk; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1342 int from_byte = buf_charpos_to_bytepos (buf, from); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1343 int to_byte = buf_charpos_to_bytepos (buf, from + nchars); |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1344 int incoming_nbytes = to_byte - from_byte; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1345 int outgoing_nbytes = incoming_nbytes; |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1346 int combined_before_bytes, combined_after_bytes; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1347 int adjusted_nchars; |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1348 INTERVAL intervals; |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1349 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1350 /* Make OUTGOING_NBYTES describe the text |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1351 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
|
1352 |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1353 if (NILP (current_buffer->enable_multibyte_characters)) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1354 outgoing_nbytes = nchars; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1355 else if (NILP (buf->enable_multibyte_characters)) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1356 outgoing_nbytes |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1357 = count_size_as_multibyte (BUF_BYTE_ADDRESS (buf, from_byte), |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1358 incoming_nbytes); |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1359 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1360 /* 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
|
1361 XSETINT (temp, outgoing_nbytes + Z); |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1362 if (outgoing_nbytes + Z != XINT (temp)) |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1363 error ("Maximum buffer size exceeded"); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1364 |
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
|
1365 /* 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
|
1366 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
|
1367 or make it smaller. */ |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1368 prepare_to_modify_buffer (PT, PT, NULL); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1369 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1370 if (PT != GPT) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1371 move_gap_both (PT, PT_BYTE); |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1372 if (GAP_SIZE < outgoing_nbytes) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1373 make_gap (outgoing_nbytes - GAP_SIZE); |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1374 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1375 if (from < BUF_GPT (buf)) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1376 { |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1377 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
|
1378 if (chunk > incoming_nbytes) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1379 chunk = incoming_nbytes; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1380 copy_text (BUF_BYTE_ADDRESS (buf, from_byte), |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1381 GPT_ADDR, chunk, |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1382 ! NILP (buf->enable_multibyte_characters), |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1383 ! NILP (current_buffer->enable_multibyte_characters)); |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1384 } |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1385 else |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1386 chunk = 0; |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1387 if (chunk < incoming_nbytes) |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1388 copy_text (BUF_BYTE_ADDRESS (buf, from_byte + chunk), |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1389 GPT_ADDR + chunk, incoming_nbytes - chunk, |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1390 ! NILP (buf->enable_multibyte_characters), |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1391 ! NILP (current_buffer->enable_multibyte_characters)); |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1392 |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1393 /* 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
|
1394 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
|
1395 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
|
1396 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
|
1397 the text that has been stored by copy_text. */ |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1398 combined_before_bytes |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1399 = count_combining_before (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE); |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1400 combined_after_bytes |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1401 = count_combining_after (GPT_ADDR, outgoing_nbytes, |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1402 PT, PT_BYTE); |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1403 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1404 /* Record deletion of the surrounding text that combines with |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1405 the insertion. This, together with recording the insertion, |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1406 will add up to the right stuff in the undo list. |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1407 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1408 But there is no need to actually delete the combining bytes |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1409 from the buffer and reinsert them. */ |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1410 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1411 if (combined_after_bytes) |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1412 { |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1413 Lisp_Object deletion; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1414 deletion = Qnil; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1415 |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1416 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1417 deletion = make_buffer_string_both (PT, PT_BYTE, |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1418 PT + combined_after_bytes, |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1419 PT_BYTE + combined_after_bytes, 1); |
21236
90e90245e679
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21228
diff
changeset
|
1420 |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1421 adjust_markers_for_record_delete (PT, PT_BYTE, |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1422 PT + combined_after_bytes, |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1423 PT_BYTE + combined_after_bytes); |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1424 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1425 record_delete (PT, deletion); |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1426 } |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1427 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1428 if (combined_before_bytes) |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1429 { |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1430 Lisp_Object deletion; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1431 deletion = Qnil; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1432 |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1433 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1434 deletion = make_buffer_string_both (PT - 1, CHAR_TO_BYTE (PT - 1), |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1435 PT, PT_BYTE, 1); |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1436 adjust_markers_for_record_delete (PT - 1, CHAR_TO_BYTE (PT - 1), |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1437 PT, PT_BYTE); |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1438 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1439 record_delete (PT - 1, deletion); |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1440 } |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1441 |
21185
15d4310cb9e7
(insert_1_both, insert_from_string_1, insert_from_buffer_1)
Richard M. Stallman <rms@gnu.org>
parents:
21139
diff
changeset
|
1442 record_insert (PT - !!combined_before_bytes, |
15d4310cb9e7
(insert_1_both, insert_from_string_1, insert_from_buffer_1)
Richard M. Stallman <rms@gnu.org>
parents:
21139
diff
changeset
|
1443 nchars - combined_before_bytes + !!combined_before_bytes); |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1444 MODIFF++; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1445 |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1446 GAP_SIZE -= outgoing_nbytes; |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1447 GPT += nchars; |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1448 ZV += nchars; |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1449 Z += nchars; |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1450 GPT_BYTE += outgoing_nbytes; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1451 ZV_BYTE += outgoing_nbytes; |
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1452 Z_BYTE += outgoing_nbytes; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1453 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
|
1454 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1455 if (combined_after_bytes) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1456 move_gap_both (GPT + combined_after_bytes, |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1457 GPT_BYTE + combined_after_bytes); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1458 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1459 if (GPT_BYTE < GPT) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1460 abort (); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1461 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1462 adjust_overlays_for_insert (PT, nchars); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1463 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
|
1464 PT_BYTE + outgoing_nbytes, |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1465 combined_before_bytes, combined_after_bytes, 0); |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1466 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1467 #ifdef USE_TEXT_PROPERTIES |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1468 if (BUF_INTERVALS (current_buffer) != 0) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1469 offset_intervals (current_buffer, PT, nchars); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1470 #endif |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1471 |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1472 /* 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
|
1473 not including the combined-before bytes. */ |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1474 intervals = BUF_INTERVALS (buf); |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1475 if (outgoing_nbytes < BUF_Z_BYTE (buf) - BUF_BEG_BYTE (buf)) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1476 intervals = copy_intervals (intervals, from, nchars); |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1477 |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1478 /* Insert those intervals. */ |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1479 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
|
1480 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1481 { |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1482 int pos = PT, pos_byte = PT_BYTE; |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1483 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1484 adjust_point (nchars + combined_after_bytes, |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1485 outgoing_nbytes + combined_after_bytes); |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1486 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1487 if (combined_after_bytes) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1488 combine_bytes (pos + nchars, pos_byte + outgoing_nbytes, |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1489 combined_after_bytes); |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1490 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1491 if (combined_before_bytes) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1492 combine_bytes (pos, pos_byte, combined_before_bytes); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1493 } |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1494 } |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1495 |
20937
f77dcb2556c5
(adjust_before_replace): Comment added.
Kenichi Handa <handa@m17n.org>
parents:
20889
diff
changeset
|
1496 /* This function should be called after moving gap to FROM and before |
21037
1290ba9ccec8
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20998
diff
changeset
|
1497 altering text between FROM and TO. This adjusts various position |
1290ba9ccec8
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20998
diff
changeset
|
1498 keepers and markers as if the text is deleted. Don't forget to |
1290ba9ccec8
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20998
diff
changeset
|
1499 call adjust_after_replace after you actually alter the text. */ |
20937
f77dcb2556c5
(adjust_before_replace): Comment added.
Kenichi Handa <handa@m17n.org>
parents:
20889
diff
changeset
|
1500 |
20725
bd592c9c3ef6
(adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents:
20708
diff
changeset
|
1501 void |
bd592c9c3ef6
(adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents:
20708
diff
changeset
|
1502 adjust_before_replace (from, from_byte, to, to_byte) |
bd592c9c3ef6
(adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents:
20708
diff
changeset
|
1503 int from, from_byte, to, to_byte; |
bd592c9c3ef6
(adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents:
20708
diff
changeset
|
1504 { |
21236
90e90245e679
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21228
diff
changeset
|
1505 Lisp_Object deletion; |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1506 |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1507 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1508 deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1); |
21236
90e90245e679
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21228
diff
changeset
|
1509 |
21307
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
1510 CHECK_MARKERS (); |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
1511 |
20725
bd592c9c3ef6
(adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents:
20708
diff
changeset
|
1512 adjust_markers_for_delete (from, from_byte, to, to_byte); |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1513 |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1514 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1515 record_delete (from, deletion); |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1516 |
21139
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1517 adjust_overlays_for_delete (from, to - from); |
20725
bd592c9c3ef6
(adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents:
20708
diff
changeset
|
1518 } |
bd592c9c3ef6
(adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents:
20708
diff
changeset
|
1519 |
21323
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1520 /* 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
|
1521 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
|
1522 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
|
1523 GPT_ADDR. |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1524 |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1525 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
|
1526 |
20725
bd592c9c3ef6
(adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents:
20708
diff
changeset
|
1527 void |
21323
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1528 adjust_after_replace (from, from_byte, prev_text, len, len_byte) |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1529 int from, from_byte, len, len_byte; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1530 Lisp_Object prev_text; |
20725
bd592c9c3ef6
(adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents:
20708
diff
changeset
|
1531 { |
21139
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1532 int combined_before_bytes |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1533 = count_combining_before (GPT_ADDR, len_byte, from, from_byte); |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1534 int combined_after_bytes |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1535 = count_combining_after (GPT_ADDR, len_byte, from, from_byte); |
21323
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1536 int nchars_del = 0, nbytes_del = 0; |
21139
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1537 |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1538 if (combined_after_bytes) |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1539 { |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1540 Lisp_Object deletion; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1541 deletion = Qnil; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1542 |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1543 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1544 deletion = make_buffer_string_both (from, from_byte, |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1545 from + combined_after_bytes, |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1546 from_byte + combined_after_bytes, |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1547 1); |
21236
90e90245e679
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21228
diff
changeset
|
1548 |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1549 adjust_markers_for_record_delete (from, from_byte, |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1550 from + combined_after_bytes, |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1551 from_byte + combined_after_bytes); |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1552 |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1553 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1554 record_delete (from, deletion); |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1555 } |
21139
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1556 |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1557 if (combined_before_bytes) |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1558 { |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1559 Lisp_Object deletion; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1560 deletion = Qnil; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1561 |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1562 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1563 deletion = make_buffer_string_both (from - 1, CHAR_TO_BYTE (from - 1), |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1564 from, from_byte, 1); |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1565 adjust_markers_for_record_delete (from - 1, CHAR_TO_BYTE (from - 1), |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1566 from, from_byte); |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1567 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1568 record_delete (from - 1, deletion); |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1569 } |
21139
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1570 |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1571 /* Update various buffer positions for the new text. */ |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1572 GAP_SIZE -= len_byte; |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1573 ZV += len; Z+= len; |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1574 ZV_BYTE += len_byte; Z_BYTE += len_byte; |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1575 GPT += len; GPT_BYTE += len_byte; |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1576 if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */ |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1577 |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1578 if (combined_after_bytes) |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1579 move_gap_both (GPT + combined_after_bytes, |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1580 GPT_BYTE + combined_after_bytes); |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1581 |
21323
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1582 if (STRINGP (prev_text)) |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1583 { |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1584 nchars_del = XSTRING (prev_text)->size; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1585 nbytes_del = STRING_BYTES (XSTRING (prev_text)); |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1586 } |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1587 adjust_markers_for_replace (from, from_byte, nchars_del, nbytes_del, |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1588 len, len_byte, |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1589 combined_before_bytes, combined_after_bytes); |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1590 if (STRINGP (prev_text)) |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1591 record_delete (from, prev_text); |
21185
15d4310cb9e7
(insert_1_both, insert_from_string_1, insert_from_buffer_1)
Richard M. Stallman <rms@gnu.org>
parents:
21139
diff
changeset
|
1592 record_insert (from - !!combined_before_bytes, |
15d4310cb9e7
(insert_1_both, insert_from_string_1, insert_from_buffer_1)
Richard M. Stallman <rms@gnu.org>
parents:
21139
diff
changeset
|
1593 len - combined_before_bytes + !!combined_before_bytes); |
21323
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1594 |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1595 if (len > nchars_del) |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1596 adjust_overlays_for_insert (from, len - nchars_del); |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1597 else if (len < nchars_del) |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1598 adjust_overlays_for_delete (from, nchars_del - len); |
20725
bd592c9c3ef6
(adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents:
20708
diff
changeset
|
1599 #ifdef USE_TEXT_PROPERTIES |
21139
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1600 if (BUF_INTERVALS (current_buffer) != 0) |
21323
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1601 offset_intervals (current_buffer, from, len - nchars_del); |
20725
bd592c9c3ef6
(adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents:
20708
diff
changeset
|
1602 #endif |
21139
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1603 |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1604 { |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1605 int pos = PT, pos_byte = PT_BYTE; |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1606 |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1607 if (from < PT) |
21323
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1608 adjust_point (len - nchars_del + combined_after_bytes, |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1609 len_byte - nbytes_del + combined_after_bytes); |
21139
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1610 else if (from == PT && combined_before_bytes) |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1611 adjust_point (0, combined_before_bytes); |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1612 |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1613 if (combined_after_bytes) |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1614 combine_bytes (from + len, from_byte + len_byte, combined_after_bytes); |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1615 |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1616 if (combined_before_bytes) |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1617 combine_bytes (from, from_byte, combined_before_bytes); |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1618 } |
48b83e612b06
(adjust_before_replace): Call
Kenichi Handa <handa@m17n.org>
parents:
21137
diff
changeset
|
1619 |
21307
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
1620 CHECK_MARKERS (); |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
1621 |
20725
bd592c9c3ef6
(adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents:
20708
diff
changeset
|
1622 if (len == 0) |
bd592c9c3ef6
(adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents:
20708
diff
changeset
|
1623 evaporate_overlays (from); |
bd592c9c3ef6
(adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents:
20708
diff
changeset
|
1624 MODIFF++; |
bd592c9c3ef6
(adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents:
20708
diff
changeset
|
1625 } |
bd592c9c3ef6
(adjust_before_replace, adjust_after_replace): New
Kenichi Handa <handa@m17n.org>
parents:
20708
diff
changeset
|
1626 |
21323
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1627 /* 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
|
1628 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
|
1629 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
|
1630 - 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
|
1631 |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1632 void |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1633 adjust_after_insert (from, from_byte, to, to_byte, newlen) |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1634 int from, from_byte, to, to_byte, newlen; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1635 { |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1636 int len = to - from, len_byte = to_byte - from_byte; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1637 |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1638 if (GPT != to) |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1639 move_gap_both (to, to_byte); |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1640 GAP_SIZE += len_byte; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1641 GPT -= len; GPT_BYTE -= len_byte; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1642 ZV -= len; ZV_BYTE -= len_byte; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1643 Z -= len; Z_BYTE -= len_byte; |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1644 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
|
1645 } |
6fe4f59fab8c
(adjust_markers_for_replace): New function.
Kenichi Handa <handa@m17n.org>
parents:
21307
diff
changeset
|
1646 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1647 /* 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
|
1648 If PREPARE is nonzero, call prepare_to_modify_buffer. |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1649 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
|
1650 from the surrounding non-deleted text. */ |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1651 |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1652 /* 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
|
1653 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
|
1654 rather than a separate delete and insert. |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1655 That way, undo will also handle markers properly. */ |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1656 |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1657 void |
21239
81154898ac20
(replace_range): New arg NOMARKERS.
Richard M. Stallman <rms@gnu.org>
parents:
21236
diff
changeset
|
1658 replace_range (from, to, new, prepare, inherit, nomarkers) |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1659 Lisp_Object new; |
21239
81154898ac20
(replace_range): New arg NOMARKERS.
Richard M. Stallman <rms@gnu.org>
parents:
21236
diff
changeset
|
1660 int from, to, prepare, inherit, nomarkers; |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1661 { |
20608
a6cca06d5aaf
(count_size_as_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20574
diff
changeset
|
1662 int inschars = XSTRING (new)->size; |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21239
diff
changeset
|
1663 int insbytes = STRING_BYTES (XSTRING (new)); |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1664 int from_byte, to_byte; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1665 int nbytes_del, nchars_del; |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1666 register Lisp_Object temp; |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1667 struct gcpro gcpro1; |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1668 int combined_before_bytes, combined_after_bytes; |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1669 int adjusted_inschars; |
21136
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1670 INTERVAL intervals; |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1671 int outgoing_insbytes = insbytes; |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1672 |
21307
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
1673 CHECK_MARKERS (); |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
1674 |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1675 GCPRO1 (new); |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1676 |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1677 if (prepare) |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1678 { |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1679 int range_length = to - from; |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1680 prepare_to_modify_buffer (from, to, &from); |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1681 to = from + range_length; |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1682 } |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1683 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1684 UNGCPRO; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1685 |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1686 /* Make args be valid */ |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1687 if (from < BEGV) |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1688 from = BEGV; |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1689 if (to > ZV) |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1690 to = ZV; |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1691 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1692 from_byte = CHAR_TO_BYTE (from); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1693 to_byte = CHAR_TO_BYTE (to); |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1694 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1695 nchars_del = to - from; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1696 nbytes_del = to_byte - from_byte; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1697 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1698 if (nbytes_del <= 0 && insbytes == 0) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1699 return; |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1700 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1701 /* Make OUTGOING_INSBYTES describe the text |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1702 as it will be inserted in this buffer. */ |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1703 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1704 if (NILP (current_buffer->enable_multibyte_characters)) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1705 outgoing_insbytes = inschars; |
21246
6c16216d0e69
(insert_from_string_1, replace_range):
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1706 else if (! STRING_MULTIBYTE (new)) |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1707 outgoing_insbytes |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1708 = count_size_as_multibyte (XSTRING (new)->data, insbytes); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1709 |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1710 /* 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
|
1711 XSETINT (temp, Z_BYTE - nbytes_del + insbytes); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1712 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
|
1713 error ("Maximum buffer size exceeded"); |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1714 |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1715 GCPRO1 (new); |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1716 |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1717 /* 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
|
1718 if (from > GPT) |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1719 gap_right (from, from_byte); |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1720 if (to < GPT) |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1721 gap_left (to, to_byte, 0); |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1722 |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1723 { |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1724 Lisp_Object deletion; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1725 deletion = Qnil; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1726 |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1727 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1728 deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1); |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1729 |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1730 if (nomarkers) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1731 /* Relocate all markers pointing into the new, larger gap |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1732 to point at the end of the text before the gap. |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1733 Do this before recording the deletion, |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1734 so that undo handles this after reinserting the text. */ |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1735 adjust_markers_for_delete (from, from_byte, to, to_byte); |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1736 |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1737 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1738 record_delete (from, deletion); |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1739 } |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1740 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1741 GAP_SIZE += nbytes_del; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1742 ZV -= nchars_del; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1743 Z -= nchars_del; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1744 ZV_BYTE -= nbytes_del; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1745 Z_BYTE -= nbytes_del; |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1746 GPT = from; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1747 GPT_BYTE = from_byte; |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1748 *(GPT_ADDR) = 0; /* Put an anchor. */ |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1749 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1750 if (GPT_BYTE < GPT) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1751 abort (); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1752 |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1753 if (GPT - BEG < beg_unchanged) |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1754 beg_unchanged = GPT - BEG; |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1755 if (Z - GPT < end_unchanged) |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1756 end_unchanged = Z - GPT; |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1757 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1758 if (GAP_SIZE < insbytes) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1759 make_gap (insbytes - GAP_SIZE); |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1760 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1761 /* Copy the string text into the buffer, perhaps converting |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1762 between single-byte and multibyte. */ |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1763 copy_text (XSTRING (new)->data, GPT_ADDR, insbytes, |
21246
6c16216d0e69
(insert_from_string_1, replace_range):
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
1764 STRING_MULTIBYTE (new), |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1765 ! NILP (current_buffer->enable_multibyte_characters)); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1766 |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1767 /* 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
|
1768 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
|
1769 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
|
1770 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
|
1771 the text that has been stored by copy_text. */ |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1772 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1773 combined_before_bytes |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1774 = count_combining_before (GPT_ADDR, outgoing_insbytes, PT, PT_BYTE); |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1775 combined_after_bytes |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1776 = count_combining_after (GPT_ADDR, outgoing_insbytes, PT, PT_BYTE); |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1777 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1778 /* Record deletion of the surrounding text that combines with |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1779 the insertion. This, together with recording the insertion, |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1780 will add up to the right stuff in the undo list. |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1781 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1782 But there is no need to actually delete the combining bytes |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1783 from the buffer and reinsert them. */ |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1784 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1785 if (combined_after_bytes) |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1786 { |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1787 Lisp_Object deletion; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1788 deletion = Qnil; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1789 |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1790 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1791 deletion = make_buffer_string_both (PT, PT_BYTE, |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1792 PT + combined_after_bytes, |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1793 PT_BYTE + combined_after_bytes, 1); |
21236
90e90245e679
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21228
diff
changeset
|
1794 |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1795 adjust_markers_for_record_delete (PT, PT_BYTE, |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1796 PT + combined_after_bytes, |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1797 PT_BYTE + combined_after_bytes); |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1798 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1799 record_delete (PT, deletion); |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1800 } |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1801 |
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1802 if (combined_before_bytes) |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1803 { |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1804 Lisp_Object deletion; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1805 deletion = Qnil; |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1806 |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1807 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1808 deletion = make_buffer_string_both (PT - 1, CHAR_TO_BYTE (PT - 1), |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1809 PT, PT_BYTE, 1); |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1810 adjust_markers_for_record_delete (PT - 1, CHAR_TO_BYTE (PT - 1), |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1811 PT, PT_BYTE); |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1812 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
1813 record_delete (PT - 1, deletion); |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
1814 } |
21126
7628e474e89f
(adjust_markers_for_insert):
Richard M. Stallman <rms@gnu.org>
parents:
21054
diff
changeset
|
1815 |
21185
15d4310cb9e7
(insert_1_both, insert_from_string_1, insert_from_buffer_1)
Richard M. Stallman <rms@gnu.org>
parents:
21139
diff
changeset
|
1816 record_insert (PT - !!combined_before_bytes, |
15d4310cb9e7
(insert_1_both, insert_from_string_1, insert_from_buffer_1)
Richard M. Stallman <rms@gnu.org>
parents:
21139
diff
changeset
|
1817 inschars - combined_before_bytes + !!combined_before_bytes); |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1818 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1819 GAP_SIZE -= outgoing_insbytes; |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1820 GPT += inschars; |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1821 ZV += inschars; |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1822 Z += inschars; |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1823 GPT_BYTE += outgoing_insbytes; |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1824 ZV_BYTE += outgoing_insbytes; |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1825 Z_BYTE += outgoing_insbytes; |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1826 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
|
1827 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1828 if (combined_after_bytes) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1829 move_gap_both (GPT + combined_after_bytes, |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1830 GPT_BYTE + combined_after_bytes); |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1831 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1832 if (GPT_BYTE < GPT) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1833 abort (); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1834 |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1835 /* 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
|
1836 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
|
1837 adjust_overlays_for_delete (from, nchars_del); |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1838 adjust_overlays_for_insert (from, inschars); |
21239
81154898ac20
(replace_range): New arg NOMARKERS.
Richard M. Stallman <rms@gnu.org>
parents:
21236
diff
changeset
|
1839 if (nomarkers) |
81154898ac20
(replace_range): New arg NOMARKERS.
Richard M. Stallman <rms@gnu.org>
parents:
21236
diff
changeset
|
1840 adjust_markers_for_insert (from, from_byte, |
81154898ac20
(replace_range): New arg NOMARKERS.
Richard M. Stallman <rms@gnu.org>
parents:
21236
diff
changeset
|
1841 from + inschars, from_byte + outgoing_insbytes, |
81154898ac20
(replace_range): New arg NOMARKERS.
Richard M. Stallman <rms@gnu.org>
parents:
21236
diff
changeset
|
1842 combined_before_bytes, combined_after_bytes, 0); |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1843 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1844 #ifdef USE_TEXT_PROPERTIES |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1845 offset_intervals (current_buffer, PT, 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
|
1846 |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1847 /* 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
|
1848 not including the combined-before bytes. */ |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1849 intervals = XSTRING (new)->intervals; |
be04baf3d970
(adjust_markers_for_insert): Don't leave a marker within
Richard M. Stallman <rms@gnu.org>
parents:
21135
diff
changeset
|
1850 /* Insert those intervals. */ |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1851 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
|
1852 current_buffer, inherit); |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1853 #endif |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1854 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1855 /* Relocate point as if it were a marker. */ |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1856 if (from < PT) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1857 adjust_point ((from + inschars - (PT < to ? PT : to) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1858 + combined_after_bytes), |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1859 (from_byte + outgoing_insbytes |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1860 - (PT_BYTE < to_byte ? PT_BYTE : to_byte) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1861 + combined_after_bytes)); |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1862 |
21135
42badfae3618
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21126
diff
changeset
|
1863 if (combined_after_bytes) |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1864 combine_bytes (from + inschars, from_byte + outgoing_insbytes, |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1865 combined_after_bytes); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1866 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1867 if (combined_before_bytes) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1868 combine_bytes (from, from_byte, combined_before_bytes); |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1869 |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1870 if (outgoing_insbytes == 0) |
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1871 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
|
1872 |
21307
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
1873 CHECK_MARKERS (); |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
1874 |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1875 MODIFF++; |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1876 UNGCPRO; |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1877 |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
1878 signal_after_change (from, nchars_del, PT - from); |
18830
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1879 } |
ac0f5f1912c0
(replace_range): New function.
Richard M. Stallman <rms@gnu.org>
parents:
18446
diff
changeset
|
1880 |
157 | 1881 /* Delete characters in current buffer |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1882 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
|
1883 If TO comes before FROM, we delete nothing. */ |
157 | 1884 |
10391
55428c377c84
Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents:
10311
diff
changeset
|
1885 void |
157 | 1886 del_range (from, to) |
1887 register int from, to; | |
1888 { | |
10391
55428c377c84
Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents:
10311
diff
changeset
|
1889 del_range_1 (from, to, 1); |
6126
47d2f8f84309
(del_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5237
diff
changeset
|
1890 } |
47d2f8f84309
(del_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5237
diff
changeset
|
1891 |
47d2f8f84309
(del_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5237
diff
changeset
|
1892 /* Like del_range; PREPARE says whether to call prepare_to_modify_buffer. */ |
47d2f8f84309
(del_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5237
diff
changeset
|
1893 |
10391
55428c377c84
Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents:
10311
diff
changeset
|
1894 void |
6126
47d2f8f84309
(del_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5237
diff
changeset
|
1895 del_range_1 (from, to, prepare) |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
1896 int from, to, prepare; |
6126
47d2f8f84309
(del_range_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5237
diff
changeset
|
1897 { |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1898 int from_byte, to_byte; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1899 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1900 /* Make args be valid */ |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1901 if (from < BEGV) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1902 from = BEGV; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1903 if (to > ZV) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1904 to = ZV; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1905 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1906 if (to <= from) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1907 return; |
157 | 1908 |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
1909 if (prepare) |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
1910 { |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
1911 int range_length = to - from; |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
1912 prepare_to_modify_buffer (from, to, &from); |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
1913 to = from + range_length; |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
1914 } |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
1915 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1916 from_byte = CHAR_TO_BYTE (from); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1917 to_byte = CHAR_TO_BYTE (to); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1918 |
20998
1e0b48e0e84f
(del_range_2): Reorder args. All callers changed.
Karl Heuer <kwzh@gnu.org>
parents:
20983
diff
changeset
|
1919 del_range_2 (from, from_byte, to, to_byte); |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1920 } |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1921 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1922 /* 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
|
1923 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1924 void |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1925 del_range_byte (from_byte, to_byte, prepare) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1926 int from_byte, to_byte, prepare; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1927 { |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1928 int from, to; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1929 |
157 | 1930 /* Make args be valid */ |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1931 if (from_byte < BEGV_BYTE) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1932 from_byte = BEGV_BYTE; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1933 if (to_byte > ZV_BYTE) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1934 to_byte = ZV_BYTE; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1935 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1936 if (to_byte <= from_byte) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1937 return; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1938 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1939 from = BYTE_TO_CHAR (from_byte); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1940 to = BYTE_TO_CHAR (to_byte); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1941 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1942 if (prepare) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1943 { |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1944 int old_from = from, old_to = Z - to; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1945 int range_length = to - from; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1946 prepare_to_modify_buffer (from, to, &from); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1947 to = from + range_length; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1948 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1949 if (old_from != from) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1950 from_byte = CHAR_TO_BYTE (from); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1951 if (old_to == Z - to) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1952 to_byte = CHAR_TO_BYTE (to); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1953 } |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1954 |
20998
1e0b48e0e84f
(del_range_2): Reorder args. All callers changed.
Karl Heuer <kwzh@gnu.org>
parents:
20983
diff
changeset
|
1955 del_range_2 (from, from_byte, to, to_byte); |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1956 } |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1957 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1958 /* 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
|
1959 and bytepos. */ |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1960 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1961 void |
20983
288cf06bf65c
(del_range_both): Reorder args. All callers changed.
Karl Heuer <kwzh@gnu.org>
parents:
20937
diff
changeset
|
1962 del_range_both (from, from_byte, to, to_byte, prepare) |
288cf06bf65c
(del_range_both): Reorder args. All callers changed.
Karl Heuer <kwzh@gnu.org>
parents:
20937
diff
changeset
|
1963 int from, from_byte, to, to_byte, prepare; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1964 { |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1965 /* Make args be valid */ |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1966 if (from_byte < BEGV_BYTE) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1967 from_byte = BEGV_BYTE; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1968 if (to_byte > ZV_BYTE) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1969 to_byte = ZV_BYTE; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1970 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1971 if (to_byte <= from_byte) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1972 return; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1973 |
157 | 1974 if (from < BEGV) |
1975 from = BEGV; | |
1976 if (to > ZV) | |
1977 to = ZV; | |
1978 | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1979 if (prepare) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1980 { |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1981 int old_from = from, old_to = Z - to; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1982 int range_length = to - from; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1983 prepare_to_modify_buffer (from, to, &from); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1984 to = from + range_length; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1985 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1986 if (old_from != from) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1987 from_byte = CHAR_TO_BYTE (from); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1988 if (old_to == Z - to) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1989 to_byte = CHAR_TO_BYTE (to); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1990 } |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1991 |
20998
1e0b48e0e84f
(del_range_2): Reorder args. All callers changed.
Karl Heuer <kwzh@gnu.org>
parents:
20983
diff
changeset
|
1992 del_range_2 (from, from_byte, to, to_byte); |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1993 } |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1994 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1995 /* 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
|
1996 and byte positions. FROM and TO are character positions, |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1997 while FROM_BYTE and TO_BYTE are byte positions. */ |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1998 |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
1999 void |
20998
1e0b48e0e84f
(del_range_2): Reorder args. All callers changed.
Karl Heuer <kwzh@gnu.org>
parents:
20983
diff
changeset
|
2000 del_range_2 (from, from_byte, to, to_byte) |
1e0b48e0e84f
(del_range_2): Reorder args. All callers changed.
Karl Heuer <kwzh@gnu.org>
parents:
20983
diff
changeset
|
2001 int from, from_byte, to, to_byte; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2002 { |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2003 register int nbytes_del, nchars_del; |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
2004 int combined_after_bytes; |
21236
90e90245e679
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21228
diff
changeset
|
2005 Lisp_Object deletion; |
90e90245e679
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21228
diff
changeset
|
2006 int from_byte_1; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2007 |
21307
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
2008 CHECK_MARKERS (); |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
2009 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2010 nchars_del = to - from; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2011 nbytes_del = to_byte - from_byte; |
157 | 2012 |
2013 /* Make sure the gap is somewhere in or next to what we are deleting. */ | |
2014 if (from > GPT) | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2015 gap_right (from, from_byte); |
157 | 2016 if (to < GPT) |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2017 gap_left (to, to_byte, 0); |
157 | 2018 |
21185
15d4310cb9e7
(insert_1_both, insert_from_string_1, insert_from_buffer_1)
Richard M. Stallman <rms@gnu.org>
parents:
21139
diff
changeset
|
2019 combined_after_bytes |
21191
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
2020 = count_combining_before (BUF_BYTE_ADDRESS (current_buffer, to_byte), |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
2021 ZV_BYTE - to_byte, from, from_byte); |
21236
90e90245e679
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21228
diff
changeset
|
2022 if (combined_after_bytes) |
90e90245e679
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21228
diff
changeset
|
2023 { |
90e90245e679
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21228
diff
changeset
|
2024 from_byte_1 = from_byte; |
90e90245e679
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21228
diff
changeset
|
2025 DEC_POS (from_byte_1); |
90e90245e679
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21228
diff
changeset
|
2026 } |
90e90245e679
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21228
diff
changeset
|
2027 else |
90e90245e679
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21228
diff
changeset
|
2028 from_byte_1 = from_byte; |
90e90245e679
(insert_1_both, insert_from_string_1, insert_from_buffer_1):
Richard M. Stallman <rms@gnu.org>
parents:
21228
diff
changeset
|
2029 |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
2030 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
2031 deletion |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
2032 = make_buffer_string_both (from - !!combined_after_bytes, |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
2033 from_byte_1, |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
2034 to + combined_after_bytes, |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
2035 to_byte + combined_after_bytes, 1); |
21274
4bd1566d9e1e
(del_range_2): Move gap again to a proper place just
Kenichi Handa <handa@m17n.org>
parents:
21246
diff
changeset
|
2036 if (combined_after_bytes) |
4bd1566d9e1e
(del_range_2): Move gap again to a proper place just
Kenichi Handa <handa@m17n.org>
parents:
21246
diff
changeset
|
2037 /* COMBINED_AFTER_BYTES nonzero means that the above code moved |
4bd1566d9e1e
(del_range_2): Move gap again to a proper place just
Kenichi Handa <handa@m17n.org>
parents:
21246
diff
changeset
|
2038 the gap. We must move the gap again to a proper place. */ |
4bd1566d9e1e
(del_range_2): Move gap again to a proper place just
Kenichi Handa <handa@m17n.org>
parents:
21246
diff
changeset
|
2039 move_gap_both (from, from_byte); |
21185
15d4310cb9e7
(insert_1_both, insert_from_string_1, insert_from_buffer_1)
Richard M. Stallman <rms@gnu.org>
parents:
21139
diff
changeset
|
2040 |
14479
69fa625812a4
(adjust_markers): When a marker is inside text
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
2041 /* 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
|
2042 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
|
2043 Do this before recording the deletion, |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2044 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
|
2045 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
|
2046 if (combined_after_bytes) |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2047 { |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2048 /* Adjust markers for the phony deletion |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2049 that we are about to call record_undo for. */ |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2050 |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2051 /* Here we delete the markers that formerly |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2052 pointed at TO ... TO + COMBINED_AFTER_BYTES. |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2053 But because of the call to adjust_markers_for_delete, above, |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2054 they now point at FROM ... FROM + COMBINED_AFTER_BYTES. */ |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2055 adjust_markers_for_record_delete (from, from_byte, |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2056 from + combined_after_bytes, |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2057 from_byte + combined_after_bytes); |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2058 |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2059 adjust_markers_for_record_delete (from - 1, from_byte_1, |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2060 from, from_byte); |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2061 } |
22107
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
2062 if (! EQ (current_buffer->undo_list, Qt)) |
5507c26908af
(insert_1_both, insert_from_string_1, replace_range)
Richard M. Stallman <rms@gnu.org>
parents:
21817
diff
changeset
|
2063 record_delete (from - !!combined_after_bytes, deletion); |
1247
8dce1588f37f
(del_range): Call record_delete before updating point.
Richard M. Stallman <rms@gnu.org>
parents:
484
diff
changeset
|
2064 MODIFF++; |
8dce1588f37f
(del_range): Call record_delete before updating point.
Richard M. Stallman <rms@gnu.org>
parents:
484
diff
changeset
|
2065 |
157 | 2066 /* Relocate point as if it were a marker. */ |
7108 | 2067 if (from < PT) |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2068 adjust_point (from - (PT < to ? PT : to), |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2069 from_byte - (PT_BYTE < to_byte ? PT_BYTE : to_byte)); |
157 | 2070 |
1963
05dd60327cc4
(del_range): Update point before offset_intervals.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
2071 /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */ |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2072 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
|
2073 |
11474
510885be2758
(insert_1): Adjust overlay center after inserting.
Karl Heuer <kwzh@gnu.org>
parents:
11235
diff
changeset
|
2074 /* Adjust the overlay center as needed. This must be done after |
12617 | 2075 adjusting the markers that bound the overlays. */ |
21191
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
2076 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
|
2077 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2078 GAP_SIZE += nbytes_del; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2079 ZV_BYTE -= nbytes_del; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2080 Z_BYTE -= nbytes_del; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2081 ZV -= nchars_del; |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2082 Z -= nchars_del; |
157 | 2083 GPT = from; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2084 GPT_BYTE = from_byte; |
157 | 2085 |
21185
15d4310cb9e7
(insert_1_both, insert_from_string_1, insert_from_buffer_1)
Richard M. Stallman <rms@gnu.org>
parents:
21139
diff
changeset
|
2086 if (combined_after_bytes) |
15d4310cb9e7
(insert_1_both, insert_from_string_1, insert_from_buffer_1)
Richard M. Stallman <rms@gnu.org>
parents:
21139
diff
changeset
|
2087 move_gap_both (GPT + combined_after_bytes, |
15d4310cb9e7
(insert_1_both, insert_from_string_1, insert_from_buffer_1)
Richard M. Stallman <rms@gnu.org>
parents:
21139
diff
changeset
|
2088 GPT_BYTE + combined_after_bytes); |
15d4310cb9e7
(insert_1_both, insert_from_string_1, insert_from_buffer_1)
Richard M. Stallman <rms@gnu.org>
parents:
21139
diff
changeset
|
2089 |
21191
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
2090 *(GPT_ADDR) = 0; /* Put an anchor. */ |
b4e925500a71
(ADJUST_CHAR_POS): New macro.
Kenichi Handa <handa@m17n.org>
parents:
21185
diff
changeset
|
2091 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2092 if (GPT_BYTE < GPT) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2093 abort (); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2094 |
157 | 2095 if (GPT - BEG < beg_unchanged) |
2096 beg_unchanged = GPT - BEG; | |
2097 if (Z - GPT < end_unchanged) | |
2098 end_unchanged = Z - GPT; | |
2099 | |
21185
15d4310cb9e7
(insert_1_both, insert_from_string_1, insert_from_buffer_1)
Richard M. Stallman <rms@gnu.org>
parents:
21139
diff
changeset
|
2100 if (combined_after_bytes) |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2101 { |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2102 combine_bytes (from, from_byte, combined_after_bytes); |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
2103 |
21228
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2104 record_insert (GPT - 1, 1); |
31a2889105f0
(del_range_2): Use adjust_markers_for_record_delete.
Richard M. Stallman <rms@gnu.org>
parents:
21191
diff
changeset
|
2105 } |
21137
f4df45f5a0e2
(combine_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21136
diff
changeset
|
2106 |
21307
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
2107 CHECK_MARKERS (); |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
2108 |
8840
7242936baf4e
(del_range_1): Call evaporate_overlays after deleting text.
Karl Heuer <kwzh@gnu.org>
parents:
8687
diff
changeset
|
2109 evaporate_overlays (from); |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2110 signal_after_change (from, nchars_del, 0); |
157 | 2111 } |
2112 | |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2113 /* 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
|
2114 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
|
2115 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
|
2116 and warns the next redisplay that it should pay attention to that |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2117 area. */ |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2118 |
10391
55428c377c84
Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents:
10311
diff
changeset
|
2119 void |
2783
789c11177579
The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents:
2480
diff
changeset
|
2120 modify_region (buffer, start, end) |
789c11177579
The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents:
2480
diff
changeset
|
2121 struct buffer *buffer; |
157 | 2122 int start, end; |
2123 { | |
2783
789c11177579
The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents:
2480
diff
changeset
|
2124 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
|
2125 |
789c11177579
The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents:
2480
diff
changeset
|
2126 if (buffer != old_buffer) |
789c11177579
The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents:
2480
diff
changeset
|
2127 set_buffer_internal (buffer); |
789c11177579
The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents:
2480
diff
changeset
|
2128 |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2129 prepare_to_modify_buffer (start, end, NULL); |
157 | 2130 |
16194
aef021e2c167
(gap_left, gap_right, modify_region):
Richard M. Stallman <rms@gnu.org>
parents:
16153
diff
changeset
|
2131 if (start - 1 < beg_unchanged |
aef021e2c167
(gap_left, gap_right, modify_region):
Richard M. Stallman <rms@gnu.org>
parents:
16153
diff
changeset
|
2132 || (unchanged_modified == MODIFF |
aef021e2c167
(gap_left, gap_right, modify_region):
Richard M. Stallman <rms@gnu.org>
parents:
16153
diff
changeset
|
2133 && overlay_unchanged_modified == OVERLAY_MODIFF)) |
157 | 2134 beg_unchanged = start - 1; |
2135 if (Z - end < end_unchanged | |
16194
aef021e2c167
(gap_left, gap_right, modify_region):
Richard M. Stallman <rms@gnu.org>
parents:
16153
diff
changeset
|
2136 || (unchanged_modified == MODIFF |
aef021e2c167
(gap_left, gap_right, modify_region):
Richard M. Stallman <rms@gnu.org>
parents:
16153
diff
changeset
|
2137 && overlay_unchanged_modified == OVERLAY_MODIFF)) |
157 | 2138 end_unchanged = Z - end; |
5237
378540cf056f
(del_range): Second argument in call to
Richard M. Stallman <rms@gnu.org>
parents:
5168
diff
changeset
|
2139 |
10311
0de21e27722f
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
10145
diff
changeset
|
2140 if (MODIFF <= SAVE_MODIFF) |
5237
378540cf056f
(del_range): Second argument in call to
Richard M. Stallman <rms@gnu.org>
parents:
5168
diff
changeset
|
2141 record_first_change (); |
157 | 2142 MODIFF++; |
2783
789c11177579
The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents:
2480
diff
changeset
|
2143 |
10564
69cae342dde5
(modify_region): Clear point_before_scroll field.
Richard M. Stallman <rms@gnu.org>
parents:
10391
diff
changeset
|
2144 buffer->point_before_scroll = Qnil; |
69cae342dde5
(modify_region): Clear point_before_scroll field.
Richard M. Stallman <rms@gnu.org>
parents:
10391
diff
changeset
|
2145 |
2783
789c11177579
The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents:
2480
diff
changeset
|
2146 if (buffer != old_buffer) |
789c11177579
The text property routines can now modify buffers other
Jim Blandy <jimb@redhat.com>
parents:
2480
diff
changeset
|
2147 set_buffer_internal (old_buffer); |
157 | 2148 } |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2149 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2150 /* 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
|
2151 which are char positions. |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2152 |
1289
74b26ab86df4
* insdel.c: #include "intervals.h"
Joseph Arceneaux <jla@gnu.org>
parents:
1247
diff
changeset
|
2153 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
|
2154 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
|
2155 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
|
2156 |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2157 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
|
2158 by holding its value temporarily in a marker. */ |
157 | 2159 |
10391
55428c377c84
Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents:
10311
diff
changeset
|
2160 void |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2161 prepare_to_modify_buffer (start, end, preserve_ptr) |
16102
76bd16bb5906
(prepare_to_modify_buffer): Take integer arguments.
Richard M. Stallman <rms@gnu.org>
parents:
15123
diff
changeset
|
2162 int start, end; |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2163 int *preserve_ptr; |
157 | 2164 { |
484 | 2165 if (!NILP (current_buffer->read_only)) |
157 | 2166 Fbarf_if_buffer_read_only (); |
2167 | |
1289
74b26ab86df4
* insdel.c: #include "intervals.h"
Joseph Arceneaux <jla@gnu.org>
parents:
1247
diff
changeset
|
2168 /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */ |
10311
0de21e27722f
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
10145
diff
changeset
|
2169 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
|
2170 { |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2171 if (preserve_ptr) |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2172 { |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2173 Lisp_Object preserve_marker; |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2174 struct gcpro gcpro1; |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2175 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
|
2176 GCPRO1 (preserve_marker); |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2177 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
|
2178 *preserve_ptr = marker_position (preserve_marker); |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2179 unchain_marker (preserve_marker); |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2180 UNGCPRO; |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2181 } |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2182 else |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2183 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
|
2184 } |
157 | 2185 |
2186 #ifdef CLASH_DETECTION | |
11657
ab5f12280452
(prepare_to_modify_buffer): Use file_truename for locking.
Richard M. Stallman <rms@gnu.org>
parents:
11474
diff
changeset
|
2187 if (!NILP (current_buffer->file_truename) |
12621
e71c530e5ae5
(prepare_to_modify_buffer): Don't lock the file
Richard M. Stallman <rms@gnu.org>
parents:
12617
diff
changeset
|
2188 /* Make binding buffer-file-name to nil effective. */ |
e71c530e5ae5
(prepare_to_modify_buffer): Don't lock the file
Richard M. Stallman <rms@gnu.org>
parents:
12617
diff
changeset
|
2189 && !NILP (current_buffer->filename) |
10311
0de21e27722f
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
10145
diff
changeset
|
2190 && SAVE_MODIFF >= MODIFF) |
11657
ab5f12280452
(prepare_to_modify_buffer): Use file_truename for locking.
Richard M. Stallman <rms@gnu.org>
parents:
11474
diff
changeset
|
2191 lock_file (current_buffer->file_truename); |
157 | 2192 #else |
2193 /* At least warn if this file has changed on disk since it was visited. */ | |
484 | 2194 if (!NILP (current_buffer->filename) |
10311
0de21e27722f
Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents:
10145
diff
changeset
|
2195 && SAVE_MODIFF >= MODIFF |
484 | 2196 && NILP (Fverify_visited_file_modtime (Fcurrent_buffer ())) |
2197 && !NILP (Ffile_exists_p (current_buffer->filename))) | |
157 | 2198 call1 (intern ("ask-user-about-supersession-threat"), |
2199 current_buffer->filename); | |
2200 #endif /* not CLASH_DETECTION */ | |
2201 | |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2202 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
|
2203 |
9409
f5590c0b1756
* insdel.c (prepare_to_modify_buffer): Invalidate width run and
Jim Blandy <jimb@redhat.com>
parents:
9391
diff
changeset
|
2204 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
|
2205 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
|
2206 current_buffer->newline_cache, |
f5590c0b1756
* insdel.c (prepare_to_modify_buffer): Invalidate width run and
Jim Blandy <jimb@redhat.com>
parents:
9391
diff
changeset
|
2207 start - BEG, Z - end); |
f5590c0b1756
* insdel.c (prepare_to_modify_buffer): Invalidate width run and
Jim Blandy <jimb@redhat.com>
parents:
9391
diff
changeset
|
2208 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
|
2209 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
|
2210 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
|
2211 start - BEG, Z - end); |
f5590c0b1756
* insdel.c (prepare_to_modify_buffer): Invalidate width run and
Jim Blandy <jimb@redhat.com>
parents:
9391
diff
changeset
|
2212 |
2050
3ffbf2314074
(prepare_to_modify_buffer): Set Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents:
2019
diff
changeset
|
2213 Vdeactivate_mark = Qt; |
157 | 2214 } |
2215 | |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2216 /* 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
|
2217 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
|
2218 |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2219 #define PRESERVE_VALUE \ |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2220 if (preserve_ptr && NILP (preserve_marker)) \ |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2221 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
|
2222 |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2223 #define RESTORE_VALUE \ |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2224 if (! NILP (preserve_marker)) \ |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2225 { \ |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2226 *preserve_ptr = marker_position (preserve_marker); \ |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2227 unchain_marker (preserve_marker); \ |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2228 } |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2229 |
19331
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2230 #define PRESERVE_START_END \ |
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2231 if (NILP (start_marker)) \ |
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2232 start_marker = Fcopy_marker (start, Qnil); \ |
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2233 if (NILP (end_marker)) \ |
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2234 end_marker = Fcopy_marker (end, Qnil); |
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2235 |
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2236 #define FETCH_START \ |
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2237 (! 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
|
2238 |
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2239 #define FETCH_END \ |
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2240 (! 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
|
2241 |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
2242 /* 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
|
2243 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
|
2244 |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2245 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
|
2246 by holding its value temporarily in a marker. */ |
157 | 2247 |
10391
55428c377c84
Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents:
10311
diff
changeset
|
2248 void |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2249 signal_before_change (start_int, end_int, preserve_ptr) |
16153
6c9c298680da
(signal_before_change): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
16102
diff
changeset
|
2250 int start_int, end_int; |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2251 int *preserve_ptr; |
157 | 2252 { |
16102
76bd16bb5906
(prepare_to_modify_buffer): Take integer arguments.
Richard M. Stallman <rms@gnu.org>
parents:
15123
diff
changeset
|
2253 Lisp_Object start, end; |
19331
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2254 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
|
2255 Lisp_Object preserve_marker; |
19331
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2256 struct gcpro gcpro1, gcpro2, gcpro3; |
16102
76bd16bb5906
(prepare_to_modify_buffer): Take integer arguments.
Richard M. Stallman <rms@gnu.org>
parents:
15123
diff
changeset
|
2257 |
76bd16bb5906
(prepare_to_modify_buffer): Take integer arguments.
Richard M. Stallman <rms@gnu.org>
parents:
15123
diff
changeset
|
2258 start = make_number (start_int); |
76bd16bb5906
(prepare_to_modify_buffer): Take integer arguments.
Richard M. Stallman <rms@gnu.org>
parents:
15123
diff
changeset
|
2259 end = make_number (end_int); |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2260 preserve_marker = Qnil; |
19331
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2261 start_marker = Qnil; |
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2262 end_marker = Qnil; |
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2263 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
|
2264 |
157 | 2265 /* 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
|
2266 if (SAVE_MODIFF >= MODIFF |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1289
diff
changeset
|
2267 && !NILP (Vfirst_change_hook) |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1289
diff
changeset
|
2268 && !NILP (Vrun_hooks)) |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2269 { |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2270 PRESERVE_VALUE; |
19331
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2271 PRESERVE_START_END; |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2272 call1 (Vrun_hooks, Qfirst_change_hook); |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2273 } |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1289
diff
changeset
|
2274 |
12784
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2275 /* Run the before-change-function if any. |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2276 We don't bother "binding" this variable to nil |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2277 because it is obsolete anyway and new code should not use it. */ |
484 | 2278 if (!NILP (Vbefore_change_function)) |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2279 { |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2280 PRESERVE_VALUE; |
19331
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2281 PRESERVE_START_END; |
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2282 call2 (Vbefore_change_function, FETCH_START, FETCH_END); |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2283 } |
6787
4fcd24cee757
(before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents:
6739
diff
changeset
|
2284 |
12784
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2285 /* Now run the before-change-functions if any. */ |
6787
4fcd24cee757
(before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents:
6739
diff
changeset
|
2286 if (!NILP (Vbefore_change_functions)) |
4fcd24cee757
(before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents:
6739
diff
changeset
|
2287 { |
12784
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2288 Lisp_Object args[3]; |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2289 Lisp_Object before_change_functions; |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2290 Lisp_Object after_change_functions; |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2291 struct gcpro gcpro1, gcpro2; |
6787
4fcd24cee757
(before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents:
6739
diff
changeset
|
2292 |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2293 PRESERVE_VALUE; |
19331
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2294 PRESERVE_START_END; |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2295 |
12784
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2296 /* "Bind" before-change-functions and after-change-functions |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2297 to nil--but in a way that errors don't know about. |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2298 That way, if there's an error in them, they will stay nil. */ |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2299 before_change_functions = Vbefore_change_functions; |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2300 after_change_functions = Vafter_change_functions; |
12798
9ac61661054b
(signal_before_change, signal_after_change): Fix
Karl Heuer <kwzh@gnu.org>
parents:
12784
diff
changeset
|
2301 Vbefore_change_functions = Qnil; |
9ac61661054b
(signal_before_change, signal_after_change): Fix
Karl Heuer <kwzh@gnu.org>
parents:
12784
diff
changeset
|
2302 Vafter_change_functions = Qnil; |
12784
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2303 GCPRO2 (before_change_functions, after_change_functions); |
6787
4fcd24cee757
(before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents:
6739
diff
changeset
|
2304 |
12784
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2305 /* Actually run the hook functions. */ |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2306 args[0] = Qbefore_change_functions; |
19331
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2307 args[1] = FETCH_START; |
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2308 args[2] = FETCH_END; |
12784
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2309 run_hook_list_with_args (before_change_functions, 3, args); |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2310 |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2311 /* "Unbind" the variables we "bound" to nil. */ |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2312 Vbefore_change_functions = before_change_functions; |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2313 Vafter_change_functions = after_change_functions; |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2314 UNGCPRO; |
6787
4fcd24cee757
(before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents:
6739
diff
changeset
|
2315 } |
10144
607074ed1c6d
(signal_before_change, signal_after_change):
Richard M. Stallman <rms@gnu.org>
parents:
9685
diff
changeset
|
2316 |
607074ed1c6d
(signal_before_change, signal_after_change):
Richard M. Stallman <rms@gnu.org>
parents:
9685
diff
changeset
|
2317 if (!NILP (current_buffer->overlays_before) |
607074ed1c6d
(signal_before_change, signal_after_change):
Richard M. Stallman <rms@gnu.org>
parents:
9685
diff
changeset
|
2318 || !NILP (current_buffer->overlays_after)) |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2319 { |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2320 PRESERVE_VALUE; |
19331
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2321 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
|
2322 FETCH_START, FETCH_END, Qnil); |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2323 } |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2324 |
19331
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2325 if (! NILP (start_marker)) |
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2326 free_marker (start_marker); |
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2327 if (! NILP (end_marker)) |
bc4c4e15a135
(signal_before_change): Relocate START and END
Richard M. Stallman <rms@gnu.org>
parents:
18830
diff
changeset
|
2328 free_marker (end_marker); |
18446
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2329 RESTORE_VALUE; |
59d2f2a0a36e
(prepare_to_modify_buffer, signal_before_change):
Richard M. Stallman <rms@gnu.org>
parents:
17446
diff
changeset
|
2330 UNGCPRO; |
157 | 2331 } |
2332 | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
2783
diff
changeset
|
2333 /* 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
|
2334 CHARPOS is the character position of the start of the changed text. |
157 | 2335 LENDEL is the number of characters of the text before the change. |
2336 (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
|
2337 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
|
2338 after the change. */ |
157 | 2339 |
10391
55428c377c84
Declare all non-returning functions `void'.
Karl Heuer <kwzh@gnu.org>
parents:
10311
diff
changeset
|
2340 void |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2341 signal_after_change (charpos, lendel, lenins) |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2342 int charpos, lendel, lenins; |
157 | 2343 { |
16547
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2344 /* 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
|
2345 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
|
2346 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
|
2347 if (! NILP (Vcombine_after_change_calls) |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2348 && NILP (Vbefore_change_function) && NILP (Vbefore_change_functions) |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2349 && NILP (current_buffer->overlays_before) |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2350 && NILP (current_buffer->overlays_after)) |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2351 { |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2352 Lisp_Object elt; |
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 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
|
2355 && 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
|
2356 Fcombine_after_change_execute (); |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2357 |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2358 elt = Fcons (make_number (charpos - BEG), |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2359 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
|
2360 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
|
2361 combine_after_change_list |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2362 = 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
|
2363 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
|
2364 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2365 return; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2366 } |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2367 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2368 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
|
2369 Fcombine_after_change_execute (); |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2370 |
12784
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2371 /* Run the after-change-function if any. |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2372 We don't bother "binding" this variable to nil |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2373 because it is obsolete anyway and new code should not use it. */ |
484 | 2374 if (!NILP (Vafter_change_function)) |
12784
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2375 call3 (Vafter_change_function, |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2376 make_number (charpos), make_number (charpos + lenins), |
12784
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2377 make_number (lendel)); |
157 | 2378 |
6787
4fcd24cee757
(before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents:
6739
diff
changeset
|
2379 if (!NILP (Vafter_change_functions)) |
4fcd24cee757
(before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents:
6739
diff
changeset
|
2380 { |
12784
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2381 Lisp_Object args[4]; |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2382 Lisp_Object before_change_functions; |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2383 Lisp_Object after_change_functions; |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2384 struct gcpro gcpro1, gcpro2; |
6787
4fcd24cee757
(before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents:
6739
diff
changeset
|
2385 |
12784
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2386 /* "Bind" before-change-functions and after-change-functions |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2387 to nil--but in a way that errors don't know about. |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2388 That way, if there's an error in them, they will stay nil. */ |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2389 before_change_functions = Vbefore_change_functions; |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2390 after_change_functions = Vafter_change_functions; |
12798
9ac61661054b
(signal_before_change, signal_after_change): Fix
Karl Heuer <kwzh@gnu.org>
parents:
12784
diff
changeset
|
2391 Vbefore_change_functions = Qnil; |
9ac61661054b
(signal_before_change, signal_after_change): Fix
Karl Heuer <kwzh@gnu.org>
parents:
12784
diff
changeset
|
2392 Vafter_change_functions = Qnil; |
12784
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2393 GCPRO2 (before_change_functions, after_change_functions); |
6787
4fcd24cee757
(before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents:
6739
diff
changeset
|
2394 |
12784
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2395 /* Actually run the hook functions. */ |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2396 args[0] = Qafter_change_functions; |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2397 XSETFASTINT (args[1], charpos); |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2398 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
|
2399 XSETFASTINT (args[3], lendel); |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2400 run_hook_list_with_args (after_change_functions, |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2401 4, args); |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2402 |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2403 /* "Unbind" the variables we "bound" to nil. */ |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2404 Vbefore_change_functions = before_change_functions; |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2405 Vafter_change_functions = after_change_functions; |
0dea0aa2f32d
(signal_before_change, signal_after_change): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
12655
diff
changeset
|
2406 UNGCPRO; |
6787
4fcd24cee757
(before_change_functions_restore):
Richard M. Stallman <rms@gnu.org>
parents:
6739
diff
changeset
|
2407 } |
10144
607074ed1c6d
(signal_before_change, signal_after_change):
Richard M. Stallman <rms@gnu.org>
parents:
9685
diff
changeset
|
2408 |
607074ed1c6d
(signal_before_change, signal_after_change):
Richard M. Stallman <rms@gnu.org>
parents:
9685
diff
changeset
|
2409 if (!NILP (current_buffer->overlays_before) |
607074ed1c6d
(signal_before_change, signal_after_change):
Richard M. Stallman <rms@gnu.org>
parents:
9685
diff
changeset
|
2410 || !NILP (current_buffer->overlays_after)) |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2411 report_overlay_modification (make_number (charpos), |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2412 make_number (charpos + lenins), |
10144
607074ed1c6d
(signal_before_change, signal_after_change):
Richard M. Stallman <rms@gnu.org>
parents:
9685
diff
changeset
|
2413 1, |
20555
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2414 make_number (charpos), |
80a546059cbd
(move_gap): Use move_gap_both.
Richard M. Stallman <rms@gnu.org>
parents:
19331
diff
changeset
|
2415 make_number (charpos + lenins), |
10144
607074ed1c6d
(signal_before_change, signal_after_change):
Richard M. Stallman <rms@gnu.org>
parents:
9685
diff
changeset
|
2416 make_number (lendel)); |
13026
3ff15e408e2c
(signal_after_change): Call report_interval_modification.
Richard M. Stallman <rms@gnu.org>
parents:
12997
diff
changeset
|
2417 |
3ff15e408e2c
(signal_after_change): Call report_interval_modification.
Richard M. Stallman <rms@gnu.org>
parents:
12997
diff
changeset
|
2418 /* 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
|
2419 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
|
2420 if (lendel == 0) |
21526
fff9425b9230
(signal_after_change): Fix mixing of Lisp_Object and
Andreas Schwab <schwab@suse.de>
parents:
21514
diff
changeset
|
2421 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
|
2422 make_number (charpos + lenins)); |
157 | 2423 } |
16547
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2424 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2425 Lisp_Object |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2426 Fcombine_after_change_execute_1 (val) |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2427 Lisp_Object val; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2428 { |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2429 Vcombine_after_change_calls = val; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2430 return val; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2431 } |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2432 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2433 DEFUN ("combine-after-change-execute", Fcombine_after_change_execute, |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2434 Scombine_after_change_execute, 0, 0, 0, |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2435 "This function is for use internally in `combine-after-change-calls'.") |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2436 () |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2437 { |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2438 register Lisp_Object val; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2439 int count = specpdl_ptr - specpdl; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2440 int beg, end, change; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2441 int begpos, endpos; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2442 Lisp_Object tail; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2443 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2444 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
|
2445 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2446 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
|
2447 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2448 /* # 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
|
2449 beg = Z - BEG; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2450 /* # 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
|
2451 end = beg; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2452 /* 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
|
2453 change = 0; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2454 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2455 /* Scan the various individual changes, |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2456 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
|
2457 for (tail = combine_after_change_list; CONSP (tail); |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2458 tail = XCONS (tail)->cdr) |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2459 { |
17373
4f931fa4c0be
(Fcombine_after_change_execute): Fix Lisp_Object/integer confusion.
Karl Heuer <kwzh@gnu.org>
parents:
17034
diff
changeset
|
2460 Lisp_Object elt; |
4f931fa4c0be
(Fcombine_after_change_execute): Fix Lisp_Object/integer confusion.
Karl Heuer <kwzh@gnu.org>
parents:
17034
diff
changeset
|
2461 int thisbeg, thisend, thischange; |
16547
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2462 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2463 /* Extract the info from the next element. */ |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2464 elt = XCONS (tail)->car; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2465 if (! CONSP (elt)) |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2466 continue; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2467 thisbeg = XINT (XCONS (elt)->car); |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2468 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2469 elt = XCONS (elt)->cdr; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2470 if (! CONSP (elt)) |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2471 continue; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2472 thisend = XINT (XCONS (elt)->car); |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2473 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2474 elt = XCONS (elt)->cdr; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2475 if (! CONSP (elt)) |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2476 continue; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2477 thischange = XINT (XCONS (elt)->car); |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2478 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2479 /* 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
|
2480 change += thischange; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2481 if (thisbeg < beg) |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2482 beg = thisbeg; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2483 if (thisend < end) |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2484 end = thisend; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2485 } |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2486 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2487 /* 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
|
2488 that was changed. */ |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2489 begpos = BEG + beg; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2490 endpos = Z - end; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2491 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2492 /* 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
|
2493 combine_after_change_list = Qnil; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2494 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2495 /* 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
|
2496 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
|
2497 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
|
2498 Vcombine_after_change_calls); |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2499 signal_after_change (begpos, endpos - begpos - change, endpos - begpos); |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2500 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2501 return unbind_to (count, val); |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2502 } |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2503 |
21514 | 2504 void |
16547
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2505 syms_of_insdel () |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2506 { |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2507 staticpro (&combine_after_change_list); |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2508 combine_after_change_list = Qnil; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2509 |
21307
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
2510 DEFVAR_BOOL ("check-markers-debug-flag", &check_markers_debug_flag, |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
2511 "Non-nil means enable debugging checks for invalid marker positions."); |
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
2512 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
|
2513 DEFVAR_LISP ("combine-after-change-calls", &Vcombine_after_change_calls, |
21307
9ac5045a93ce
(check_markers_debug_flag): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21274
diff
changeset
|
2514 "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
|
2515 Vcombine_after_change_calls = Qnil; |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2516 |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2517 defsubr (&Scombine_after_change_execute); |
96ae48c20664
(signal_after_change): If Vcombine_after_change_calls,
Richard M. Stallman <rms@gnu.org>
parents:
16194
diff
changeset
|
2518 } |