annotate src/insdel.c @ 26656:f055a24e3e5b

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