annotate src/insdel.c @ 185:3d6bfa290dbd r20-3b19

Import from CVS: tag r20-3b19
author cvs
date Mon, 13 Aug 2007 09:55:28 +0200
parents e121b013d1f0
children 850242ba4a81
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 /* Buffer insertion/deletion and gap motion for XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 Copyright (C) 1985, 1986, 1991, 1992, 1993, 1994, 1995
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 Free Software Foundation, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 Copyright (C) 1995 Sun Microsystems, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 This file is part of XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 XEmacs is free software; you can redistribute it and/or modify it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 under the terms of the GNU General Public License as published by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 Free Software Foundation; either version 2, or (at your option) any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 along with XEmacs; see the file COPYING. If not, write to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 Boston, MA 02111-1307, USA. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 /* Synched up with: Mule 2.0, FSF 19.30. Diverges significantly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25 /* This file has been Mule-ized. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 /* Overhauled by Ben Wing, December 1994, for Mule implementation. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 There are three possible ways to specify positions in a buffer. All
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 of these are one-based: the beginning of the buffer is position or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 index 1, and 0 is not a valid position.
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
33
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 As a "buffer position" (typedef Bufpos):
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 This is an index specifying an offset in characters from the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 beginning of the buffer. Note that buffer positions are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 logically *between* characters, not on a character. The
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 difference between two buffer positions specifies the number of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 characters between those positions. Buffer positions are the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 only kind of position externally visible to the user.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 As a "byte index" (typedef Bytind):
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 This is an index over the bytes used to represent the characters
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 in the buffer. If there is no Mule support, this is identical
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 to a buffer position, because each character is represented
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 using one byte. However, with Mule support, many characters
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 require two or more bytes for their representation, and so a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 byte index may be greater than the corresponding buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 As a "memory index" (typedef Memind):
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 This is the byte index adjusted for the gap. For positions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 before the gap, this is identical to the byte index. For
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 positions after the gap, this is the byte index plus the gap
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 size. There are two possible memory indices for the gap
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 position; the memory index at the beginning of the gap should
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 always be used, except in code that deals with manipulating the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 gap, where both indices may be seen. The address of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62 character "at" (i.e. following) a particular position can be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63 obtained from the formula
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 buffer_start_address + memory_index(position) - 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 except in the case of characters at the gap position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 Other typedefs:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 ===============
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 Emchar:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 -------
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 This typedef represents a single Emacs character, which can be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 ASCII, ISO-8859, or some extended character, as would typically
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 be used for Kanji. Note that the representation of a character
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 as an Emchar is *not* the same as the representation of that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 same character in a string; thus, you cannot do the standard
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 C trick of passing a pointer to a character to a function that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 expects a string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 An Emchar takes up 19 bits of representation and (for code
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 compatibility and such) is compatible with an int. This
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 representation is visible on the Lisp level. The important
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 characteristics of the Emchar representation are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 -- values 0x00 - 0x7f represent ASCII.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 -- values 0x80 - 0xff represent the right half of ISO-8859-1.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 -- values 0x100 and up represent all other characters.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 This means that Emchar values are upwardly compatible with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 the standard 8-bit representation of ASCII/ISO-8859-1.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 Bufbyte:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 --------
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 The data in a buffer or string is logically made up of Bufbyte
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 objects, where a Bufbyte takes up the same amount of space as a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 char. (It is declared differently, though, to catch invalid
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 usages.) Strings stored using Bufbytes are said to be in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 "internal format". The important characteristics of internal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 format are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 -- ASCII characters are represented as a single Bufbyte,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 in the range 0 - 0x7f.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 -- All other characters are represented as a Bufbyte in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 the range 0x80 - 0x9f followed by one or more Bufbytes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 in the range 0xa0 to 0xff.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 This leads to a number of desirable properties:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111 -- Given the position of the beginning of a character,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 you can find the beginning of the next or previous
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113 character in constant time.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114 -- When searching for a substring or an ASCII character
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 within the string, you need merely use standard
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 searching routines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118 array of char:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119 --------------
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120 Strings that go in or out of Emacs are in "external format",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121 typedef'ed as an array of char or a char *. There is more
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 than one external format (JIS, EUC, etc.) but they all
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 have similar properties. They are modal encodings,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 which is to say that the meaning of particular bytes is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125 not fixed but depends on what "mode" the string is currently
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 in (e.g. bytes in the range 0 - 0x7f might be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 interpreted as ASCII, or as Hiragana, or as 2-byte Kanji,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128 depending on the current mode). The mode starts out in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 ASCII/ISO-8859-1 and is switched using escape sequences --
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 for example, in the JIS encoding, 'ESC $ B' switches to a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131 mode where pairs of bytes in the range 0 - 0x7f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 are interpreted as Kanji characters.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
134 External-formatted data is generally desirable for passing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135 data between programs because it is upwardly compatible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136 with standard ASCII/ISO-8859-1 strings and may require
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 less space than internal encodings such as the one
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138 described above. In addition, some encodings (e.g. JIS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 keep all characters (except the ESC used to switch modes)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 in the printing ASCII range 0x20 - 0x7e, which results in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
141 a much higher probability that the data will avoid being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
142 garbled in transmission. Externally-formatted data is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
143 generally not very convenient to work with, however, and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
144 for this reason is usually converted to internal format
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
145 before any work is done on the string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
146
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
147 NOTE: filenames need to be in external format so that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 ISO-8859-1 characters come out correctly.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150 Charcount:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151 ----------
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
152 This typedef represents a count of characters, such as
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153 a character offset into a string or the number of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
154 characters between two positions in a buffer. The
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
155 difference between two Bufpos's is a Charcount, and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
156 character positions in a string are represented using
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157 a Charcount.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159 Bytecount:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160 ----------
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 Similar to a Charcount but represents a count of bytes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 The difference between two Bytind's is a Bytecount.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
164
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 Usage of the various representations:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166 =====================================
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168 Memory indices are used in low-level functions in insdel.c and for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 extent endpoints and marker positions. The reason for this is that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 this way, the extents and markers don't need to be updated for most
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 insertions, which merely shrink the gap and don't move any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172 characters around in memory.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
174 (The beginning-of-gap memory index simplifies insertions w.r.t.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
175 markers, because text usually gets inserted after markers. For
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
176 extents, it is merely for consistency, because text can get
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177 inserted either before or after an extent's endpoint depending on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178 the open/closedness of the endpoint.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180 Byte indices are used in other code that needs to be fast,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181 such as the searching, redisplay, and extent-manipulation code.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 Buffer positions are used in all other code. This is because this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 representation is easiest to work with (especially since Lisp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185 code always uses buffer positions), necessitates the fewest
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 changes to existing code, and is the safest (e.g. if the text gets
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 shifted underneath a buffer position, it will still point to a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 character; if text is shifted under a byte index, it might point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 to the middle of a character, which would be bad).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 Similarly, Charcounts are used in all code that deals with strings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 except for code that needs to be fast, which used Bytecounts.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194 Strings are always passed around internally using internal format.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195 Conversions between external format are performed at the time
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196 that the data goes in or out of Emacs.
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
197
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 Working with the various representations:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199 ========================================= */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 #include <config.h>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202 #include "lisp.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
203
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204 #include "buffer.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 #include "device.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
206 #include "frame.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
207 #include "extents.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208 #include "insdel.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
209 #include "lstream.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
210 #include "redisplay.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
211
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212 /* We write things this way because it's very important the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 MAX_BYTIND_GAP_SIZE_3 is a multiple of 3. (As it happens,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214 65535 is a multiple of 3, but this may not always be the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
215 case.) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
216
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
217 #define MAX_BUFPOS_GAP_SIZE_3 (65535/3)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
218 #define MAX_BYTIND_GAP_SIZE_3 (3 * MAX_BUFPOS_GAP_SIZE_3)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
220 short three_to_one_table[1 + MAX_BYTIND_GAP_SIZE_3];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
221
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
222 /* Various macros modelled along the lines of those in buffer.h.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
223 Purposefully omitted from buffer.h because files other than this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
224 one should not be using them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
225
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
226 /* Address of beginning of buffer. This is an lvalue because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
227 BUFFER_ALLOC needs it to be. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
228 #define BUF_BEG_ADDR(buf) ((buf)->text->beg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230 /* Set the address of beginning of buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
231 #define SET_BUF_BEG_ADDR(buf, addr) do { (buf)->text->beg = (addr); } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 /* Gap size. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234 #define BUF_GAP_SIZE(buf) ((buf)->text->gap_size + 0)
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
235 #define BUF_END_GAP_SIZE(buf) ((buf)->text->end_gap_size + 0)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236 /* Set gap size. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237 #define SET_BUF_GAP_SIZE(buf, value) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 do { (buf)->text->gap_size = (value); } while (0)
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
239 #define SET_BUF_END_GAP_SIZE(buf, value) \
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
240 do { (buf)->text->end_gap_size = (value); } while (0)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
242 /* Gap location. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243 #define BI_BUF_GPT(buf) ((buf)->text->gpt + 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244 #define BUF_GPT_ADDR(buf) (BUF_BEG_ADDR (buf) + BI_BUF_GPT (buf) - 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246 /* Set gap location. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 #define SET_BI_BUF_GPT(buf, value) do { (buf)->text->gpt = (value); } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
249 /* Set end of buffer. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
250 #define SET_BOTH_BUF_Z(buf, val, bival) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 do \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 (buf)->text->z = (bival); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 (buf)->text->bufz = (val); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
257 /* Under Mule, we maintain two sentinels in the buffer: one at the
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
258 beginning of the gap, and one at the end of the buffer. This
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
259 allows us to move forward, examining bytes looking for the
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
260 end of a character, and not worry about running off the end.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
261 We do not need corresponding sentinels when moving backwards
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
262 because we do not have to look past the beginning of a character
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
263 to find the beginning of the character.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
264
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
265 Every time we change the beginning of the gap, we have to
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
266 call SET_GAP_SENTINEL().
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
267
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
268 Every time we change the total size (characters plus gap)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
269 of the buffer, we have to call SET_END_SENTINEL().
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
270 */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
271
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
272
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
273 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
274 # define GAP_CAN_HOLD_SIZE_P(buf, len) (BUF_GAP_SIZE (buf) >= (len) + 1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
275 # define SET_GAP_SENTINEL(buf) (*BUF_GPT_ADDR (buf) = 0)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
276 # define BUF_END_SENTINEL_SIZE 1
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
277 # define SET_END_SENTINEL(buf) \
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
278 (*(BUF_BEG_ADDR (buf) + BUF_GAP_SIZE (buf) + BI_BUF_Z (buf) - 1) = 0)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
279 #else
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 # define GAP_CAN_HOLD_SIZE_P(buf, len) (BUF_GAP_SIZE (buf) >= (len))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 # define SET_GAP_SENTINEL(buf)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282 # define BUF_END_SENTINEL_SIZE 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283 # define SET_END_SENTINEL(buf)
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
284 #endif
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 /* Charcount/Bytecount conversion */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 /* Optimization. Do it. Live it. Love it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
293 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
294
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
295 /* We include the basic functions here that require no specific
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
296 knowledge of how data is Mule-encoded into a buffer other
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
297 than the basic (00 - 7F), (80 - 9F), (A0 - FF) scheme.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
298 Anything that requires more specific knowledge goes into
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
299 mule-charset.c. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
300
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
301 /* Given a pointer to a text string and a length in bytes, return
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
302 the equivalent length in characters. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
303
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
304 Charcount
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
305 bytecount_to_charcount (CONST Bufbyte *ptr, Bytecount len)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
306 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
307 Charcount count = 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
308 CONST Bufbyte *end = ptr + len;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
309
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
310 #if (LONGBITS == 32 || LONGBITS == 64)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
311
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
312 # if (LONGBITS == 32)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
313 # define LONG_BYTES 4
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
314 # define ALIGN_MASK 0xFFFFFFFCU
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
315 # define HIGH_BIT_MASK 0x80808080U
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
316 # else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
317 # define LONG_BYTES 8
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
318 # define ALIGN_MASK 0xFFFFFFFFFFFFFFF8U
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
319 /* I had a dream, I was being overrun with early Intel processors ... */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
320 # define HIGH_BIT_MASK 0x8080808080808080U
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
321 # endif
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
322
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
323 /* When we have a large number of bytes to scan, we can be trickier
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
324 and significantly faster by scanning them in chunks of the CPU word
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
325 size (assuming that they're all ASCII -- we cut out as soon as
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
326 we find something non-ASCII). */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
327 if (len >= 12)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
328 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
329 /* Determine the section in the middle of the string that's
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
330 amenable to this treatment. Everything has to be aligned
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
331 on CPU word boundaries. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
332 CONST Bufbyte *aligned_ptr =
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
333 (CONST Bufbyte *) (((unsigned long) (ptr + LONG_BYTES - 1)) &
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
334 ALIGN_MASK);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
335 CONST Bufbyte *aligned_end =
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
336 (CONST Bufbyte *) (((unsigned long) end) & ALIGN_MASK);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
337
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
338 /* Handle unaligned stuff at the beginning. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
339 while (ptr < aligned_ptr)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
340 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
341 if (!BYTE_ASCII_P (*ptr))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
342 goto bail;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
343 count++, ptr++;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
344 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
345 /* Now do it. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
346 while (ptr < aligned_end)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
347 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
348
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
349 if ((* (unsigned long *) ptr) & HIGH_BIT_MASK)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
350 goto bail;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
351 ptr += LONG_BYTES;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
352 count += LONG_BYTES;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
353 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
354 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
355
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
356 #endif /* LONGBITS == 32 || LONGBITS == 64 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
357
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
358 bail:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
359 while (ptr < end)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
360 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
361 count++;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
362 INC_CHARPTR (ptr);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
363 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
364 #ifdef ERROR_CHECK_BUFPOS
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
365 /* Bomb out if the specified substring ends in the middle
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
366 of a character. Note that we might have already gotten
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
367 a core dump above from an invalid reference, but at least
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
368 we will get no farther than here. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
369 assert (ptr == end);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
370 #endif
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
371
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
372 return count;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
373 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
374
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
375 /* Given a pointer to a text string and a length in characters, return
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
376 the equivalent length in bytes. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
377
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
378 Bytecount
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
379 charcount_to_bytecount (CONST Bufbyte *ptr, Charcount len)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
380 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
381 CONST Bufbyte *newptr = ptr;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
382
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
383 while (len > 0)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
384 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
385 INC_CHARPTR (newptr);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
386 len--;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
387 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
388 return newptr - ptr;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
389 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
390
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
391 /* The next two functions are the actual meat behind the
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
392 bufpos-to-bytind and bytind-to-bufpos conversions. Currently
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
393 the method they use is fairly unsophisticated; see buffer.h.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
394
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
395 Note that bufpos_to_bytind_func() is probably the most-called
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
396 function in all of XEmacs. Therefore, it must be FAST FAST FAST.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
397 This is the reason why so much of the code is duplicated.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
398
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
399 Similar considerations apply to bytind_to_bufpos_func(), although
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
400 less so because the function is not called so often.
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
401
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
402 #### At some point this should use a more sophisticated method;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
403 see buffer.h. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
404
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
405 static int not_very_random_number;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
406
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
407 Bytind
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
408 bufpos_to_bytind_func (struct buffer *buf, Bufpos x)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
409 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
410 Bufpos bufmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
411 Bufpos bufmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
412 Bytind bytmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
413 Bytind bytmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
414 int size;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
415 int forward_p;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
416 Bytind retval;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
417 int diff_so_far;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
418 int add_to_cache = 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
419
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
420 /* Check for some cached positions, for speed. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
421 if (x == BUF_PT (buf))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
422 return BI_BUF_PT (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
423 if (x == BUF_ZV (buf))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
424 return BI_BUF_ZV (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
425 if (x == BUF_BEGV (buf))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
426 return BI_BUF_BEGV (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
427
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
428 bufmin = buf->text->mule_bufmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
429 bufmax = buf->text->mule_bufmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
430 bytmin = buf->text->mule_bytmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
431 bytmax = buf->text->mule_bytmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
432 size = (1 << buf->text->mule_shifter) + !!buf->text->mule_three_p;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
433
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
434 /* The basic idea here is that we shift the "known region" up or down
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
435 until it overlaps the specified position. We do this by moving
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
436 the upper bound of the known region up one character at a time,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
437 and moving the lower bound of the known region up as necessary
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
438 when the size of the character just seen changes.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
439
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
440 We optimize this, however, by first shifting the known region to
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
441 one of the cached points if it's close by. (We don't check BEG or
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
442 Z, even though they're cached; most of the time these will be the
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
443 same as BEGV and ZV, and when they're not, they're not likely
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
444 to be used.) */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
445
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
446 if (x > bufmax)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
447 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
448 Bufpos diffmax = x - bufmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
449 Bufpos diffpt = x - BUF_PT (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
450 Bufpos diffzv = BUF_ZV (buf) - x;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
451 /* #### This value could stand some more exploration. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
452 Charcount heuristic_hack = (bufmax - bufmin) >> 2;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
453
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
454 /* Check if the position is closer to PT or ZV than to the
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
455 end of the known region. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
456
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
457 if (diffpt < 0)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
458 diffpt = -diffpt;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
459 if (diffzv < 0)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
460 diffzv = -diffzv;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
461
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
462 /* But also implement a heuristic that favors the known region
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
463 over PT or ZV. The reason for this is that switching to
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
464 PT or ZV will wipe out the knowledge in the known region,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
465 which might be annoying if the known region is large and
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
466 PT or ZV is not that much closer than the end of the known
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
467 region. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
468
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
469 diffzv += heuristic_hack;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
470 diffpt += heuristic_hack;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
471 if (diffpt < diffmax && diffpt <= diffzv)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
472 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
473 bufmax = bufmin = BUF_PT (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
474 bytmax = bytmin = BI_BUF_PT (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
475 /* We set the size to 1 even though it doesn't really
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
476 matter because the new known region contains no
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
477 characters. We do this because this is the most
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
478 likely size of the characters around the new known
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
479 region, and we avoid potential yuckiness that is
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
480 done when size == 3. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
481 size = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
482 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
483 if (diffzv < diffmax)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
484 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
485 bufmax = bufmin = BUF_ZV (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
486 bytmax = bytmin = BI_BUF_ZV (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
487 size = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
488 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
489 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
490 #ifdef ERROR_CHECK_BUFPOS
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
491 else if (x >= bufmin)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
492 abort ();
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
493 #endif
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
494 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
495 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
496 Bufpos diffmin = bufmin - x;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
497 Bufpos diffpt = BUF_PT (buf) - x;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
498 Bufpos diffbegv = x - BUF_BEGV (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
499 /* #### This value could stand some more exploration. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
500 Charcount heuristic_hack = (bufmax - bufmin) >> 2;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
501
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
502 if (diffpt < 0)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
503 diffpt = -diffpt;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
504 if (diffbegv < 0)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
505 diffbegv = -diffbegv;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
506
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
507 /* But also implement a heuristic that favors the known region --
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
508 see above. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
509
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
510 diffbegv += heuristic_hack;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
511 diffpt += heuristic_hack;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
512
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
513 if (diffpt < diffmin && diffpt <= diffbegv)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
514 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
515 bufmax = bufmin = BUF_PT (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
516 bytmax = bytmin = BI_BUF_PT (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
517 /* We set the size to 1 even though it doesn't really
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
518 matter because the new known region contains no
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
519 characters. We do this because this is the most
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
520 likely size of the characters around the new known
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
521 region, and we avoid potential yuckiness that is
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
522 done when size == 3. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
523 size = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
524 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
525 if (diffbegv < diffmin)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
526 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
527 bufmax = bufmin = BUF_BEGV (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
528 bytmax = bytmin = BI_BUF_BEGV (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
529 size = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
530 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
531 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
532
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
533 diff_so_far = x > bufmax ? x - bufmax : bufmin - x;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
534 if (diff_so_far > 50)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
535 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
536 /* If we have to move more than a certain amount, then look
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
537 into our cache. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
538 int minval = INT_MAX;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
539 int found = 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
540 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
541
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
542 add_to_cache = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
543 /* I considered keeping the positions ordered. This would speed
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
544 up this loop, but updating the cache would take longer, so
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
545 it doesn't seem like it would really matter. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
546 for (i = 0; i < 16; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
547 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
548 int diff = buf->text->mule_bufpos_cache[i] - x;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
549
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
550 if (diff < 0)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
551 diff = -diff;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
552 if (diff < minval)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
553 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
554 minval = diff;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
555 found = i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
556 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
557 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
558
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
559 if (minval < diff_so_far)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
560 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
561 bufmax = bufmin = buf->text->mule_bufpos_cache[found];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
562 bytmax = bytmin = buf->text->mule_bytind_cache[found];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
563 size = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
564 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
565 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
566
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
567 /* It's conceivable that the caching above could lead to X being
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
568 the same as one of the range edges. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
569 if (x >= bufmax)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
570 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
571 Bytind newmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
572 Bytecount newsize;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
573
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
574 forward_p = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
575 while (x > bufmax)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
576 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
577 newmax = bytmax;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
578
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
579 INC_BYTIND (buf, newmax);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
580 newsize = newmax - bytmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
581 if (newsize != size)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
582 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
583 bufmin = bufmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
584 bytmin = bytmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
585 size = newsize;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
586 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
587 bytmax = newmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
588 bufmax++;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
589 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
590 retval = bytmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
591
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
592 /* #### Should go past the found location to reduce the number
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
593 of times that this function is called */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
594 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
595 else /* x < bufmin */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
596 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
597 Bytind newmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
598 Bytecount newsize;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
599
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
600 forward_p = 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
601 while (x < bufmin)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
602 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
603 newmin = bytmin;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
604
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
605 DEC_BYTIND (buf, newmin);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
606 newsize = bytmin - newmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
607 if (newsize != size)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
608 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
609 bufmax = bufmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
610 bytmax = bytmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
611 size = newsize;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
612 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
613 bytmin = newmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
614 bufmin--;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
615 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
616 retval = bytmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
617
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
618 /* #### Should go past the found location to reduce the number
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
619 of times that this function is called
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
620 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
621 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
622
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
623 /* If size is three, than we have to max sure that the range we
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
624 discovered isn't too large, because we use a fixed-length
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
625 table to divide by 3. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
626
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
627 if (size == 3)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
628 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
629 int gap = bytmax - bytmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
630 buf->text->mule_three_p = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
631 buf->text->mule_shifter = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
632
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
633 if (gap > MAX_BYTIND_GAP_SIZE_3)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
634 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
635 if (forward_p)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
636 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
637 bytmin = bytmax - MAX_BYTIND_GAP_SIZE_3;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
638 bufmin = bufmax - MAX_BUFPOS_GAP_SIZE_3;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
639 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
640 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
641 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
642 bytmax = bytmin + MAX_BYTIND_GAP_SIZE_3;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
643 bufmax = bufmin + MAX_BUFPOS_GAP_SIZE_3;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
644 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
645 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
646 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
647 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
648 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
649 buf->text->mule_three_p = 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
650 if (size == 4)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
651 buf->text->mule_shifter = 2;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
652 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
653 buf->text->mule_shifter = size - 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
654 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
655
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
656 buf->text->mule_bufmin = bufmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
657 buf->text->mule_bufmax = bufmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
658 buf->text->mule_bytmin = bytmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
659 buf->text->mule_bytmax = bytmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
660
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
661 if (add_to_cache)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
662 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
663 int replace_loc;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
664
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
665 /* We throw away a "random" cached value and replace it with
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
666 the new value. It doesn't actually have to be very random
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
667 at all, just evenly distributed.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
668
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
669 #### It would be better to use a least-recently-used algorithm
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
670 or something that tries to space things out, but I'm not sure
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
671 it's worth it to go to the trouble of maintaining that. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
672 not_very_random_number += 621;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
673 replace_loc = not_very_random_number & 15;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
674 buf->text->mule_bufpos_cache[replace_loc] = x;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
675 buf->text->mule_bytind_cache[replace_loc] = retval;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
676 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
677
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
678 return retval;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
679 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
680
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
681 /* The logic in this function is almost identical to the logic in
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
682 the previous function. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
683
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
684 Bufpos
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
685 bytind_to_bufpos_func (struct buffer *buf, Bytind x)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
686 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
687 Bufpos bufmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
688 Bufpos bufmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
689 Bytind bytmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
690 Bytind bytmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
691 int size;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
692 int forward_p;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
693 Bufpos retval;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
694 int diff_so_far;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
695 int add_to_cache = 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
696
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
697 /* Check for some cached positions, for speed. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
698 if (x == BI_BUF_PT (buf))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
699 return BUF_PT (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
700 if (x == BI_BUF_ZV (buf))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
701 return BUF_ZV (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
702 if (x == BI_BUF_BEGV (buf))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
703 return BUF_BEGV (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
704
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
705 bufmin = buf->text->mule_bufmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
706 bufmax = buf->text->mule_bufmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
707 bytmin = buf->text->mule_bytmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
708 bytmax = buf->text->mule_bytmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
709 size = (1 << buf->text->mule_shifter) + !!buf->text->mule_three_p;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
710
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
711 /* The basic idea here is that we shift the "known region" up or down
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
712 until it overlaps the specified position. We do this by moving
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
713 the upper bound of the known region up one character at a time,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
714 and moving the lower bound of the known region up as necessary
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
715 when the size of the character just seen changes.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
716
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
717 We optimize this, however, by first shifting the known region to
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
718 one of the cached points if it's close by. (We don't check BI_BEG or
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
719 BI_Z, even though they're cached; most of the time these will be the
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
720 same as BI_BEGV and BI_ZV, and when they're not, they're not likely
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
721 to be used.) */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
722
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
723 if (x > bytmax)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
724 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
725 Bytind diffmax = x - bytmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
726 Bytind diffpt = x - BI_BUF_PT (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
727 Bytind diffzv = BI_BUF_ZV (buf) - x;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
728 /* #### This value could stand some more exploration. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
729 Bytecount heuristic_hack = (bytmax - bytmin) >> 2;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
730
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
731 /* Check if the position is closer to PT or ZV than to the
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
732 end of the known region. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
733
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
734 if (diffpt < 0)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
735 diffpt = -diffpt;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
736 if (diffzv < 0)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
737 diffzv = -diffzv;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
738
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
739 /* But also implement a heuristic that favors the known region
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
740 over BI_PT or BI_ZV. The reason for this is that switching to
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
741 BI_PT or BI_ZV will wipe out the knowledge in the known region,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
742 which might be annoying if the known region is large and
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
743 BI_PT or BI_ZV is not that much closer than the end of the known
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
744 region. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
745
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
746 diffzv += heuristic_hack;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
747 diffpt += heuristic_hack;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
748 if (diffpt < diffmax && diffpt <= diffzv)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
749 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
750 bufmax = bufmin = BUF_PT (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
751 bytmax = bytmin = BI_BUF_PT (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
752 /* We set the size to 1 even though it doesn't really
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
753 matter because the new known region contains no
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
754 characters. We do this because this is the most
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
755 likely size of the characters around the new known
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
756 region, and we avoid potential yuckiness that is
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
757 done when size == 3. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
758 size = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
759 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
760 if (diffzv < diffmax)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
761 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
762 bufmax = bufmin = BUF_ZV (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
763 bytmax = bytmin = BI_BUF_ZV (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
764 size = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
765 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
766 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
767 #ifdef ERROR_CHECK_BUFPOS
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
768 else if (x >= bytmin)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
769 abort ();
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
770 #endif
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
771 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
772 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
773 Bytind diffmin = bytmin - x;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
774 Bytind diffpt = BI_BUF_PT (buf) - x;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
775 Bytind diffbegv = x - BI_BUF_BEGV (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
776 /* #### This value could stand some more exploration. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
777 Bytecount heuristic_hack = (bytmax - bytmin) >> 2;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
778
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
779 if (diffpt < 0)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
780 diffpt = -diffpt;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
781 if (diffbegv < 0)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
782 diffbegv = -diffbegv;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
783
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
784 /* But also implement a heuristic that favors the known region --
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
785 see above. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
786
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
787 diffbegv += heuristic_hack;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
788 diffpt += heuristic_hack;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
789
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
790 if (diffpt < diffmin && diffpt <= diffbegv)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
791 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
792 bufmax = bufmin = BUF_PT (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
793 bytmax = bytmin = BI_BUF_PT (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
794 /* We set the size to 1 even though it doesn't really
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
795 matter because the new known region contains no
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
796 characters. We do this because this is the most
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
797 likely size of the characters around the new known
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
798 region, and we avoid potential yuckiness that is
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
799 done when size == 3. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
800 size = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
801 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
802 if (diffbegv < diffmin)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
803 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
804 bufmax = bufmin = BUF_BEGV (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
805 bytmax = bytmin = BI_BUF_BEGV (buf);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
806 size = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
807 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
808 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
809
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
810 diff_so_far = x > bytmax ? x - bytmax : bytmin - x;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
811 if (diff_so_far > 50)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
812 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
813 /* If we have to move more than a certain amount, then look
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
814 into our cache. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
815 int minval = INT_MAX;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
816 int found = 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
817 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
818
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
819 add_to_cache = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
820 /* I considered keeping the positions ordered. This would speed
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
821 up this loop, but updating the cache would take longer, so
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
822 it doesn't seem like it would really matter. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
823 for (i = 0; i < 16; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
824 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
825 int diff = buf->text->mule_bytind_cache[i] - x;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
826
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
827 if (diff < 0)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
828 diff = -diff;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
829 if (diff < minval)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
830 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
831 minval = diff;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
832 found = i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
833 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
834 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
835
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
836 if (minval < diff_so_far)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
837 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
838 bufmax = bufmin = buf->text->mule_bufpos_cache[found];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
839 bytmax = bytmin = buf->text->mule_bytind_cache[found];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
840 size = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
841 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
842 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
843
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
844 /* It's conceivable that the caching above could lead to X being
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
845 the same as one of the range edges. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
846 if (x >= bytmax)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
847 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
848 Bytind newmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
849 Bytecount newsize;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
850
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
851 forward_p = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
852 while (x > bytmax)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
853 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
854 newmax = bytmax;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
855
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
856 INC_BYTIND (buf, newmax);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
857 newsize = newmax - bytmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
858 if (newsize != size)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
859 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
860 bufmin = bufmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
861 bytmin = bytmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
862 size = newsize;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
863 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
864 bytmax = newmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
865 bufmax++;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
866 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
867 retval = bufmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
868
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
869 /* #### Should go past the found location to reduce the number
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
870 of times that this function is called */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
871 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
872 else /* x <= bytmin */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
873 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
874 Bytind newmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
875 Bytecount newsize;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
876
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
877 forward_p = 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
878 while (x < bytmin)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
879 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
880 newmin = bytmin;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
881
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
882 DEC_BYTIND (buf, newmin);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
883 newsize = bytmin - newmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
884 if (newsize != size)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
885 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
886 bufmax = bufmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
887 bytmax = bytmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
888 size = newsize;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
889 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
890 bytmin = newmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
891 bufmin--;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
892 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
893 retval = bufmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
894
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
895 /* #### Should go past the found location to reduce the number
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
896 of times that this function is called
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
897 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
898 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
899
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
900 /* If size is three, than we have to max sure that the range we
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
901 discovered isn't too large, because we use a fixed-length
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
902 table to divide by 3. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
903
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
904 if (size == 3)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
905 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
906 int gap = bytmax - bytmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
907 buf->text->mule_three_p = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
908 buf->text->mule_shifter = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
909
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
910 if (gap > MAX_BYTIND_GAP_SIZE_3)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
911 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
912 if (forward_p)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
913 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
914 bytmin = bytmax - MAX_BYTIND_GAP_SIZE_3;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
915 bufmin = bufmax - MAX_BUFPOS_GAP_SIZE_3;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
916 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
917 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
918 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
919 bytmax = bytmin + MAX_BYTIND_GAP_SIZE_3;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
920 bufmax = bufmin + MAX_BUFPOS_GAP_SIZE_3;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
921 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
922 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
923 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
924 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
925 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
926 buf->text->mule_three_p = 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
927 if (size == 4)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
928 buf->text->mule_shifter = 2;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
929 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
930 buf->text->mule_shifter = size - 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
931 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
932
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
933 buf->text->mule_bufmin = bufmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
934 buf->text->mule_bufmax = bufmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
935 buf->text->mule_bytmin = bytmin;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
936 buf->text->mule_bytmax = bytmax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
937
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
938 if (add_to_cache)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
939 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
940 int replace_loc;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
941
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
942 /* We throw away a "random" cached value and replace it with
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
943 the new value. It doesn't actually have to be very random
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
944 at all, just evenly distributed.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
945
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
946 #### It would be better to use a least-recently-used algorithm
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
947 or something that tries to space things out, but I'm not sure
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
948 it's worth it to go to the trouble of maintaining that. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
949 not_very_random_number += 621;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
950 replace_loc = not_very_random_number & 15;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
951 buf->text->mule_bufpos_cache[replace_loc] = retval;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
952 buf->text->mule_bytind_cache[replace_loc] = x;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
953 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
954
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
955 return retval;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
956 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
957
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
958 /* Text of length BYTELENGTH and CHARLENGTH (in different units)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
959 was inserted at bufpos START. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
960
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
961 static void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
962 buffer_mule_signal_inserted_region (struct buffer *buf, Bufpos start,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
963 Bytecount bytelength,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
964 Charcount charlength)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
965 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
966 int size = (1 << buf->text->mule_shifter) + !!buf->text->mule_three_p;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
967 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
968
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
969 /* Adjust the cache of known positions. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
970 for (i = 0; i < 16; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
971 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
972
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
973 if (buf->text->mule_bufpos_cache[i] > start)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
974 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
975 buf->text->mule_bufpos_cache[i] += charlength;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
976 buf->text->mule_bytind_cache[i] += bytelength;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
977 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
978 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
979
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
980 if (start >= buf->text->mule_bufmax)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
981 return;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
982
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
983 /* The insertion is either before the known region, in which case
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
984 it shoves it forward; or within the known region, in which case
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
985 it shoves the end forward. (But it may make the known region
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
986 inconsistent, so we may have to shorten it.) */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
987
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
988 if (start <= buf->text->mule_bufmin)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
989 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
990 buf->text->mule_bufmin += charlength;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
991 buf->text->mule_bufmax += charlength;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
992 buf->text->mule_bytmin += bytelength;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
993 buf->text->mule_bytmax += bytelength;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
994 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
995 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
996 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
997 Bufpos end = start + charlength;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
998 /* the insertion point divides the known region in two.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
999 Keep the longer half, at least, and expand into the
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1000 inserted chunk as much as possible. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1001
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1002 if (start - buf->text->mule_bufmin > buf->text->mule_bufmax - start)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1003 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1004 Bytind bytestart = (buf->text->mule_bytmin
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1005 + size * (start - buf->text->mule_bufmin));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1006 Bytind bytenew;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1007
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1008 while (start < end)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1009 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1010 bytenew = bytestart;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1011 INC_BYTIND (buf, bytenew);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1012 if (bytenew - bytestart != size)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1013 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1014 start++;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1015 bytestart = bytenew;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1016 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1017 if (start != end)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1018 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1019 buf->text->mule_bufmax = start;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1020 buf->text->mule_bytmax = bytestart;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1021 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1022 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1023 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1024 buf->text->mule_bufmax += charlength;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1025 buf->text->mule_bytmax += bytelength;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1026 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1027 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1028 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1029 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1030 Bytind byteend = (buf->text->mule_bytmin
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1031 + size * (start - buf->text->mule_bufmin)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1032 + bytelength);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1033 Bytind bytenew;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1034
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1035 buf->text->mule_bufmax += charlength;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1036 buf->text->mule_bytmax += bytelength;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1037
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1038 while (end > start)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1039 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1040 bytenew = byteend;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1041 DEC_BYTIND (buf, bytenew);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1042 if (byteend - bytenew != size)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1043 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1044 end--;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1045 byteend = bytenew;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1046 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1047 if (start != end)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1048 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1049 buf->text->mule_bufmin = end;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1050 buf->text->mule_bytmin = byteend;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1051 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1052 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1053 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1054 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1055
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1056 /* Text from START to END (equivalent in Bytinds: from BI_START to
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1057 BI_END) was deleted. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1058
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1059 static void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1060 buffer_mule_signal_deleted_region (struct buffer *buf, Bufpos start,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1061 Bufpos end, Bytind bi_start,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1062 Bytind bi_end)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1063 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1064 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1065
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1066 /* Adjust the cache of known positions. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1067 for (i = 0; i < 16; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1068 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1069 /* After the end; gets shoved backward */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1070 if (buf->text->mule_bufpos_cache[i] > end)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1071 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1072 buf->text->mule_bufpos_cache[i] -= end - start;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1073 buf->text->mule_bytind_cache[i] -= bi_end - bi_start;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1074 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1075 /* In the range; moves to start of range */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1076 else if (buf->text->mule_bufpos_cache[i] > start)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1077 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1078 buf->text->mule_bufpos_cache[i] = start;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1079 buf->text->mule_bytind_cache[i] = bi_start;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1080 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1081 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1082
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1083 /* We don't care about any text after the end of the known region. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1084
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1085 end = min (end, buf->text->mule_bufmax);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1086 bi_end = min (bi_end, buf->text->mule_bytmax);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1087 if (start >= end)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1088 return;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1089
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1090 /* The end of the known region offsets by the total amount of deletion,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1091 since it's all before it. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1092
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1093 buf->text->mule_bufmax -= end - start;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1094 buf->text->mule_bytmax -= bi_end - bi_start;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1095
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1096 /* Now we don't care about any text after the start of the known region. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1097
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1098 end = min (end, buf->text->mule_bufmin);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1099 bi_end = min (bi_end, buf->text->mule_bytmin);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1100 if (start >= end)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1101 return;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1102
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1103 buf->text->mule_bufmin -= end - start;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1104 buf->text->mule_bytmin -= bi_end - bi_start;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1105 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1106
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1107 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
1108
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1109 #ifdef ERROR_CHECK_BUFPOS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1111 Bytind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1112 bufpos_to_bytind (struct buffer *buf, Bufpos x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1113 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114 Bytind retval = real_bufpos_to_bytind (buf, x);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1115 ASSERT_VALID_BYTIND_UNSAFE (buf, retval);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1116 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1117 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1118
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1119 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1120 bytind_to_bufpos (struct buffer *buf, Bytind x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1122 ASSERT_VALID_BYTIND_UNSAFE (buf, x);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1123 return real_bytind_to_bufpos (buf, x);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1124 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1125
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1126 #endif /* ERROR_CHECK_BUFPOS */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1127
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1128
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1129 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1130 /* verifying buffer and string positions */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1131 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1132
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1133 /* Functions below are tagged with either _byte or _char indicating
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1134 whether they return byte or character positions. For a buffer,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1135 a character position is a "Bufpos" and a byte position is a "Bytind".
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1136 For strings, these are sometimes typed using "Charcount" and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1137 "Bytecount". */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1138
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1139 /* Flags for the functions below are:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1140
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1141 GB_ALLOW_PAST_ACCESSIBLE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1142
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 120
diff changeset
1143 Allow positions to range over the entire buffer (BUF_BEG to BUF_Z),
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 120
diff changeset
1144 rather than just the accessible portion (BUF_BEGV to BUF_ZV).
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 120
diff changeset
1145 For strings, this flag has no effect.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1146
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1147 GB_COERCE_RANGE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1148
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 120
diff changeset
1149 If the position is outside the allowable range, return the lower
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 120
diff changeset
1150 or upper bound of the range, whichever is closer to the specified
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 120
diff changeset
1151 position.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1152
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1153 GB_NO_ERROR_IF_BAD
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1154
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1155 If the position is outside the allowable range, return -1.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1156
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1157 GB_NEGATIVE_FROM_END
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1158
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1159 If a value is negative, treat it as an offset from the end.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1160 Only applies to strings.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1161
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1162 The following additional flags apply only to the functions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1163 that return ranges:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1164
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1165 GB_ALLOW_NIL
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1166
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1167 Either or both positions can be nil. If FROM is nil,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1168 FROM_OUT will contain the lower bound of the allowed range.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1169 If TO is nil, TO_OUT will contain the upper bound of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1170 allowed range.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1171
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1172 GB_CHECK_ORDER
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1173
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1174 FROM must contain the lower bound and TO the upper bound
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1175 of the range. If the positions are reversed, an error is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1176 signalled.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1177
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1178 The following is a combination flag:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1179
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1180 GB_HISTORICAL_STRING_BEHAVIOR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1181
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1182 Equivalent to (GB_NEGATIVE_FROM_END | GB_ALLOW_NIL).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1183 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1184
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1185 /* Return a buffer position stored in a Lisp_Object. Full
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1186 error-checking is done on the position. Flags can be specified to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1187 control the behavior of out-of-range values. The default behavior
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1188 is to require that the position is within the accessible part of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1189 the buffer (BEGV and ZV), and to signal an error if the position is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1190 out of range.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1191
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1192 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1193
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1194 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1195 get_buffer_pos_char (struct buffer *b, Lisp_Object pos, unsigned int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1196 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1197 Bufpos ind;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1198 Bufpos min_allowed, max_allowed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1199
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1200 CHECK_INT_COERCE_MARKER (pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1201 ind = XINT (pos);
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 120
diff changeset
1202 min_allowed = flags & GB_ALLOW_PAST_ACCESSIBLE ? BUF_BEG (b) : BUF_BEGV (b);
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 120
diff changeset
1203 max_allowed = flags & GB_ALLOW_PAST_ACCESSIBLE ? BUF_Z (b) : BUF_ZV (b);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1204
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1205 if (ind < min_allowed || ind > max_allowed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1206 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1207 if (flags & GB_COERCE_RANGE)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1208 ind = ind < min_allowed ? min_allowed : max_allowed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1209 else if (flags & GB_NO_ERROR_IF_BAD)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1210 ind = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1211 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1212 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1213 Lisp_Object buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1214 XSETBUFFER (buffer, b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1215 args_out_of_range (buffer, pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1216 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1217 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1218
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1219 return ind;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1220 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1221
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1222 Bytind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1223 get_buffer_pos_byte (struct buffer *b, Lisp_Object pos, unsigned int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1224 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1225 Bufpos bpos = get_buffer_pos_char (b, pos, flags);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1226 if (bpos < 0) /* could happen with GB_NO_ERROR_IF_BAD */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1227 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1228 return bufpos_to_bytind (b, bpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1229 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1230
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1231 /* Return a pair of buffer positions representing a range of text,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1232 taken from a pair of Lisp_Objects. Full error-checking is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1233 done on the positions. Flags can be specified to control the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1234 behavior of out-of-range values. The default behavior is to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1235 allow the range bounds to be specified in either order
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1236 (however, FROM_OUT will always be the lower bound of the range
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1237 and TO_OUT the upper bound),to require that the positions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1238 are within the accessible part of the buffer (BEGV and ZV),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1239 and to signal an error if the positions are out of range.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1240 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1241
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1242 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1243 get_buffer_range_char (struct buffer *b, Lisp_Object from, Lisp_Object to,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1244 Bufpos *from_out, Bufpos *to_out, unsigned int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1245 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1246 Bufpos min_allowed, max_allowed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1247
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1248 min_allowed = (flags & GB_ALLOW_PAST_ACCESSIBLE) ?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1249 BUF_BEG (b) : BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1250 max_allowed = (flags & GB_ALLOW_PAST_ACCESSIBLE) ?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1251 BUF_Z (b) : BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1252
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1253 if (NILP (from) && (flags & GB_ALLOW_NIL))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1254 *from_out = min_allowed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1255 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1256 *from_out = get_buffer_pos_char (b, from, flags | GB_NO_ERROR_IF_BAD);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1257
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1258 if (NILP (to) && (flags & GB_ALLOW_NIL))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1259 *to_out = max_allowed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1260 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1261 *to_out = get_buffer_pos_char (b, to, flags | GB_NO_ERROR_IF_BAD);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1262
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1263 if ((*from_out < 0 || *to_out < 0) && !(flags & GB_NO_ERROR_IF_BAD))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1264 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1265 Lisp_Object buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1266 XSETBUFFER (buffer, b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1267 args_out_of_range_3 (buffer, from, to);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1268 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1269
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1270 if (*from_out >= 0 && *to_out >= 0 && *from_out > *to_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1271 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1272 if (flags & GB_CHECK_ORDER)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1273 signal_simple_error_2 ("start greater than end", from, to);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1274 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1275 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1276 Bufpos temp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1277
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1278 temp = *from_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1279 *from_out = *to_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1280 *to_out = temp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1281 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1282 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1283 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1284
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1285 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1286 get_buffer_range_byte (struct buffer *b, Lisp_Object from, Lisp_Object to,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1287 Bytind *from_out, Bytind *to_out, unsigned int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1288 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1289 Bufpos s, e;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1291 get_buffer_range_char (b, from, to, &s, &e, flags);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1292 if (s >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1293 *from_out = bufpos_to_bytind (b, s);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1294 else /* could happen with GB_NO_ERROR_IF_BAD */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1295 *from_out = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1296 if (e >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1297 *to_out = bufpos_to_bytind (b, e);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1298 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1299 *to_out = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1300 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1301
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1302 static Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1303 get_string_pos_char_1 (Lisp_Object string, Lisp_Object pos, unsigned int flags,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1304 Charcount known_length)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1305 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1306 Charcount ccpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1307 Charcount min_allowed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1308 Charcount max_allowed = known_length;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1309
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1310 /* Computation of KNOWN_LENGTH is potentially expensive so we pass
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1311 it in. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1312 CHECK_INT (pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1313 ccpos = XINT (pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1314 if (ccpos < 0 && flags & GB_NEGATIVE_FROM_END)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1315 ccpos += max_allowed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1316
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1317 if (ccpos < min_allowed || ccpos > max_allowed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1318 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1319 if (flags & GB_COERCE_RANGE)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1320 ccpos = ccpos < min_allowed ? min_allowed : max_allowed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1321 else if (flags & GB_NO_ERROR_IF_BAD)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1322 ccpos = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1323 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1324 args_out_of_range (string, pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1325 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1326
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1327 return ccpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1328 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1329
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1330 Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1331 get_string_pos_char (Lisp_Object string, Lisp_Object pos, unsigned int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1332 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1333 return get_string_pos_char_1 (string, pos, flags,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1334 string_char_length (XSTRING (string)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1335 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1336
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1337 Bytecount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1338 get_string_pos_byte (Lisp_Object string, Lisp_Object pos, unsigned int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1339 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1340 Charcount ccpos = get_string_pos_char (string, pos, flags);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1341 if (ccpos < 0) /* could happen with GB_NO_ERROR_IF_BAD */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1342 return -1;
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 0
diff changeset
1343 return charcount_to_bytecount (XSTRING_DATA (string), ccpos);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1344 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1345
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1346 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1347 get_string_range_char (Lisp_Object string, Lisp_Object from, Lisp_Object to,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1348 Charcount *from_out, Charcount *to_out,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1349 unsigned int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1350 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1351 Charcount min_allowed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1352 Charcount max_allowed = string_char_length (XSTRING (string));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1354 if (NILP (from) && (flags & GB_ALLOW_NIL))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1355 *from_out = min_allowed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1356 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1357 *from_out = get_string_pos_char_1 (string, from,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1358 flags | GB_NO_ERROR_IF_BAD,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1359 max_allowed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1360
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1361 if (NILP (to) && (flags & GB_ALLOW_NIL))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1362 *to_out = max_allowed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1363 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1364 *to_out = get_string_pos_char_1 (string, to,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1365 flags | GB_NO_ERROR_IF_BAD,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1366 max_allowed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1367
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1368 if ((*from_out < 0 || *to_out < 0) && !(flags & GB_NO_ERROR_IF_BAD))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1369 args_out_of_range_3 (string, from, to);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1370
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1371 if (*from_out >= 0 && *to_out >= 0 && *from_out > *to_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1372 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1373 if (flags & GB_CHECK_ORDER)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1374 signal_simple_error_2 ("start greater than end", from, to);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1375 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1376 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1377 Bufpos temp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1379 temp = *from_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1380 *from_out = *to_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1381 *to_out = temp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1382 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1383 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1384 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1385
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1386 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1387 get_string_range_byte (Lisp_Object string, Lisp_Object from, Lisp_Object to,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1388 Bytecount *from_out, Bytecount *to_out,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1389 unsigned int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1390 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1391 Charcount s, e;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1392
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1393 get_string_range_char (string, from, to, &s, &e, flags);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1394 if (s >= 0)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 0
diff changeset
1395 *from_out = charcount_to_bytecount (XSTRING_DATA (string), s);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1396 else /* could happen with GB_NO_ERROR_IF_BAD */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1397 *from_out = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1398 if (e >= 0)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 0
diff changeset
1399 *to_out = charcount_to_bytecount (XSTRING_DATA (string), e);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1400 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1401 *to_out = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1402
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1403 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1404
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1405 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1406 get_buffer_or_string_pos_char (Lisp_Object object, Lisp_Object pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1407 unsigned int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1408 {
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1409 return STRINGP (object) ?
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1410 get_string_pos_char (object, pos, flags) :
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1411 get_buffer_pos_char (XBUFFER (object), pos, flags);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1412 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1413
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1414 Bytind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1415 get_buffer_or_string_pos_byte (Lisp_Object object, Lisp_Object pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1416 unsigned int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1417 {
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1418 return STRINGP (object) ?
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1419 get_string_pos_byte (object, pos, flags) :
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1420 get_buffer_pos_byte (XBUFFER (object), pos, flags);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1421 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1422
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1423 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1424 get_buffer_or_string_range_char (Lisp_Object object, Lisp_Object from,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1425 Lisp_Object to, Bufpos *from_out,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1426 Bufpos *to_out, unsigned int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1427 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1428 if (STRINGP (object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1429 get_string_range_char (object, from, to, from_out, to_out, flags);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1430 else
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1431 get_buffer_range_char (XBUFFER (object), from, to, from_out, to_out, flags);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1432 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1433
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1434 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1435 get_buffer_or_string_range_byte (Lisp_Object object, Lisp_Object from,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1436 Lisp_Object to, Bytind *from_out,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1437 Bytind *to_out, unsigned int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1438 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1439 if (STRINGP (object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1440 get_string_range_byte (object, from, to, from_out, to_out, flags);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1441 else
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1442 get_buffer_range_byte (XBUFFER (object), from, to, from_out, to_out, flags);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1443 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1444
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1445 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1446 buffer_or_string_accessible_begin_char (Lisp_Object object)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1447 {
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1448 return STRINGP (object) ? 0 : BUF_BEGV (XBUFFER (object));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1449 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1450
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1451 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1452 buffer_or_string_accessible_end_char (Lisp_Object object)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1453 {
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1454 return STRINGP (object) ?
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1455 string_char_length (XSTRING (object)) : BUF_ZV (XBUFFER (object));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1456 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1457
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1458 Bytind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1459 buffer_or_string_accessible_begin_byte (Lisp_Object object)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1460 {
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1461 return STRINGP (object) ? 0 : BI_BUF_BEGV (XBUFFER (object));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1462 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1463
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1464 Bytind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1465 buffer_or_string_accessible_end_byte (Lisp_Object object)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1466 {
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1467 return STRINGP (object) ?
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1468 XSTRING_LENGTH (object) : BI_BUF_ZV (XBUFFER (object));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1469 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1470
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1471 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1472 buffer_or_string_absolute_begin_char (Lisp_Object object)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1473 {
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1474 return STRINGP (object) ? 0 : BUF_BEG (XBUFFER (object));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1475 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1476
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1477 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1478 buffer_or_string_absolute_end_char (Lisp_Object object)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1479 {
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1480 return STRINGP (object) ?
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1481 string_char_length (XSTRING (object)) : BUF_Z (XBUFFER (object));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1482 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1483
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1484 Bytind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1485 buffer_or_string_absolute_begin_byte (Lisp_Object object)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1486 {
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1487 return STRINGP (object) ? 0 : BI_BUF_BEG (XBUFFER (object));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1488 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1489
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1490 Bytind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1491 buffer_or_string_absolute_end_byte (Lisp_Object object)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1492 {
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1493 return STRINGP (object) ?
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 151
diff changeset
1494 XSTRING_LENGTH (object) : BI_BUF_Z (XBUFFER (object));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1495 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1496
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1497
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1498 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1499 /* point and marker adjustment */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1500 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1502 /* just_set_point() is the only place `PT' is an lvalue in all of emacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1503 This function is called from set_buffer_point(), which is the function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1504 that the SET_PT and BUF_SET_PT macros expand into, and from the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1505 routines below that insert and delete text. (This is in cases where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1506 the point marker logically doesn't move but PT (being a byte index)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1507 needs to get adjusted.) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1508
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1509 /* Set point to a specified value. This is used only when the value
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1510 of point changes due to an insert or delete; it does not represent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1511 a conceptual change in point as a marker. In particular, point is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1512 not crossing any interval boundaries, so there's no need to use the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1513 usual SET_PT macro. In fact it would be incorrect to do so, because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1514 either the old or the new value of point is out of synch with the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1515 current set of intervals. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1516
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1517 /* This gets called more than enough to make the function call
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1518 overhead a significant factor so we've turned it into a macro. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1519 #define JUST_SET_POINT(buf, bufpos, ind) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1520 do \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1521 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1522 buf->bufpt = (bufpos); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1523 buf->pt = (ind); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1524 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1525
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1526 /* Set a buffer's point. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1527
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1528 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1529 set_buffer_point (struct buffer *buf, Bufpos bufpos, Bytind bytpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1530 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1531 assert (bytpos >= BI_BUF_BEGV (buf) && bytpos <= BI_BUF_ZV (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1532 if (bytpos == BI_BUF_PT (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1533 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1534 JUST_SET_POINT (buf, bufpos, bytpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1535 MARK_POINT_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1536 assert (MARKERP (buf->point_marker));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1537 XMARKER (buf->point_marker)->memind =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1538 bytind_to_memind (buf, bytpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1539
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1540 /* FSF makes sure that PT is not being set within invisible text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1541 However, this is the wrong place for that check. The check
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1542 should happen only at the next redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1543
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1544 /* Some old coder said:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1546 "If there were to be hooks which were run when point entered/left an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1547 extent, this would be the place to put them.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1548
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1549 However, it's probably the case that such hooks should be implemented
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1550 using a post-command-hook instead, to avoid running the hooks as a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1551 result of intermediate motion inside of save-excursions, for example."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1552
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1553 I definitely agree with this. PT gets moved all over the place
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1554 and it would be a Bad Thing for any hooks to get called, both for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1555 the reason above and because many callers are not prepared for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1556 a GC within this function. --ben
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1557 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1558 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1559
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1560 /* Do the correct marker-like adjustment on MPOS (see below). FROM, TO,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1561 and AMOUNT are as in adjust_markers(). If MPOS doesn't need to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1562 adjusted, nothing will happen. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1563 Memind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1564 do_marker_adjustment (Memind mpos, Memind from,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1565 Memind to, Bytecount amount)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1566 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1567 if (amount > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1568 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1569 if (mpos > to && mpos < to + amount)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1570 mpos = to + amount;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1571 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1572 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1573 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1574 if (mpos > from + amount && mpos <= from)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1575 mpos = from + amount;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1576 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1577 if (mpos > from && mpos <= to)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1578 mpos += amount;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1579 return mpos;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1580 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1581
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1582 /* Do the following:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1583
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1584 (1) Add `amount' to the position of every marker in the current buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1585 whose current position is between `from' (exclusive) and `to' (inclusive).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1586
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1587 (2) Also, any markers past the outside of that interval, in the direction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1588 of adjustment, are first moved back to the near end of the interval
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1589 and then adjusted by `amount'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1590
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1591 This function is called in two different cases: when a region of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1592 characters adjacent to the gap is moved, causing the gap to shift
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1593 to the other side of the region (in this case, `from' and `to'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1594 point to the old position of the region and there should be no
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1595 markers affected by (2) because they would be inside the gap),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1596 or when a region of characters adjacent to the gap is wiped out,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1597 causing the gap to increase to include the region (in this case,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1598 `from' and `to' are the same, both pointing to the boundary
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1599 between the gap and the deleted region, and there are no markers
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1600 affected by (1)).
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1601
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1602 The reason for the use of exclusive and inclusive is that markers at
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1603 the gap always sit at the beginning, not at the end.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1604 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1605
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1606 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1607 adjust_markers (struct buffer *buf, Memind from, Memind to,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1608 Bytecount amount)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1609 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1610 struct Lisp_Marker *m;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1611
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1612 for (m = BUF_MARKERS (buf); m; m = marker_next (m))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1613 m->memind = do_marker_adjustment (m->memind, from, to, amount);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1614 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1615
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1616 /* Adjust markers whose insertion-type is t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1617 for an insertion of AMOUNT characters at POS. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1618
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1619 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1620 adjust_markers_for_insert (struct buffer *buf, Memind ind, Bytecount amount)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1621 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1622 struct Lisp_Marker *m;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1623
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1624 for (m = BUF_MARKERS (buf); m; m = marker_next (m))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1625 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1626 if (m->insertion_type && m->memind == ind)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1627 m->memind += amount;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1628 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1629 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1630
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1631
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1632 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1633 /* Routines for dealing with the gap */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1634 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1635
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1636 /* XEmacs requires an ANSI C compiler, and it damn well better have a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1637 working memmove() */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1638 #define GAP_USE_BCOPY
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1639 #ifdef BCOPY_UPWARD_SAFE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1640 # undef BCOPY_UPWARD_SAFE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1641 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1642 #ifdef BCOPY_DOWNWARD_SAFE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1643 # undef BCOPY_DOWNWARD_SAFE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1644 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1645 #define BCOPY_UPWARD_SAFE 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1646 #define BCOPY_DOWNWARD_SAFE 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1647
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1648 /* maximum amount of memory moved in a single chunk. Increasing this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1649 value improves gap-motion efficiency but decreases QUIT responsiveness
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1650 time. Was 32000 but today's processors are faster and files are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1651 bigger. --ben */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1652 #define GAP_MOVE_CHUNK 300000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1653
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1654 /* Move the gap to POS, which is less than the current GPT. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1655
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1656 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1657 gap_left (struct buffer *buf, Bytind pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1658 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1659 Bufbyte *to, *from;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1660 Bytecount i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1661 Bytind new_s1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1662
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1663 from = BUF_GPT_ADDR (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1664 to = from + BUF_GAP_SIZE (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1665 new_s1 = BI_BUF_GPT (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1666
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1667 /* Now copy the characters. To move the gap down,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1668 copy characters up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1669
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1670 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1671 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1672 /* I gets number of characters left to copy. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1673 i = new_s1 - pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1674 if (i == 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1675 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1676 /* If a quit is requested, stop copying now.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1677 Change POS to be where we have actually moved the gap to. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1678 if (QUITP)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1679 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1680 pos = new_s1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1681 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1682 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1683 /* Move at most GAP_MOVE_CHUNK chars before checking again for a quit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1684 if (i > GAP_MOVE_CHUNK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1685 i = GAP_MOVE_CHUNK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1686 #ifdef GAP_USE_BCOPY
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1687 if (i >= 128
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1688 /* bcopy is safe if the two areas of memory do not overlap
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1689 or on systems where bcopy is always safe for moving upward. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1690 && (BCOPY_UPWARD_SAFE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1691 || to - from >= 128))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1692 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1693 /* If overlap is not safe, avoid it by not moving too many
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1694 characters at once. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1695 if (!BCOPY_UPWARD_SAFE && i > to - from)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1696 i = to - from;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1697 new_s1 -= i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1698 from -= i, to -= i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1699 memmove (to, from, i);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1700 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1701 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1702 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1703 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1704 new_s1 -= i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1705 while (--i >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1706 *--to = *--from;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1707 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1708 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1709
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1710 /* Adjust markers, and buffer data structure, to put the gap at POS.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1711 POS is where the loop above stopped, which may be what was specified
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1712 or may be where a quit was detected. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1713 adjust_markers (buf, pos, BI_BUF_GPT (buf), BUF_GAP_SIZE (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1714 adjust_extents (make_buffer (buf), pos, BI_BUF_GPT (buf),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1715 BUF_GAP_SIZE (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1716 SET_BI_BUF_GPT (buf, pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1717 SET_GAP_SENTINEL (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1718 #ifdef ERROR_CHECK_EXTENTS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1719 sledgehammer_extent_check (make_buffer (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1720 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1721 QUIT;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1722 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1723
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1724 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1725 gap_right (struct buffer *buf, Bytind pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1726 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1727 Bufbyte *to, *from;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1728 Bytecount i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1729 Bytind new_s1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1730
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1731 to = BUF_GPT_ADDR (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1732 from = to + BUF_GAP_SIZE (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1733 new_s1 = BI_BUF_GPT (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1734
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1735 /* Now copy the characters. To move the gap up,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1736 copy characters down. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1737
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1738 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1739 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1740 /* I gets number of characters left to copy. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1741 i = pos - new_s1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1742 if (i == 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1743 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1744 /* If a quit is requested, stop copying now.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1745 Change POS to be where we have actually moved the gap to. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1746 if (QUITP)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1747 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1748 pos = new_s1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1749 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1750 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1751 /* Move at most GAP_MOVE_CHUNK chars before checking again for a quit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1752 if (i > GAP_MOVE_CHUNK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1753 i = GAP_MOVE_CHUNK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1754 #ifdef GAP_USE_BCOPY
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1755 if (i >= 128
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1756 /* bcopy is safe if the two areas of memory do not overlap
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1757 or on systems where bcopy is always safe for moving downward. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1758 && (BCOPY_DOWNWARD_SAFE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1759 || from - to >= 128))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1760 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1761 /* If overlap is not safe, avoid it by not moving too many
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1762 characters at once. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1763 if (!BCOPY_DOWNWARD_SAFE && i > from - to)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1764 i = from - to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1765 new_s1 += i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1766 memmove (to, from, i);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1767 from += i, to += i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1768 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1769 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1770 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1771 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1772 new_s1 += i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1773 while (--i >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1774 *to++ = *from++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1775 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1776 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1777
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1778 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1779 int gsize = BUF_GAP_SIZE (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1780 adjust_markers (buf, BI_BUF_GPT (buf) + gsize, pos + gsize, - gsize);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1781 adjust_extents (make_buffer (buf), BI_BUF_GPT (buf) + gsize, pos + gsize,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1782 - gsize);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1783 SET_BI_BUF_GPT (buf, pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1784 SET_GAP_SENTINEL (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1785 #ifdef ERROR_CHECK_EXTENTS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1786 sledgehammer_extent_check (make_buffer (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1787 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1788 }
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1789 if (pos == BI_BUF_Z (buf))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1790 {
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1791 /* merge gap with end gap */
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1792
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1793 SET_BUF_GAP_SIZE (buf, BUF_GAP_SIZE (buf) + BUF_END_GAP_SIZE (buf));
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1794 SET_BUF_END_GAP_SIZE (buf, 0);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1795 SET_END_SENTINEL (buf);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1796 }
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1797
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1798 QUIT;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1799 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1800
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1801 /* Move gap to position `pos'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1802 Note that this can quit! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1803
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1804 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1805 move_gap (struct buffer *buf, Bytind pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1806 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1807 if (! BUF_BEG_ADDR (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1808 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1809 if (pos < BI_BUF_GPT (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1810 gap_left (buf, pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1811 else if (pos > BI_BUF_GPT (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1812 gap_right (buf, pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1813 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1814
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1815 /* Merge the end gap into the gap */
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1816
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1817 static void
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1818 merge_gap_with_end_gap (struct buffer *buf)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1819 {
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1820 Lisp_Object tem;
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1821 Bytind real_gap_loc;
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1822 Bytecount old_gap_size;
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1823 Bytecount increment;
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1824
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1825 increment = BUF_END_GAP_SIZE (buf);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1826 SET_BUF_END_GAP_SIZE (buf, 0);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1827
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1828 if (increment > 0)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1829 {
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1830 /* Prevent quitting in move_gap. */
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1831 tem = Vinhibit_quit;
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1832 Vinhibit_quit = Qt;
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1833
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1834 real_gap_loc = BI_BUF_GPT (buf);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1835 old_gap_size = BUF_GAP_SIZE (buf);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1836
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1837 /* Pretend the end gap is the gap */
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1838 SET_BI_BUF_GPT (buf, BI_BUF_Z (buf) + BUF_GAP_SIZE (buf));
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1839 SET_BUF_GAP_SIZE (buf, increment);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1840
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1841 /* Move the new gap down to be consecutive with the end of the old one.
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1842 This adjusts the markers properly too. */
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1843 gap_left (buf, real_gap_loc + old_gap_size);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1844
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1845 /* Now combine the two into one large gap. */
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1846 SET_BUF_GAP_SIZE (buf, BUF_GAP_SIZE (buf) + old_gap_size);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1847 SET_BI_BUF_GPT (buf, real_gap_loc);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1848 SET_GAP_SENTINEL (buf);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1849
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1850 /* We changed the total size of the buffer (including gap),
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1851 so we need to fix up the end sentinel. */
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1852 SET_END_SENTINEL (buf);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1853
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1854 Vinhibit_quit = tem;
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1855 }
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1856 }
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1857
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1858 /* Make the gap INCREMENT bytes longer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1859
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1860 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1861 make_gap (struct buffer *buf, Bytecount increment)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1862 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1863 Bufbyte *result;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1864 Lisp_Object tem;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1865 Bytind real_gap_loc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1866 Bytecount old_gap_size;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1867
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1868 /* If we have to get more space, get enough to last a while. We use
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1869 a geometric progession that saves on realloc space. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1870 increment += 2000 + ((BI_BUF_Z (buf) - BI_BUF_BEG (buf)) / 8);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1871
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1872 if (increment > BUF_END_GAP_SIZE (buf))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1873 {
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1874 /* Don't allow a buffer size that won't fit in an int
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1875 even if it will fit in a Lisp integer.
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1876 That won't work because so many places use `int'. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1877
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1878 if (BUF_Z (buf) - BUF_BEG (buf) + BUF_GAP_SIZE (buf) + increment
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1879 >= ((unsigned) 1 << (min (INTBITS, VALBITS) - 1)))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1880 error ("Buffer exceeds maximum size");
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1881
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1882 result = BUFFER_REALLOC (buf->text->beg,
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1883 BI_BUF_Z (buf) - BI_BUF_BEG (buf) +
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1884 BUF_GAP_SIZE (buf) + increment +
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1885 BUF_END_SENTINEL_SIZE);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1886 if (result == 0)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1887 memory_full ();
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1888
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1889 SET_BUF_BEG_ADDR (buf, result);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1890 }
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1891 else
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1892 increment = BUF_END_GAP_SIZE (buf);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1893
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1894 /* Prevent quitting in move_gap. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1895 tem = Vinhibit_quit;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1896 Vinhibit_quit = Qt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1897
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1898 real_gap_loc = BI_BUF_GPT (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1899 old_gap_size = BUF_GAP_SIZE (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1900
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1901 /* Call the newly allocated space a gap at the end of the whole space. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1902 SET_BI_BUF_GPT (buf, BI_BUF_Z (buf) + BUF_GAP_SIZE (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1903 SET_BUF_GAP_SIZE (buf, increment);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1904
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1905 SET_BUF_END_GAP_SIZE (buf, 0);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
1906
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1907 /* Move the new gap down to be consecutive with the end of the old one.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1908 This adjusts the markers properly too. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1909 gap_left (buf, real_gap_loc + old_gap_size);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1910
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1911 /* Now combine the two into one large gap. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1912 SET_BUF_GAP_SIZE (buf, BUF_GAP_SIZE (buf) + old_gap_size);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1913 SET_BI_BUF_GPT (buf, real_gap_loc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1914 SET_GAP_SENTINEL (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1915
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1916 /* We changed the total size of the buffer (including gap),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1917 so we need to fix up the end sentinel. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1918 SET_END_SENTINEL (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1919
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1920 Vinhibit_quit = tem;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1921 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1922
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1923
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1924 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1925 /* Before/after-change processing */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1926 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1927
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1928 /* Those magic changes ... */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1929
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1930 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1931 buffer_signal_changed_region (struct buffer *buf, Bufpos start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1932 Bufpos end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1933 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1934 /* The changed region is recorded as the number of unchanged
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1935 characters from the beginning and from the end of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1936 buffer. This obviates much of the need of shifting the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1937 region around to compensate for insertions and deletions.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1938 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1939 if (buf->changes->begin_unchanged < 0 ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1940 buf->changes->begin_unchanged > start - BUF_BEG (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1941 buf->changes->begin_unchanged = start - BUF_BEG (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1942 if (buf->changes->end_unchanged < 0 ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1943 buf->changes->end_unchanged > BUF_Z (buf) - end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1944 buf->changes->end_unchanged = BUF_Z (buf) - end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1945 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1946
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1947 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1948 buffer_extent_signal_changed_region (struct buffer *buf, Bufpos start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1949 Bufpos end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1950 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1951 if (buf->changes->begin_extent_unchanged < 0 ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1952 buf->changes->begin_extent_unchanged > start - BUF_BEG (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1953 buf->changes->begin_extent_unchanged = start - BUF_BEG (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1954 if (buf->changes->end_extent_unchanged < 0 ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1955 buf->changes->end_extent_unchanged > BUF_Z (buf) - end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1956 buf->changes->end_extent_unchanged = BUF_Z (buf) - end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1957 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1958
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1959 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1960 buffer_reset_changes (struct buffer *buf)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1961 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1962 buf->changes->begin_unchanged = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1963 buf->changes->end_unchanged = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1964 buf->changes->begin_extent_unchanged = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1965 buf->changes->end_extent_unchanged = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1966 buf->changes->newline_was_deleted = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1967 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1968
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1969 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1970 signal_after_change (struct buffer *buf, Bufpos start, Bufpos orig_end,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1971 Bufpos new_end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1972
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1973
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1974 /* Call the after-change-functions according to the changes made so far
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1975 and treat all further changes as single until the outermost
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1976 multiple change exits. This is called when the outermost multiple
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1977 change exits and when someone is trying to make a change that violates
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1978 the constraints specified in begin_multiple_change(), typically
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1979 when nested multiple-change sessions occur. (There are smarter ways of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1980 dealing with nested multiple changes, but these rarely occur so there's
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1981 probably no point in it.) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1982
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1983 /* #### This needs to keep track of what actually changed and only
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1984 call the after-change functions on that region. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1985
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1986 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1987 cancel_multiple_change (struct buffer *buf)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1988 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1989 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1990 /* Call the after-change-functions except when they've already been
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1991 called or when there were no changes made to the buffer at all. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1992 if (buf->text->changes->mc_begin != 0 &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1993 buf->text->changes->mc_begin_signaled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1994 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1995 Bufpos real_mc_begin = buf->text->changes->mc_begin;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1996 buf->text->changes->mc_begin = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1997
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1998 signal_after_change (buf, real_mc_begin, buf->text->changes->mc_orig_end,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1999 buf->text->changes->mc_new_end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2000 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2001 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2002 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2003 buf->text->changes->mc_begin = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2004 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2005 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2006
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2007 /* this is an unwind_protect, to ensure that the after-change-functions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2008 get called even in a non-local exit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2009
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2010 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2011 multiple_change_finish_up (Lisp_Object buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2012 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2013 struct buffer *buf = XBUFFER (buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2014
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2015 /* #### I don't know whether or not it should even be possible to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2016 get here with a dead buffer (though given how it is called I can
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2017 see how it might be). In any case, there isn't time before 19.14
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2018 to find out. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2019 if (!BUFFER_LIVE_P (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2020 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2021
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2022 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2023 buf->text->changes->in_multiple_change = 0; /* do this first so that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2024 errors in the after-change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2025 functions don't mess things
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2026 up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2027 cancel_multiple_change (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2028 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2029 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2030
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2031 /* Call this function when you're about to make a number of buffer changes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2032 that should be considered a single change. (e.g. `replace-match' calls
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2033 this.) You need to specify the START and END of the region that is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2034 going to be changed so that the before-change-functions are called
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2035 with the correct arguments. The after-change region is calculated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2036 automatically, however, and if changes somehow or other happen outside
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2037 of the specified region, that will also be handled correctly.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2038
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2039 begin_multiple_change() returns a number (actually a specpdl depth)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2040 that you must pass to end_multiple_change() when you are done. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2041
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2042 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2043 begin_multiple_change (struct buffer *buf, Bufpos start, Bufpos end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2044 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2045 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2046 int count = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2047 if (buf->text->changes->in_multiple_change)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2048 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2049 if (buf->text->changes->mc_begin != 0 &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2050 (start < buf->text->changes->mc_begin ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2051 end > buf->text->changes->mc_new_end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2052 cancel_multiple_change (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2053 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2054 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2055 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2056 Lisp_Object buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2057
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2058 buf->text->changes->mc_begin = start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2059 buf->text->changes->mc_orig_end = buf->text->changes->mc_new_end = end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2060 buf->text->changes->mc_begin_signaled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2061 count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2062 XSETBUFFER (buffer, buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2063 record_unwind_protect (multiple_change_finish_up, buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2064 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2065 buf->text->changes->in_multiple_change++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2066 /* We don't call before-change-functions until signal_before_change()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2067 is called, in case there is a read-only or other error. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2068 return count;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2069 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2070
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2071 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2072 end_multiple_change (struct buffer *buf, int count)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2073 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2074 assert (buf->text->changes->in_multiple_change > 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2075 buf->text->changes->in_multiple_change--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2076 if (!buf->text->changes->in_multiple_change)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2077 unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2078 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2079
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2080 static int inside_change_hook;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2081
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2082 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2083 change_function_restore (Lisp_Object buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2084 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2085 Fset_buffer (buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2086 inside_change_hook = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2087 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2088 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2089
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2090 static int in_first_change;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2091
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2092 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2093 first_change_hook_restore (Lisp_Object buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2094 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2095 Fset_buffer (buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2096 in_first_change = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2097 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2098 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2099
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2100 /* Signal an initial modification to the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2102 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2103 signal_first_change (struct buffer *buf)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2104 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2105 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2106 Lisp_Object buffer;
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
2107 XSETBUFFER (buffer, current_buffer);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2108
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2109 if (!in_first_change)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2110 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2111 if (!preparing_for_armageddon &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2112 !NILP (symbol_value_in_buffer (Qfirst_change_hook, buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2113 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2114 int speccount = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2115 record_unwind_protect (first_change_hook_restore, buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2116 set_buffer_internal (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2117 in_first_change = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2118 run_hook (Qfirst_change_hook);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2119 unbind_to (speccount, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2120 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2121 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2122 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2123
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2124 /* Signal a change to the buffer immediately before it happens.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2125 START and END are the bounds of the text to be changed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2126
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2127 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2128 signal_before_change (struct buffer *buf, Bufpos start, Bufpos end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2129 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2130 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2131 Lisp_Object buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2132 XSETBUFFER (buffer, buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2133
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2134 if (!inside_change_hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2135 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2136 /* Are we in a multiple-change session? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2137 if (buf->text->changes->in_multiple_change &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2138 buf->text->changes->mc_begin != 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2139 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2140 /* If we're violating the constraints of the session,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2141 call the after-change-functions as necessary for the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2142 changes already made and treat further changes as
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2143 single. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2144 if (start < buf->text->changes->mc_begin ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2145 end > buf->text->changes->mc_new_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2146 cancel_multiple_change (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2147 /* Do nothing if this is not the first change in the session. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2148 else if (buf->text->changes->mc_begin_signaled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2149 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2150 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2151 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2152 /* First time through; call the before-change-functions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2153 specifying the entire region to be changed. (Note that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2154 we didn't call before-change-functions in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2155 begin_multiple_change() because the buffer might be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2156 read-only, etc.) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2157 start = buf->text->changes->mc_begin;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2158 end = buf->text->changes->mc_new_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2159 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2160 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2161
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2162 /* If buffer is unmodified, run a special hook for that case. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2163 if (BUF_SAVE_MODIFF (buf) >= BUF_MODIFF (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2164 signal_first_change (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2165
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2166 /* Now in any case run the before-change-functions if any. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2167
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2168 if (!preparing_for_armageddon &&
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 114
diff changeset
2169 !EQ (buffer, Vprin1_to_string_buffer) &&
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2170 (!NILP (symbol_value_in_buffer (Qbefore_change_functions, buffer)) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2171 /* Obsolete, for compatibility */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2172 !NILP (symbol_value_in_buffer (Qbefore_change_function, buffer))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2173 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2174 int speccount = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2175 record_unwind_protect (change_function_restore, Fcurrent_buffer ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2176 set_buffer_internal (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2177 inside_change_hook = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2178 va_run_hook_with_args (Qbefore_change_functions, 2,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2179 make_int (start), make_int (end));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2180 /* Obsolete, for compatibility */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2181 va_run_hook_with_args (Qbefore_change_function, 2,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2182 make_int (start), make_int (end));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2183 unbind_to (speccount, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2184 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2185
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2186 /* Only now do we indicate that the before-change-functions have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2187 been called, in case some function throws out. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2188 buf->text->changes->mc_begin_signaled = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2189 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2190
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2191 /* #### At this point we should map over extents calling
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2192 modification-hooks, insert-before-hooks and insert-after-hooks
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2193 of relevant extents */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2194 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2195
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2196 /* Signal a change immediately after it happens.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2197 START is the bufpos of the start of the changed text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2198 ORIG_END is the bufpos of the end of the before-changed text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2199 NEW_END is the bufpos of the end of the after-changed text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2200 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2201
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2202 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2203 signal_after_change (struct buffer *buf, Bufpos start, Bufpos orig_end,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2204 Bufpos new_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2205 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2206 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2207 Lisp_Object buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2208 XSETBUFFER (buffer, buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2209
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2210 /* always do this. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2211 buffer_signal_changed_region (buf, start, new_end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2212 font_lock_maybe_update_syntactic_caches (buf, start, orig_end, new_end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2213
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2214 if (!inside_change_hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2215 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2216 if (buf->text->changes->in_multiple_change &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2217 buf->text->changes->mc_begin != 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2218 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2219 assert (start >= buf->text->changes->mc_begin &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2220 start <= buf->text->changes->mc_new_end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2221 assert (orig_end >= buf->text->changes->mc_begin &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2222 orig_end <= buf->text->changes->mc_new_end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2223 buf->text->changes->mc_new_end += new_end - orig_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2224 return; /* after-change-functions signalled when all changes done */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2225 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2226
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2227 if (!preparing_for_armageddon &&
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 114
diff changeset
2228 !EQ (buffer, Vprin1_to_string_buffer) &&
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2229 (!NILP (symbol_value_in_buffer (Qafter_change_functions, buffer)) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2230 /* Obsolete, for compatibility */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2231 !NILP (symbol_value_in_buffer (Qafter_change_function, buffer))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2232 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2233 int speccount = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2234 record_unwind_protect (change_function_restore, Fcurrent_buffer ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2235 set_buffer_internal (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2236 inside_change_hook = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2237 /* The actual after-change functions take slightly
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2238 different arguments than what we were passed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2239 va_run_hook_with_args (Qafter_change_functions, 3,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2240 make_int (start), make_int (new_end),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2241 make_int (orig_end - start));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2242 /* Obsolete, for compatibility */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2243 va_run_hook_with_args (Qafter_change_function, 3,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2244 make_int (start), make_int (new_end),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2245 make_int (orig_end - start));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2246 unbind_to (speccount, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2247 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2248 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2249
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2250 /* #### At this point we should map over extents calling
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2251 some sort of modification hooks of relevant extents */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2252 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2253
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2254 /* Call this if you're about to change the region of BUFFER from START
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2255 to END. This checks the read-only properties of the region, calls
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2256 the necessary modification hooks, and warns the next redisplay that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2257 it should pay attention to that area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2258
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2259 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2260 prepare_to_modify_buffer (struct buffer *buf, Bufpos start, Bufpos end,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2261 int lockit)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2262 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2263 /* This function can GC */
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 98
diff changeset
2264 /* dmoore - This function can also kill the buffer buf, the current
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 98
diff changeset
2265 buffer, and do anything it pleases. So if you call it, be
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 98
diff changeset
2266 careful. */
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 98
diff changeset
2267 Lisp_Object buffer;
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 98
diff changeset
2268 struct gcpro gcpro1;
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 98
diff changeset
2269
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2270 barf_if_buffer_read_only (buf, start, end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2271
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2272 /* if this is the first modification, see about locking the buffer's
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2273 file */
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 98
diff changeset
2274 XSETBUFFER (buffer, buf);
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 98
diff changeset
2275 GCPRO1 (buffer);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2276 if (!NILP (buf->filename) && lockit &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2277 BUF_SAVE_MODIFF (buf) >= BUF_MODIFF (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2278 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2279 #ifdef CLASH_DETECTION
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2280 if (!NILP (buf->file_truename))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2281 /* Make binding buffer-file-name to nil effective. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2282 lock_file (buf->file_truename);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2283 #else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2284 /* At least warn if this file has changed on disk since it was visited.*/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2285 if (NILP (Fverify_visited_file_modtime (buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2286 && !NILP (Ffile_exists_p (buf->filename)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2287 call1_in_buffer (buf, intern ("ask-user-about-supersession-threat"),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2288 buf->filename);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2289 #endif /* not CLASH_DETECTION */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2290 }
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 98
diff changeset
2291 UNGCPRO;
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 98
diff changeset
2292
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 98
diff changeset
2293 /* #### dmoore - is this reasonable in case of buf being killed above? */
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 98
diff changeset
2294 if (!BUFFER_LIVE_P (buf))
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 98
diff changeset
2295 return;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2296
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2297 signal_before_change (buf, start, end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2298
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2299 #ifdef REGION_CACHE_NEEDS_WORK
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2300 if (buf->newline_cache)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2301 invalidate_region_cache (buf,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2302 buf->newline_cache,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2303 start - BUF_BEG (buf), BUF_Z (buf) - end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2304 if (buf->width_run_cache)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2305 invalidate_region_cache (buf,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2306 buf->width_run_cache,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2307 start - BUF_BEG (buf), BUF_Z (buf) - end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2308 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2309
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2310 #if 0 /* FSFmacs */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2311 Vdeactivate_mark = Qt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2312 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2313
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2314 buf->point_before_scroll = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2315 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2316
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2317
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2318 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2319 /* Insertion of strings */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2320 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2321
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2322 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2323 fixup_internal_substring (CONST Bufbyte *nonreloc, Lisp_Object reloc,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2324 Bytecount offset, Bytecount *len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2325 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2326 assert ((nonreloc && NILP (reloc)) || (!nonreloc && STRINGP (reloc)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2327
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2328 if (*len < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2329 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2330 if (nonreloc)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2331 *len = strlen ((CONST char *) nonreloc) - offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2332 else
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 0
diff changeset
2333 *len = XSTRING_LENGTH (reloc) - offset;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2334 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2335 assert (*len >= 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2336 if (STRINGP (reloc))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2337 {
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 0
diff changeset
2338 assert (offset >= 0 && offset <= XSTRING_LENGTH (reloc));
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 0
diff changeset
2339 assert (offset + *len <= XSTRING_LENGTH (reloc));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2340 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2341 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2342
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2343 /* Insert a string into BUF at Bufpos POS. The string data comes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2344 from one of two sources: constant, non-relocatable data (specified
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2345 in NONRELOC), or a Lisp string object (specified in RELOC), which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2346 is relocatable and may have extent data that needs to be copied
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2347 into the buffer. OFFSET and LENGTH specify the substring of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2348 data that is actually to be inserted. As a special case, if POS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2349 is -1, insert the string at point and move point to the end of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2350 string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2351
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2352 Normally, markers at the insertion point end up before the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2353 inserted string. If INSDEL_BEFORE_MARKERS is set in flags, however,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2354 they end up after the string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2355
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2356 INSDEL_NO_LOCKING is kludgy and is used when insert-file-contents is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2357 visiting a new file; it inhibits the locking checks normally done
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2358 before modifying a buffer. Similar checks were already done
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2359 in the higher-level Lisp functions calling insert-file-contents. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2360
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2361 Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2362 buffer_insert_string_1 (struct buffer *buf, Bufpos pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2363 CONST Bufbyte *nonreloc, Lisp_Object reloc,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2364 Bytecount offset, Bytecount length,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2365 int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2366 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2367 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2368 struct gcpro gcpro1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2369 Bytind ind;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2370 Charcount cclen;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2371 int move_point = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2372
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2373 /* Defensive steps just in case a buffer gets deleted and a calling
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2374 function doesn't notice it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2375 if (!BUFFER_LIVE_P (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2376 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2378 fixup_internal_substring (nonreloc, reloc, offset, &length);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2379
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2380 if (pos == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2381 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2382 pos = BUF_PT (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2383 move_point = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2384 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2385
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2386 #ifdef I18N3
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2387 /* #### See the comment in print_internal(). If this buffer is marked
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2388 as translatable, then Fgettext() should be called on obj if it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2389 is a string. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2390 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2391
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2392 /* Make sure that point-max won't exceed the size of an emacs int. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2393 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2394 Lisp_Object temp;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2395
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2396 XSETINT (temp, (int) (length + BUF_Z (buf)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2397 if ((int) (length + BUF_Z (buf)) != XINT (temp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2398 error ("maximum buffer size exceeded");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2399 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2400
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2401 /* theoretically not necessary -- caller should GCPRO */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2402 GCPRO1 (reloc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2403
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2404 prepare_to_modify_buffer (buf, pos, pos, !(flags & INSDEL_NO_LOCKING));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2405
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2406 /* Defensive steps in case the before-change-functions fuck around */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2407 if (!BUFFER_LIVE_P (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2408 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2409 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2410 /* Bad bad pre-change function. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2411 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2412 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2413
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2414 /* Make args be valid again. prepare_to_modify_buffer() might have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2415 modified the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2416 if (pos < BUF_BEGV (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2417 pos = BUF_BEGV (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2418 if (pos > BUF_ZV (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2419 pos = BUF_ZV (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2420
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2421 /* string may have been relocated up to this point */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2422 if (STRINGP (reloc))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 0
diff changeset
2423 nonreloc = XSTRING_DATA (reloc);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2424
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2425 ind = bufpos_to_bytind (buf, pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2426 cclen = bytecount_to_charcount (nonreloc + offset, length);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2427
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2428 if (ind != BI_BUF_GPT (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2429 /* #### if debug-on-quit is invoked and the user changes the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2430 buffer, bad things can happen. This is a rampant problem
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2431 in Emacs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2432 move_gap (buf, ind); /* may QUIT */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2433 if (! GAP_CAN_HOLD_SIZE_P (buf, length))
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2434 {
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2435 if (BUF_END_GAP_SIZE (buf) >= length)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2436 merge_gap_with_end_gap (buf);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2437 else
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2438 make_gap (buf, length - BUF_GAP_SIZE (buf));
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2439 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2440
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2441 record_insert (buf, pos, cclen);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2442 BUF_MODIFF (buf)++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2443 MARK_BUFFERS_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2444
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2445 /* string may have been relocated up to this point */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2446 if (STRINGP (reloc))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 0
diff changeset
2447 nonreloc = XSTRING_DATA (reloc);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2448
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2449 memcpy (BUF_GPT_ADDR (buf), nonreloc + offset, length);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2450
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2451 SET_BUF_GAP_SIZE (buf, BUF_GAP_SIZE (buf) - length);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2452 SET_BI_BUF_GPT (buf, BI_BUF_GPT (buf) + length);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2453 SET_BOTH_BUF_ZV (buf, BUF_ZV (buf) + cclen, BI_BUF_ZV (buf) + length);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2454 SET_BOTH_BUF_Z (buf, BUF_Z (buf) + cclen, BI_BUF_Z (buf) + length);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2455 SET_GAP_SENTINEL (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2456
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2457 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2458 buffer_mule_signal_inserted_region (buf, pos, length, cclen);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2459 #endif
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2460
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2461 process_extents_for_insertion (make_buffer (buf), ind, length);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2462 /* We know the gap is at IND so the cast is OK. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2463 adjust_markers_for_insert (buf, (Memind) ind, length);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2464
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2465 /* Point logically doesn't move, but may need to be adjusted because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2466 it's a byte index. point-marker doesn't change because it's a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2467 memory index. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2468 if (BI_BUF_PT (buf) > ind)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2469 JUST_SET_POINT (buf, BUF_PT (buf) + cclen, BI_BUF_PT (buf) + length);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2470
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2471 /* Well, point might move. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2472 if (move_point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2473 BI_BUF_SET_PT (buf, ind + length);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2474
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2475 if (STRINGP (reloc))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2476 splice_in_string_extents (reloc, buf, ind, length, offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2477
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2478 if (flags & INSDEL_BEFORE_MARKERS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2479 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2480 /* ind - 1 is correct because the FROM argument is exclusive.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2481 I formerly used DEC_BYTIND() but that caused problems at the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2482 beginning of the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2483 adjust_markers (buf, ind - 1, ind, length);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2484 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2485
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2486 signal_after_change (buf, pos, pos, pos + cclen);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2487
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2488 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2489
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2490 return cclen;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2491 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2492
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2493
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2494 /* The following functions are interfaces onto the above function,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2495 for inserting particular sorts of data. In all the functions,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2496 BUF and POS specify the buffer and location where the insertion is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2497 to take place. (If POS is -1, text is inserted at point and point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2498 moves forward past the text.) FLAGS is as above. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2499
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2500 Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2501 buffer_insert_raw_string_1 (struct buffer *buf, Bufpos pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2502 CONST Bufbyte *nonreloc, Bytecount length,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2503 int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2504 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2505 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2506 return buffer_insert_string_1 (buf, pos, nonreloc, Qnil, 0, length,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2507 flags);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2508 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2509
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2510 Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2511 buffer_insert_lisp_string_1 (struct buffer *buf, Bufpos pos, Lisp_Object str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2512 int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2513 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2514 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2515 assert (STRINGP (str));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2516 return buffer_insert_string_1 (buf, pos, 0, str, 0,
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 0
diff changeset
2517 XSTRING_LENGTH (str),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2518 flags);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2519 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2520
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2521 /* Insert the null-terminated string S (in external format). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2522
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2523 Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2524 buffer_insert_c_string_1 (struct buffer *buf, Bufpos pos, CONST char *s,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2525 int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2526 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2527 /* This function can GC */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2528
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2529 CONST char *translated = GETTEXT (s);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2530 return buffer_insert_string_1 (buf, pos, (CONST Bufbyte *) translated, Qnil,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2531 0, strlen (translated), flags);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2532 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2533
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2534 Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2535 buffer_insert_emacs_char_1 (struct buffer *buf, Bufpos pos, Emchar ch,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2536 int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2537 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2538 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2539 Bufbyte str[MAX_EMCHAR_LEN];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2540 Bytecount len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2541
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2542 len = set_charptr_emchar (str, ch);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2543 return buffer_insert_string_1 (buf, pos, str, Qnil, 0, len, flags);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2544 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2546 Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2547 buffer_insert_c_char_1 (struct buffer *buf, Bufpos pos, char c,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2548 int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2549 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2550 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2551 return buffer_insert_emacs_char_1 (buf, pos, (Emchar) (unsigned char) c,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2552 flags);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2553 }
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2554
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2555 Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2556 buffer_insert_from_buffer_1 (struct buffer *buf, Bufpos pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2557 struct buffer *buf2, Bufpos pos2,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2558 Charcount length, int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2559 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2560 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2561 Lisp_Object str = make_string_from_buffer (buf2, pos2, length);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2562 return buffer_insert_string_1 (buf, pos, 0, str, 0,
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 0
diff changeset
2563 XSTRING_LENGTH (str), flags);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2564 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2565
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2566
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2567 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2568 /* Deletion of ranges */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2569 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2570
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2571 /* Delete characters in buffer from FROM up to (but not including) TO. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2572
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2573 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2574 buffer_delete_range (struct buffer *buf, Bufpos from, Bufpos to, int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2575 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2576 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2577 Charcount numdel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2578 Bytind bi_from, bi_to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2579 Bytecount bc_numdel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2580 int shortage;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2581 Lisp_Object bufobj = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2582
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2583 /* Defensive steps just in case a buffer gets deleted and a calling
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2584 function doesn't notice it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2585 if (!BUFFER_LIVE_P (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2586 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2587
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2588 /* Make args be valid */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2589 if (from < BUF_BEGV (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2590 from = BUF_BEGV (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2591 if (to > BUF_ZV (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2592 to = BUF_ZV (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2593 if ((numdel = to - from) <= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2594 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2595
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2596 prepare_to_modify_buffer (buf, from, to, !(flags & INSDEL_NO_LOCKING));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2597
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2598 /* Defensive steps in case the before-change-functions fuck around */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2599 if (!BUFFER_LIVE_P (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2600 /* Bad bad pre-change function. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2601 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2602
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2603 /* Make args be valid again. prepare_to_modify_buffer() might have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2604 modified the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2605 if (from < BUF_BEGV (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2606 from = BUF_BEGV (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2607 if (to > BUF_ZV (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2608 to = BUF_ZV (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2609 if ((numdel = to - from) <= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2610 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2611
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2612 XSETBUFFER (bufobj, buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2613
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2614 /* Redisplay needs to know if a newline was in the deleted region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2615 If we've already marked the changed region as having a deleted
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2616 newline there is no use in performing the check. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2617 if (!buf->changes->newline_was_deleted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2618 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2619 scan_buffer (buf, '\n', from, to, 1, &shortage, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2620 if (!shortage)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2621 buf->changes->newline_was_deleted = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2622 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2623
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2624 bi_from = bufpos_to_bytind (buf, from);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2625 bi_to = bufpos_to_bytind (buf, to);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2626 bc_numdel = bi_to - bi_from;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2627
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2628 if (to == BUF_Z (buf) &&
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2629 bi_from > BI_BUF_GPT (buf))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2630 {
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2631 /* avoid moving the gap just to delete from the bottom. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2632
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2633 record_delete (buf, from, numdel);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2634 BUF_MODIFF (buf)++;
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2635 MARK_BUFFERS_CHANGED;
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2636
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2637 /* ### Point used to be modified here, but this causes problems with MULE,
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2638 as point is used to calculate bytinds, and if the offset in bc_numdel causes
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2639 point to move to a non first-byte location, causing some other function to
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2640 throw an assertion in ASSERT_VALID_BYTIND. I've moved the code to right after
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2641 the other movements and adjustments, but before the gap is moved.
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2642 -- jh 970813 */
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2643
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2644 /* Detach any extents that are completely within the range [FROM, TO],
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2645 if the extents are detachable.
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2646
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2647 This must come AFTER record_delete(), so that the appropriate extents
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2648 will be present to be recorded, and BEFORE the gap size is increased,
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2649 as otherwise we will be confused about where the extents end. */
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2650 process_extents_for_deletion (bufobj, bi_from, bi_to, 0);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2651
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2652 /* Relocate all markers pointing into the new, larger gap
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2653 to point at the end of the text before the gap. */
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2654 adjust_markers (buf,
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2655 (bi_to + BUF_GAP_SIZE (buf)),
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2656 (bi_to + BUF_GAP_SIZE (buf)),
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2657 (- bc_numdel));
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2658
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2659 /* Relocate any extent endpoints just like markers. */
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2660 adjust_extents_for_deletion (bufobj, bi_from, bi_to,
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2661 BUF_GAP_SIZE (buf), bc_numdel, 0);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2662
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2663 /* Relocate point as if it were a marker. */
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2664 if (bi_from < BI_BUF_PT (buf))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2665 {
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2666 if (BI_BUF_PT (buf) < bi_to)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2667 JUST_SET_POINT (buf, from, bi_from);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2668 else
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2669 JUST_SET_POINT (buf, BUF_PT (buf) - numdel,
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2670 BI_BUF_PT (buf) - bc_numdel);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2671 }
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2672
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2673 SET_BUF_END_GAP_SIZE (buf, BUF_END_GAP_SIZE (buf) + bc_numdel);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2674
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2675 SET_BOTH_BUF_ZV (buf, BUF_ZV (buf) - numdel, BI_BUF_ZV (buf) - bc_numdel);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2676 SET_BOTH_BUF_Z (buf, BUF_Z (buf) - numdel, BI_BUF_Z (buf) - bc_numdel);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2677 SET_GAP_SENTINEL (buf);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2678 }
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2679 else
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2680 {
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2681 /* Make sure the gap is somewhere in or next to what we are deleting. */
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2682 if (bi_to < BI_BUF_GPT (buf))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2683 gap_left (buf, bi_to);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2684 if (bi_from > BI_BUF_GPT (buf))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2685 gap_right (buf, bi_from);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2686
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2687 record_delete (buf, from, numdel);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2688 BUF_MODIFF (buf)++;
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2689 MARK_BUFFERS_CHANGED;
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2690
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
2691 /* ### Point used to be modified here, but this causes problems with MULE,
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
2692 as point is used to calculate bytinds, and if the offset in bc_numdel causes
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2693 point to move to a non first-byte location, causing some other function to
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
2694 throw an assertion in ASSERT_VALID_BYTIND. I've moved the code to right after
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
2695 the other movements and adjustments, but before the gap is moved.
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
2696 -- jh 970813 */
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2697
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2698 /* Detach any extents that are completely within the range [FROM, TO],
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2699 if the extents are detachable.
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2700
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2701 This must come AFTER record_delete(), so that the appropriate extents
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2702 will be present to be recorded, and BEFORE the gap size is increased,
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2703 as otherwise we will be confused about where the extents end. */
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2704 process_extents_for_deletion (bufobj, bi_from, bi_to, 0);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2705
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2706 /* Relocate all markers pointing into the new, larger gap
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2707 to point at the end of the text before the gap. */
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2708 adjust_markers (buf,
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2709 (bi_to + BUF_GAP_SIZE (buf)),
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2710 (bi_to + BUF_GAP_SIZE (buf)),
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2711 (- bc_numdel - BUF_GAP_SIZE (buf)));
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2712
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2713 /* Relocate any extent endpoints just like markers. */
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2714 adjust_extents_for_deletion (bufobj, bi_from, bi_to, BUF_GAP_SIZE (buf),
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2715 bc_numdel, BUF_GAP_SIZE (buf));
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2716
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
2717 /* Relocate point as if it were a marker. */
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
2718 if (bi_from < BI_BUF_PT (buf))
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
2719 {
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
2720 if (BI_BUF_PT (buf) < bi_to)
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
2721 JUST_SET_POINT (buf, from, bi_from);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
2722 else
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
2723 JUST_SET_POINT (buf, BUF_PT (buf) - numdel,
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
2724 BI_BUF_PT (buf) - bc_numdel);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
2725 }
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
2726
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2727 SET_BUF_GAP_SIZE (buf, BUF_GAP_SIZE (buf) + bc_numdel);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2728 SET_BOTH_BUF_ZV (buf, BUF_ZV (buf) - numdel, BI_BUF_ZV (buf) - bc_numdel);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2729 SET_BOTH_BUF_Z (buf, BUF_Z (buf) - numdel, BI_BUF_Z (buf) - bc_numdel);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2730 SET_BI_BUF_GPT (buf, bi_from);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2731 SET_GAP_SENTINEL (buf);
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
2732 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2733
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2734 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2735 buffer_mule_signal_deleted_region (buf, from, to, bi_from, bi_to);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2736 #endif
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2737
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2738 #ifdef ERROR_CHECK_EXTENTS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2739 sledgehammer_extent_check (bufobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2740 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2741
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2742 signal_after_change (buf, from, to, from);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2743 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2744
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2745
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2746 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2747 /* Replacement of characters */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2748 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2749
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2750 /* Replace the character at POS in buffer B with CH. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2751
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2752 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2753 buffer_replace_char (struct buffer *b, Bufpos pos, Emchar ch,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2754 int not_real_change, int force_lock_check)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2755 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2756 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2757 Bufbyte curstr[MAX_EMCHAR_LEN];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2758 Bufbyte newstr[MAX_EMCHAR_LEN];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2759 Bytecount curlen, newlen;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2760
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2761 /* Defensive steps just in case a buffer gets deleted and a calling
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2762 function doesn't notice it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2763 if (!BUFFER_LIVE_P (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2764 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2765
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2766 curlen = BUF_CHARPTR_COPY_CHAR (b, pos, curstr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2767 newlen = set_charptr_emchar (newstr, ch);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2768
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2769 if (curlen == newlen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2770 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2771 /* then we can just replace the text. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2772 prepare_to_modify_buffer (b, pos, pos + 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2773 !not_real_change || force_lock_check);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2774 /* Defensive steps in case the before-change-functions fuck around */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2775 if (!BUFFER_LIVE_P (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2776 /* Bad bad pre-change function. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2777 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2778
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2779 /* Make args be valid again. prepare_to_modify_buffer() might have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2780 modified the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2781 if (pos < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2782 pos = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2783 if (pos >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2784 pos = BUF_ZV (b) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2785 if (pos < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2786 /* no more characters in buffer! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2787 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2788
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2789 if (BUF_FETCH_CHAR (b, pos) == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2790 b->changes->newline_was_deleted = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2791 MARK_BUFFERS_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2792 if (!not_real_change)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2793 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2794 record_change (b, pos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2795 BUF_MODIFF (b)++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2796 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2797 memcpy (BUF_BYTE_ADDRESS (b, pos), newstr, newlen);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2798 signal_after_change (b, pos, pos + 1, pos + 1);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2799
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2800 /* We do not have to adjust the Mule data; we just replaced a
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2801 character with another of the same number of bytes. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2802 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2803 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2804 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2805 /* must implement as deletion followed by insertion. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2806 buffer_delete_range (b, pos, pos + 1, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2807 /* Defensive steps in case the before-change-functions fuck around */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2808 if (!BUFFER_LIVE_P (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2809 /* Bad bad pre-change function. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2810 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2811
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2812 /* Make args be valid again. prepare_to_modify_buffer() might have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2813 modified the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2814 if (pos < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2815 pos = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2816 if (pos >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2817 pos = BUF_ZV (b) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2818 if (pos < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2819 /* no more characters in buffer! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2820 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2821 buffer_insert_string_1 (b, pos, newstr, Qnil, 0, newlen, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2822 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2823 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2824
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2825
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2826 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2827 /* Other functions */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2828 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2829
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2830 /* Make a string from a buffer. This needs to take into account the gap,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2831 and add any necessary extents from the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2832
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2833 Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2834 make_string_from_buffer (struct buffer *buf, Bufpos pos, Charcount length)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2835 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2836 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2837 Lisp_Object val;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2838 struct gcpro gcpro1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2839 Bytind bi_ind;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2840 Bytecount bi_len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2841
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2842 bi_ind = bufpos_to_bytind (buf, pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2843 bi_len = bufpos_to_bytind (buf, pos + length) - bi_ind;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2844
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2845 val = make_uninit_string (bi_len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2846 GCPRO1 (val);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2847
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2848 add_string_extents (val, buf, bi_ind, bi_len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2849
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2850 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2851 Bytecount len1 = BI_BUF_GPT (buf) - bi_ind;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2852 Bufbyte *start1 = BI_BUF_BYTE_ADDRESS (buf, bi_ind);
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 0
diff changeset
2853 Bufbyte *dest = XSTRING_DATA (val);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2854
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2855 if (len1 < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2856 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2857 /* Completely after gap */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2858 memcpy (dest, start1, bi_len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2859 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2860 else if (bi_len <= len1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2861 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2862 /* Completely before gap */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2863 memcpy (dest, start1, bi_len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2864 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2865 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2866 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2867 /* Spans gap */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2868 Bytind pos2 = bi_ind + len1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2869 Bufbyte *start2 = BI_BUF_BYTE_ADDRESS (buf, pos2);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2870
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2871 memcpy (dest, start1, len1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2872 memcpy (dest + len1, start2, bi_len - len1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2873 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2874 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2875
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2876 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2877 return val;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2878 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2879
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2880 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2881 barf_if_buffer_read_only (struct buffer *buf, Bufpos from, Bufpos to)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2882 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2883 Lisp_Object buffer = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2884 Lisp_Object iro;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2885
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2886 XSETBUFFER (buffer, buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2887 back:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2888 iro = (buf == current_buffer ? Vinhibit_read_only :
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2889 symbol_value_in_buffer (Qinhibit_read_only, buffer));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2890 if (!NILP (iro) && !CONSP (iro))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2891 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2892 if (NILP (iro) && !NILP (buf->read_only))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2893 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2894 Fsignal (Qbuffer_read_only, (list1 (buffer)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2895 goto back;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2896 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2897 if (from > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2898 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2899 if (to < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2900 to = from;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2901 verify_extent_modification (buffer,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2902 bufpos_to_bytind (buf, from),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2903 bufpos_to_bytind (buf, to),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2904 iro);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2905 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2906 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2907
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2908 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2909 find_charsets_in_bufbyte_string (unsigned char *charsets, CONST Bufbyte *str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2910 Bytecount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2911 {
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2912 #ifndef MULE
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2913 /* Telescope this. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2914 charsets[0] = 1;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2915 #else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2916 CONST Bufbyte *strend = str + len;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2917 memset (charsets, 0, NUM_LEADING_BYTES);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2918
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2919 while (str < strend)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2920 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2921 charsets[CHAR_LEADING_BYTE (charptr_emchar (str)) - 128] = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2922 INC_CHARPTR (str);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2923 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2924 #endif
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2925 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2926
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2927 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2928 find_charsets_in_emchar_string (unsigned char *charsets, CONST Emchar *str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2929 Charcount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2930 {
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2931 #ifndef MULE
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2932 /* Telescope this. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2933 charsets[0] = 1;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2934 #else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2935 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2936
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2937 memset (charsets, 0, NUM_LEADING_BYTES);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2938 for (i = 0; i < len; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2939 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2940 charsets[CHAR_LEADING_BYTE (str[i]) - 128] = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2941 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2942 #endif
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2943 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2944
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2945 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2946 bufbyte_string_displayed_columns (CONST Bufbyte *str, Bytecount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2947 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2948 int cols = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2949 CONST Bufbyte *end = str + len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2950
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2951 while (str < end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2952 {
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2953 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2954 Emchar ch = charptr_emchar (str);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2955 cols += XCHARSET_COLUMNS (CHAR_CHARSET (ch));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2956 #else
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2957 cols++;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
2958 #endif
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2959 INC_CHARPTR (str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2960 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2961
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2962 return cols;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2963 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2964
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2965 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2966 emchar_string_displayed_columns (CONST Emchar *str, Charcount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2967 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2968 int cols = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2969 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2970
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2971 for (i = 0; i < len; i++)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2972
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2973 cols += XCHARSET_COLUMNS (CHAR_CHARSET (str[i]));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2974
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2975 return cols;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2976 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2977
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2978 /* NOTE: Does not reset the Dynarr. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2979
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2980 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2981 convert_bufbyte_string_into_emchar_dynarr (CONST Bufbyte *str, Bytecount len,
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2982 Emchar_dynarr *dyn)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2983 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2984 CONST Bufbyte *strend = str + len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2985
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2986 while (str < strend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2987 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2988 Emchar ch = charptr_emchar (str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2989 Dynarr_add (dyn, ch);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2990 INC_CHARPTR (str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2991 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2992 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2993
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2994 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2995 convert_bufbyte_string_into_emchar_string (CONST Bufbyte *str, Bytecount len,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2996 Emchar *arr)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2997 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2998 CONST Bufbyte *strend = str + len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2999 Charcount newlen = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3000 while (str < strend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3001 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3002 Emchar ch = charptr_emchar (str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3003 arr[newlen++] = ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3004 INC_CHARPTR (str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3005 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3006 return newlen;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3007 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3008
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3009 /* Convert an array of Emchars into the equivalent string representation.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3010 Store into the given Bufbyte dynarr. Does not reset the dynarr.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3011 Does not add a terminating zero. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3012
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3013 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3014 convert_emchar_string_into_bufbyte_dynarr (Emchar *arr, int nels,
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
3015 Bufbyte_dynarr *dyn)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3016 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3017 Bufbyte str[MAX_EMCHAR_LEN];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3018 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3019
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3020 for (i = 0; i < nels; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3021 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
3022 Bytecount len = set_charptr_emchar (str, arr[i]);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3023 Dynarr_add_many (dyn, str, len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3024 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3025 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3026
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3027 /* Convert an array of Emchars into the equivalent string representation.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3028 Malloc the space needed for this and return it. If LEN_OUT is not a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3029 NULL pointer, store into LEN_OUT the number of Bufbytes in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3030 malloc()ed string. Note that the actual number of Bufbytes allocated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3031 is one more than this: the returned string is zero-terminated. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3032
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3033 Bufbyte *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3034 convert_emchar_string_into_malloced_string (Emchar *arr, int nels,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3035 Bytecount *len_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3036 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3037 /* Damn zero-termination. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3038 Bufbyte *str = (Bufbyte *) alloca (nels * MAX_EMCHAR_LEN + 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3039 Bufbyte *strorig = str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3040 Bytecount len;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
3041
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3042 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3043
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3044 for (i = 0; i < nels; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3045 str += set_charptr_emchar (str, arr[i]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3046 *str = '\0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3047 len = str - strorig;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
3048 str = (Bufbyte *) xmalloc (1 + len);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3049 memcpy (str, strorig, 1 + len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3050 if (len_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3051 *len_out = len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3052 return str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3053 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3054
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3055
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3056 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3057 /* initialization */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3058 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3059
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3060 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3061 vars_of_insdel (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3062 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3063 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3064
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3065 inside_change_hook = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3066 in_first_change = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3067
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3068 for (i = 0; i <= MAX_BYTIND_GAP_SIZE_3; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3069 three_to_one_table[i] = i / 3;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3070 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3071
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3072 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3073 init_buffer_text (struct buffer *b, int indirect_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3074 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3075 if (!indirect_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3076 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3077 SET_BUF_GAP_SIZE (b, 20);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
3078 BUFFER_ALLOC (b->text->beg, BUF_GAP_SIZE (b) + BUF_END_SENTINEL_SIZE);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3079 if (! BUF_BEG_ADDR (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3080 memory_full ();
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
3081
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 70
diff changeset
3082 SET_BUF_END_GAP_SIZE (b, 0);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3083 SET_BI_BUF_GPT (b, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3084 SET_BOTH_BUF_Z (b, 1, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3085 SET_GAP_SENTINEL (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3086 SET_END_SENTINEL (b);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
3087 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
3088 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
3089 int i;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
3090
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
3091 b->text->mule_bufmin = b->text->mule_bufmax = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
3092 b->text->mule_bytmin = b->text->mule_bytmax = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
3093 b->text->mule_shifter = 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
3094 b->text->mule_three_p = 0;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
3095
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
3096 for (i = 0; i < 16; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
3097 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
3098 b->text->mule_bufpos_cache[i] = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
3099 b->text->mule_bytind_cache[i] = 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
3100 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 48
diff changeset
3101 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
3102 #endif /* MULE */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3103
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3104 BUF_MODIFF (b) = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3105 BUF_SAVE_MODIFF (b) = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3106
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3107 JUST_SET_POINT (b, 1, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3108 SET_BOTH_BUF_BEGV (b, 1, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3109 SET_BOTH_BUF_ZV (b, 1, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3110
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
3111 b->text->changes = xnew_and_zero (struct buffer_text_change_data);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3112 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3113 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3114 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3115 JUST_SET_POINT (b, BUF_PT (b->base_buffer), BI_BUF_PT (b->base_buffer));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3116 SET_BOTH_BUF_BEGV (b, BUF_BEGV (b->base_buffer),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3117 BI_BUF_BEGV (b->base_buffer));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3118 SET_BOTH_BUF_ZV (b, BUF_ZV (b->base_buffer),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3119 BI_BUF_ZV (b->base_buffer));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3120 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3121
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
3122 b->changes = xnew_and_zero (struct each_buffer_change_data);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3123 BUF_FACECHANGE (b) = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3124
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3125 #ifdef REGION_CACHE_NEEDS_WORK
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3126 b->newline_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3127 b->width_run_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3128 b->width_table = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3129 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3130 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3131
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3132 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3133 uninit_buffer_text (struct buffer *b, int indirect_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3134 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3135 if (!indirect_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3136 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3137 BUFFER_FREE (b->text->beg);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3138 xfree (b->text->changes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3139 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3140 xfree (b->changes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3141
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3142 #ifdef REGION_CACHE_NEEDS_WORK
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3143 if (b->newline_cache)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3144 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3145 free_region_cache (b->newline_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3146 b->newline_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3147 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3148 if (b->width_run_cache)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3149 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3150 free_region_cache (b->width_run_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3151 b->width_run_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3152 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3153 b->width_table = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3154 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3155 }