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