annotate src/insdel.c @ 82144:d334990fbd70

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