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