Mercurial > emacs
annotate src/marker.c @ 42653:79601b0c7721
*** empty log message ***
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Fri, 11 Jan 2002 09:39:53 +0000 |
parents | 23d7de34a596 |
children | ed296e71aa64 aac41b50c875 |
rev | line source |
---|---|
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
1 /* Markers: examining, setting and deleting. |
20706 | 2 Copyright (C) 1985, 1997, 1998 Free Software Foundation, Inc. |
118 | 3 |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 it under the terms of the GNU General Public License as published by | |
12244 | 8 the Free Software Foundation; either version 2, or (at your option) |
118 | 9 any later version. |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14082
diff
changeset
|
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14082
diff
changeset
|
19 Boston, MA 02111-1307, USA. */ |
118 | 20 |
21 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
484
diff
changeset
|
22 #include <config.h> |
118 | 23 #include "lisp.h" |
24 #include "buffer.h" | |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
25 #include "charset.h" |
118 | 26 |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
27 /* Record one cached position found recently by |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
28 buf_charpos_to_bytepos or buf_bytepos_to_charpos. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
29 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
30 static int cached_charpos; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
31 static int cached_bytepos; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
32 static struct buffer *cached_buffer; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
33 static int cached_modiff; |
20678
4c69e3503cfc
(clear_charpos_cache): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20563
diff
changeset
|
34 |
31830
cf1b4094811a
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
35 static void byte_char_debug_check P_ ((struct buffer *, int, int)); |
cf1b4094811a
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
36 |
20872
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
37 /* Nonzero means enable debugging checks on byte/char correspondences. */ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
38 |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
39 static int byte_debug_flag; |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
40 |
21514 | 41 void |
20678
4c69e3503cfc
(clear_charpos_cache): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20563
diff
changeset
|
42 clear_charpos_cache (b) |
4c69e3503cfc
(clear_charpos_cache): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20563
diff
changeset
|
43 struct buffer *b; |
4c69e3503cfc
(clear_charpos_cache): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20563
diff
changeset
|
44 { |
4c69e3503cfc
(clear_charpos_cache): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20563
diff
changeset
|
45 if (cached_buffer == b) |
4c69e3503cfc
(clear_charpos_cache): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20563
diff
changeset
|
46 cached_buffer = 0; |
4c69e3503cfc
(clear_charpos_cache): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20563
diff
changeset
|
47 } |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
48 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
49 /* Converting between character positions and byte positions. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
50 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
51 /* There are several places in the buffer where we know |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
52 the corrspondence: BEG, BEGV, PT, GPT, ZV and Z, |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
53 and everywhere there is a marker. So we find the one of these places |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
54 that is closest to the specified position, and scan from there. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
55 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
56 /* charpos_to_bytepos returns the byte position corresponding to CHARPOS. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
57 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
58 /* This macro is a subroutine of charpos_to_bytepos. |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
59 Note that it is desirable that BYTEPOS is not evaluated |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
60 except when we really want its value. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
61 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
62 #define CONSIDER(CHARPOS, BYTEPOS) \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
63 { \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
64 int this_charpos = (CHARPOS); \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
65 int changed = 0; \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
66 \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
67 if (this_charpos == charpos) \ |
20872
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
68 { \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
69 int value = (BYTEPOS); \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
70 if (byte_debug_flag) \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
71 byte_char_debug_check (b, charpos, value); \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
72 return value; \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
73 } \ |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
74 else if (this_charpos > charpos) \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
75 { \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
76 if (this_charpos < best_above) \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
77 { \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
78 best_above = this_charpos; \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
79 best_above_byte = (BYTEPOS); \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
80 changed = 1; \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
81 } \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
82 } \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
83 else if (this_charpos > best_below) \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
84 { \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
85 best_below = this_charpos; \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
86 best_below_byte = (BYTEPOS); \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
87 changed = 1; \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
88 } \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
89 \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
90 if (changed) \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
91 { \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
92 if (best_above - best_below == best_above_byte - best_below_byte) \ |
20872
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
93 { \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
94 int value = best_below_byte + (charpos - best_below); \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
95 if (byte_debug_flag) \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
96 byte_char_debug_check (b, charpos, value); \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
97 return value; \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
98 } \ |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
99 } \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
100 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
101 |
31830
cf1b4094811a
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
102 static void |
20872
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
103 byte_char_debug_check (b, charpos, bytepos) |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
104 struct buffer *b; |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
105 int charpos, bytepos; |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
106 { |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
107 int nchars = 0; |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
108 |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
109 if (bytepos > BUF_GPT_BYTE (b)) |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
110 { |
21219
29d2cf14040a
(byte_char_debug_check): Call multibyte_chars_in_text
Kenichi Handa <handa@m17n.org>
parents:
20872
diff
changeset
|
111 nchars = multibyte_chars_in_text (BUF_BEG_ADDR (b), |
29d2cf14040a
(byte_char_debug_check): Call multibyte_chars_in_text
Kenichi Handa <handa@m17n.org>
parents:
20872
diff
changeset
|
112 BUF_GPT_BYTE (b) - BUF_BEG_BYTE (b)); |
29d2cf14040a
(byte_char_debug_check): Call multibyte_chars_in_text
Kenichi Handa <handa@m17n.org>
parents:
20872
diff
changeset
|
113 nchars += multibyte_chars_in_text (BUF_GAP_END_ADDR (b), |
29d2cf14040a
(byte_char_debug_check): Call multibyte_chars_in_text
Kenichi Handa <handa@m17n.org>
parents:
20872
diff
changeset
|
114 bytepos - BUF_GPT_BYTE (b)); |
20872
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
115 } |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
116 else |
21219
29d2cf14040a
(byte_char_debug_check): Call multibyte_chars_in_text
Kenichi Handa <handa@m17n.org>
parents:
20872
diff
changeset
|
117 nchars = multibyte_chars_in_text (BUF_BEG_ADDR (b), |
29d2cf14040a
(byte_char_debug_check): Call multibyte_chars_in_text
Kenichi Handa <handa@m17n.org>
parents:
20872
diff
changeset
|
118 bytepos - BUF_BEG_BYTE (b)); |
20872
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
119 |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
120 if (charpos - 1 != nchars) |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
121 abort (); |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
122 } |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
123 |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
124 int |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
125 charpos_to_bytepos (charpos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
126 int charpos; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
127 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
128 return buf_charpos_to_bytepos (current_buffer, charpos); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
129 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
130 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
131 int |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
132 buf_charpos_to_bytepos (b, charpos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
133 struct buffer *b; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
134 int charpos; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
135 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
136 Lisp_Object tail; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
137 int best_above, best_above_byte; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
138 int best_below, best_below_byte; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
139 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
140 if (charpos < BUF_BEG (b) || charpos > BUF_Z (b)) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
141 abort (); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
142 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
143 best_above = BUF_Z (b); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
144 best_above_byte = BUF_Z_BYTE (b); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
145 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
146 /* If this buffer has as many characters as bytes, |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
147 each character must be one byte. |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
148 This takes care of the case where enable-multibyte-characters is nil. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
149 if (best_above == best_above_byte) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
150 return charpos; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
151 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
152 best_below = 1; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
153 best_below_byte = 1; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
154 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
155 /* We find in best_above and best_above_byte |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
156 the closest known point above CHARPOS, |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
157 and in best_below and best_below_byte |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
158 the closest known point below CHARPOS, |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
159 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
160 If at any point we can tell that the space between those |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
161 two best approximations is all single-byte, |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
162 we interpolate the result immediately. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
163 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
164 CONSIDER (BUF_PT (b), BUF_PT_BYTE (b)); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
165 CONSIDER (BUF_GPT (b), BUF_GPT_BYTE (b)); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
166 CONSIDER (BUF_BEGV (b), BUF_BEGV_BYTE (b)); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
167 CONSIDER (BUF_ZV (b), BUF_ZV_BYTE (b)); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
168 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
169 if (b == cached_buffer && BUF_MODIFF (b) == cached_modiff) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
170 CONSIDER (cached_charpos, cached_bytepos); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
171 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
172 tail = BUF_MARKERS (b); |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
22744
diff
changeset
|
173 while (! NILP (tail)) |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
174 { |
20563
d4de7ffb567d
(buf_bytepos_to_charpos): Use marker bytepos, not bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20537
diff
changeset
|
175 CONSIDER (XMARKER (tail)->charpos, XMARKER (tail)->bytepos); |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
176 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
177 /* If we are down to a range of 50 chars, |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
178 don't bother checking any other markers; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
179 scan the intervening chars directly now. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
180 if (best_above - best_below < 50) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
181 break; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
182 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
183 tail = XMARKER (tail)->chain; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
184 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
185 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
186 /* We get here if we did not exactly hit one of the known places. |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
187 We have one known above and one known below. |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
188 Scan, counting characters, from whichever one is closer. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
189 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
190 if (charpos - best_below < best_above - charpos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
191 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
192 int record = charpos - best_below > 5000; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
193 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
194 while (best_below != charpos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
195 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
196 best_below++; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
197 BUF_INC_POS (b, best_below_byte); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
198 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
199 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
200 /* If this position is quite far from the nearest known position, |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
201 cache the correspondence by creating a marker here. |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
202 It will last until the next GC. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
203 if (record) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
204 { |
21497
837148a1541f
(buf_charpos_to_bytepos, buf_bytepos_to_charpos):
Karl Heuer <kwzh@gnu.org>
parents:
21458
diff
changeset
|
205 Lisp_Object marker, buffer; |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
206 marker = Fmake_marker (); |
21497
837148a1541f
(buf_charpos_to_bytepos, buf_bytepos_to_charpos):
Karl Heuer <kwzh@gnu.org>
parents:
21458
diff
changeset
|
207 XSETBUFFER (buffer, b); |
837148a1541f
(buf_charpos_to_bytepos, buf_bytepos_to_charpos):
Karl Heuer <kwzh@gnu.org>
parents:
21458
diff
changeset
|
208 set_marker_both (marker, buffer, best_below, best_below_byte); |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
209 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
210 |
20872
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
211 if (byte_debug_flag) |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
212 byte_char_debug_check (b, charpos, best_below_byte); |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
213 |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
214 cached_buffer = b; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
215 cached_modiff = BUF_MODIFF (b); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
216 cached_charpos = best_below; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
217 cached_bytepos = best_below_byte; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
218 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
219 return best_below_byte; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
220 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
221 else |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
222 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
223 int record = best_above - charpos > 5000; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
224 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
225 while (best_above != charpos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
226 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
227 best_above--; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
228 BUF_DEC_POS (b, best_above_byte); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
229 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
230 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
231 /* If this position is quite far from the nearest known position, |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
232 cache the correspondence by creating a marker here. |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
233 It will last until the next GC. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
234 if (record) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
235 { |
21497
837148a1541f
(buf_charpos_to_bytepos, buf_bytepos_to_charpos):
Karl Heuer <kwzh@gnu.org>
parents:
21458
diff
changeset
|
236 Lisp_Object marker, buffer; |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
237 marker = Fmake_marker (); |
21497
837148a1541f
(buf_charpos_to_bytepos, buf_bytepos_to_charpos):
Karl Heuer <kwzh@gnu.org>
parents:
21458
diff
changeset
|
238 XSETBUFFER (buffer, b); |
837148a1541f
(buf_charpos_to_bytepos, buf_bytepos_to_charpos):
Karl Heuer <kwzh@gnu.org>
parents:
21458
diff
changeset
|
239 set_marker_both (marker, buffer, best_above, best_above_byte); |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
240 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
241 |
20872
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
242 if (byte_debug_flag) |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
243 byte_char_debug_check (b, charpos, best_above_byte); |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
244 |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
245 cached_buffer = b; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
246 cached_modiff = BUF_MODIFF (b); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
247 cached_charpos = best_above; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
248 cached_bytepos = best_above_byte; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
249 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
250 return best_above_byte; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
251 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
252 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
253 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
254 #undef CONSIDER |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
255 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
256 /* bytepos_to_charpos returns the char position corresponding to BYTEPOS. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
257 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
258 /* This macro is a subroutine of bytepos_to_charpos. |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
259 It is used when BYTEPOS is actually the byte position. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
260 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
261 #define CONSIDER(BYTEPOS, CHARPOS) \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
262 { \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
263 int this_bytepos = (BYTEPOS); \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
264 int changed = 0; \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
265 \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
266 if (this_bytepos == bytepos) \ |
20872
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
267 { \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
268 int value = (CHARPOS); \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
269 if (byte_debug_flag) \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
270 byte_char_debug_check (b, value, bytepos); \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
271 return value; \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
272 } \ |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
273 else if (this_bytepos > bytepos) \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
274 { \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
275 if (this_bytepos < best_above_byte) \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
276 { \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
277 best_above = (CHARPOS); \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
278 best_above_byte = this_bytepos; \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
279 changed = 1; \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
280 } \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
281 } \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
282 else if (this_bytepos > best_below_byte) \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
283 { \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
284 best_below = (CHARPOS); \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
285 best_below_byte = this_bytepos; \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
286 changed = 1; \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
287 } \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
288 \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
289 if (changed) \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
290 { \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
291 if (best_above - best_below == best_above_byte - best_below_byte) \ |
20872
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
292 { \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
293 int value = best_below + (bytepos - best_below_byte); \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
294 if (byte_debug_flag) \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
295 byte_char_debug_check (b, value, bytepos); \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
296 return value; \ |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
297 } \ |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
298 } \ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
299 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
300 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
301 int |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
302 bytepos_to_charpos (bytepos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
303 int bytepos; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
304 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
305 return buf_bytepos_to_charpos (current_buffer, bytepos); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
306 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
307 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
308 int |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
309 buf_bytepos_to_charpos (b, bytepos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
310 struct buffer *b; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
311 int bytepos; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
312 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
313 Lisp_Object tail; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
314 int best_above, best_above_byte; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
315 int best_below, best_below_byte; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
316 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
317 if (bytepos < BUF_BEG_BYTE (b) || bytepos > BUF_Z_BYTE (b)) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
318 abort (); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
319 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
320 best_above = BUF_Z (b); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
321 best_above_byte = BUF_Z_BYTE (b); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
322 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
323 /* If this buffer has as many characters as bytes, |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
324 each character must be one byte. |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
325 This takes care of the case where enable-multibyte-characters is nil. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
326 if (best_above == best_above_byte) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
327 return bytepos; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
328 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
329 best_below = 1; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
330 best_below_byte = 1; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
331 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
332 CONSIDER (BUF_PT_BYTE (b), BUF_PT (b)); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
333 CONSIDER (BUF_GPT_BYTE (b), BUF_GPT (b)); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
334 CONSIDER (BUF_BEGV_BYTE (b), BUF_BEGV (b)); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
335 CONSIDER (BUF_ZV_BYTE (b), BUF_ZV (b)); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
336 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
337 if (b == cached_buffer && BUF_MODIFF (b) == cached_modiff) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
338 CONSIDER (cached_bytepos, cached_charpos); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
339 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
340 tail = BUF_MARKERS (b); |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
22744
diff
changeset
|
341 while (! NILP (tail)) |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
342 { |
20563
d4de7ffb567d
(buf_bytepos_to_charpos): Use marker bytepos, not bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20537
diff
changeset
|
343 CONSIDER (XMARKER (tail)->bytepos, XMARKER (tail)->charpos); |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
344 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
345 /* If we are down to a range of 50 chars, |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
346 don't bother checking any other markers; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
347 scan the intervening chars directly now. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
348 if (best_above - best_below < 50) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
349 break; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
350 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
351 tail = XMARKER (tail)->chain; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
352 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
353 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
354 /* We get here if we did not exactly hit one of the known places. |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
355 We have one known above and one known below. |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
356 Scan, counting characters, from whichever one is closer. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
357 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
358 if (bytepos - best_below_byte < best_above_byte - bytepos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
359 { |
22022
64ac294567a6
(unchain_marker): Abort if the marker is not in its buffer's chain.
Richard M. Stallman <rms@gnu.org>
parents:
21528
diff
changeset
|
360 int record = bytepos - best_below_byte > 5000; |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
361 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
362 while (best_below_byte < bytepos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
363 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
364 best_below++; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
365 BUF_INC_POS (b, best_below_byte); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
366 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
367 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
368 /* If this position is quite far from the nearest known position, |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
369 cache the correspondence by creating a marker here. |
22022
64ac294567a6
(unchain_marker): Abort if the marker is not in its buffer's chain.
Richard M. Stallman <rms@gnu.org>
parents:
21528
diff
changeset
|
370 It will last until the next GC. |
64ac294567a6
(unchain_marker): Abort if the marker is not in its buffer's chain.
Richard M. Stallman <rms@gnu.org>
parents:
21528
diff
changeset
|
371 But don't do it if BUF_MARKERS is nil; |
64ac294567a6
(unchain_marker): Abort if the marker is not in its buffer's chain.
Richard M. Stallman <rms@gnu.org>
parents:
21528
diff
changeset
|
372 that is a signal from Fset_buffer_multibyte. */ |
64ac294567a6
(unchain_marker): Abort if the marker is not in its buffer's chain.
Richard M. Stallman <rms@gnu.org>
parents:
21528
diff
changeset
|
373 if (record && ! NILP (BUF_MARKERS (b))) |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
374 { |
21497
837148a1541f
(buf_charpos_to_bytepos, buf_bytepos_to_charpos):
Karl Heuer <kwzh@gnu.org>
parents:
21458
diff
changeset
|
375 Lisp_Object marker, buffer; |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
376 marker = Fmake_marker (); |
21497
837148a1541f
(buf_charpos_to_bytepos, buf_bytepos_to_charpos):
Karl Heuer <kwzh@gnu.org>
parents:
21458
diff
changeset
|
377 XSETBUFFER (buffer, b); |
837148a1541f
(buf_charpos_to_bytepos, buf_bytepos_to_charpos):
Karl Heuer <kwzh@gnu.org>
parents:
21458
diff
changeset
|
378 set_marker_both (marker, buffer, best_below, best_below_byte); |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
379 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
380 |
20872
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
381 if (byte_debug_flag) |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
382 byte_char_debug_check (b, best_below, bytepos); |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
383 |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
384 cached_buffer = b; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
385 cached_modiff = BUF_MODIFF (b); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
386 cached_charpos = best_below; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
387 cached_bytepos = best_below_byte; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
388 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
389 return best_below; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
390 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
391 else |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
392 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
393 int record = best_above_byte - bytepos > 5000; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
394 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
395 while (best_above_byte > bytepos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
396 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
397 best_above--; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
398 BUF_DEC_POS (b, best_above_byte); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
399 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
400 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
401 /* If this position is quite far from the nearest known position, |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
402 cache the correspondence by creating a marker here. |
22022
64ac294567a6
(unchain_marker): Abort if the marker is not in its buffer's chain.
Richard M. Stallman <rms@gnu.org>
parents:
21528
diff
changeset
|
403 It will last until the next GC. |
64ac294567a6
(unchain_marker): Abort if the marker is not in its buffer's chain.
Richard M. Stallman <rms@gnu.org>
parents:
21528
diff
changeset
|
404 But don't do it if BUF_MARKERS is nil; |
64ac294567a6
(unchain_marker): Abort if the marker is not in its buffer's chain.
Richard M. Stallman <rms@gnu.org>
parents:
21528
diff
changeset
|
405 that is a signal from Fset_buffer_multibyte. */ |
64ac294567a6
(unchain_marker): Abort if the marker is not in its buffer's chain.
Richard M. Stallman <rms@gnu.org>
parents:
21528
diff
changeset
|
406 if (record && ! NILP (BUF_MARKERS (b))) |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
407 { |
21497
837148a1541f
(buf_charpos_to_bytepos, buf_bytepos_to_charpos):
Karl Heuer <kwzh@gnu.org>
parents:
21458
diff
changeset
|
408 Lisp_Object marker, buffer; |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
409 marker = Fmake_marker (); |
21497
837148a1541f
(buf_charpos_to_bytepos, buf_bytepos_to_charpos):
Karl Heuer <kwzh@gnu.org>
parents:
21458
diff
changeset
|
410 XSETBUFFER (buffer, b); |
837148a1541f
(buf_charpos_to_bytepos, buf_bytepos_to_charpos):
Karl Heuer <kwzh@gnu.org>
parents:
21458
diff
changeset
|
411 set_marker_both (marker, buffer, best_above, best_above_byte); |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
412 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
413 |
20872
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
414 if (byte_debug_flag) |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
415 byte_char_debug_check (b, best_above, bytepos); |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
416 |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
417 cached_buffer = b; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
418 cached_modiff = BUF_MODIFF (b); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
419 cached_charpos = best_above; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
420 cached_bytepos = best_above_byte; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
421 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
422 return best_above; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
423 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
424 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
425 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
426 #undef CONSIDER |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
427 |
118 | 428 /* Operations on markers. */ |
429 | |
430 DEFUN ("marker-buffer", Fmarker_buffer, Smarker_buffer, 1, 1, 0, | |
40553
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
431 doc: /* Return the buffer that MARKER points into, or nil if none. |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
432 Returns nil if MARKER points into a dead buffer. */) |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
433 (marker) |
118 | 434 register Lisp_Object marker; |
435 { | |
436 register Lisp_Object buf; | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40553
diff
changeset
|
437 CHECK_MARKER (marker); |
118 | 438 if (XMARKER (marker)->buffer) |
439 { | |
9275
bb50d17f7441
(Fmarker_buffer): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents:
9121
diff
changeset
|
440 XSETBUFFER (buf, XMARKER (marker)->buffer); |
118 | 441 /* Return marker's buffer only if it is not dead. */ |
484 | 442 if (!NILP (XBUFFER (buf)->name)) |
118 | 443 return buf; |
444 } | |
445 return Qnil; | |
446 } | |
447 | |
448 DEFUN ("marker-position", Fmarker_position, Smarker_position, 1, 1, 0, | |
40553
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
449 doc: /* Return the position MARKER points at, as a character number. */) |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
450 (marker) |
118 | 451 Lisp_Object marker; |
452 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40553
diff
changeset
|
453 CHECK_MARKER (marker); |
118 | 454 if (XMARKER (marker)->buffer) |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
455 return make_number (XMARKER (marker)->charpos); |
118 | 456 |
457 return Qnil; | |
458 } | |
12999
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
459 |
118 | 460 DEFUN ("set-marker", Fset_marker, Sset_marker, 2, 3, 0, |
40553
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
461 doc: /* Position MARKER before character number POSITION in BUFFER. |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
462 BUFFER defaults to the current buffer. |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
463 If POSITION is nil, makes marker point nowhere. |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
464 Then it no longer slows down editing in any buffer. |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
465 Returns MARKER. */) |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
466 (marker, position, buffer) |
14082
c6a1708f37d4
(Fset_marker): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13327
diff
changeset
|
467 Lisp_Object marker, position, buffer; |
118 | 468 { |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
469 register int charno, bytepos; |
118 | 470 register struct buffer *b; |
471 register struct Lisp_Marker *m; | |
472 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40553
diff
changeset
|
473 CHECK_MARKER (marker); |
118 | 474 /* If position is nil or a marker that points nowhere, |
475 make this marker point nowhere. */ | |
14082
c6a1708f37d4
(Fset_marker): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13327
diff
changeset
|
476 if (NILP (position) |
c6a1708f37d4
(Fset_marker): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13327
diff
changeset
|
477 || (MARKERP (position) && !XMARKER (position)->buffer)) |
118 | 478 { |
479 unchain_marker (marker); | |
480 return marker; | |
481 } | |
482 | |
484 | 483 if (NILP (buffer)) |
118 | 484 b = current_buffer; |
485 else | |
486 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40553
diff
changeset
|
487 CHECK_BUFFER (buffer); |
118 | 488 b = XBUFFER (buffer); |
489 /* If buffer is dead, set marker to point nowhere. */ | |
490 if (EQ (b->name, Qnil)) | |
491 { | |
492 unchain_marker (marker); | |
493 return marker; | |
494 } | |
495 } | |
496 | |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
497 m = XMARKER (marker); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
498 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
499 /* Optimize the special case where we are copying the position |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
500 of an existing marker, and MARKER is already in the same buffer. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
501 if (MARKERP (position) && b == XMARKER (position)->buffer |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
502 && b == m->buffer) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
503 { |
20563
d4de7ffb567d
(buf_bytepos_to_charpos): Use marker bytepos, not bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20537
diff
changeset
|
504 m->bytepos = XMARKER (position)->bytepos; |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
505 m->charpos = XMARKER (position)->charpos; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
506 return marker; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
507 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
508 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40553
diff
changeset
|
509 CHECK_NUMBER_COERCE_MARKER (position); |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
510 |
14082
c6a1708f37d4
(Fset_marker): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13327
diff
changeset
|
511 charno = XINT (position); |
118 | 512 |
513 if (charno < BUF_BEG (b)) | |
514 charno = BUF_BEG (b); | |
515 if (charno > BUF_Z (b)) | |
516 charno = BUF_Z (b); | |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
517 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
518 bytepos = buf_charpos_to_bytepos (b, charno); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
519 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
520 /* Every character is at least one byte. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
521 if (charno > bytepos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
522 abort (); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
523 |
20563
d4de7ffb567d
(buf_bytepos_to_charpos): Use marker bytepos, not bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20537
diff
changeset
|
524 m->bytepos = bytepos; |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
525 m->charpos = charno; |
118 | 526 |
527 if (m->buffer != b) | |
528 { | |
529 unchain_marker (marker); | |
530 m->buffer = b; | |
10315
c78d0bb85d30
Use BUF_MARKERS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
9315
diff
changeset
|
531 m->chain = BUF_MARKERS (b); |
c78d0bb85d30
Use BUF_MARKERS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
9315
diff
changeset
|
532 BUF_MARKERS (b) = marker; |
118 | 533 } |
534 | |
535 return marker; | |
536 } | |
537 | |
538 /* This version of Fset_marker won't let the position | |
539 be outside the visible part. */ | |
540 | |
541 Lisp_Object | |
542 set_marker_restricted (marker, pos, buffer) | |
543 Lisp_Object marker, pos, buffer; | |
544 { | |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
545 register int charno, bytepos; |
118 | 546 register struct buffer *b; |
547 register struct Lisp_Marker *m; | |
548 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40553
diff
changeset
|
549 CHECK_MARKER (marker); |
118 | 550 /* If position is nil or a marker that points nowhere, |
551 make this marker point nowhere. */ | |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
552 if (NILP (pos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
553 || (MARKERP (pos) && !XMARKER (pos)->buffer)) |
118 | 554 { |
555 unchain_marker (marker); | |
556 return marker; | |
557 } | |
558 | |
484 | 559 if (NILP (buffer)) |
118 | 560 b = current_buffer; |
561 else | |
562 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40553
diff
changeset
|
563 CHECK_BUFFER (buffer); |
118 | 564 b = XBUFFER (buffer); |
565 /* If buffer is dead, set marker to point nowhere. */ | |
566 if (EQ (b->name, Qnil)) | |
567 { | |
568 unchain_marker (marker); | |
569 return marker; | |
570 } | |
571 } | |
572 | |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
573 m = XMARKER (marker); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
574 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
575 /* Optimize the special case where we are copying the position |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
576 of an existing marker, and MARKER is already in the same buffer. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
577 if (MARKERP (pos) && b == XMARKER (pos)->buffer |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
578 && b == m->buffer) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
579 { |
20563
d4de7ffb567d
(buf_bytepos_to_charpos): Use marker bytepos, not bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20537
diff
changeset
|
580 m->bytepos = XMARKER (pos)->bytepos; |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
581 m->charpos = XMARKER (pos)->charpos; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
582 return marker; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
583 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
584 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40553
diff
changeset
|
585 CHECK_NUMBER_COERCE_MARKER (pos); |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
586 |
118 | 587 charno = XINT (pos); |
588 | |
589 if (charno < BUF_BEGV (b)) | |
590 charno = BUF_BEGV (b); | |
591 if (charno > BUF_ZV (b)) | |
592 charno = BUF_ZV (b); | |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
593 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
594 bytepos = buf_charpos_to_bytepos (b, charno); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
595 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
596 /* Every character is at least one byte. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
597 if (charno > bytepos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
598 abort (); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
599 |
20563
d4de7ffb567d
(buf_bytepos_to_charpos): Use marker bytepos, not bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20537
diff
changeset
|
600 m->bytepos = bytepos; |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
601 m->charpos = charno; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
602 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
603 if (m->buffer != b) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
604 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
605 unchain_marker (marker); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
606 m->buffer = b; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
607 m->chain = BUF_MARKERS (b); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
608 BUF_MARKERS (b) = marker; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
609 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
610 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
611 return marker; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
612 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
613 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
614 /* Set the position of MARKER, specifying both the |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
615 character position and the corresponding byte position. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
616 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
617 Lisp_Object |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
618 set_marker_both (marker, buffer, charpos, bytepos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
619 Lisp_Object marker, buffer; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
620 int charpos, bytepos; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
621 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
622 register struct buffer *b; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
623 register struct Lisp_Marker *m; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
624 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40553
diff
changeset
|
625 CHECK_MARKER (marker); |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
626 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
627 if (NILP (buffer)) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
628 b = current_buffer; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
629 else |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
630 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40553
diff
changeset
|
631 CHECK_BUFFER (buffer); |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
632 b = XBUFFER (buffer); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
633 /* If buffer is dead, set marker to point nowhere. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
634 if (EQ (b->name, Qnil)) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
635 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
636 unchain_marker (marker); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
637 return marker; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
638 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
639 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
640 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
641 m = XMARKER (marker); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
642 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
643 /* In a single-byte buffer, the two positions must be equal. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
644 if (BUF_Z (b) == BUF_Z_BYTE (b) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
645 && charpos != bytepos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
646 abort (); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
647 /* Every character is at least one byte. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
648 if (charpos > bytepos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
649 abort (); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
650 |
20563
d4de7ffb567d
(buf_bytepos_to_charpos): Use marker bytepos, not bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20537
diff
changeset
|
651 m->bytepos = bytepos; |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
652 m->charpos = charpos; |
118 | 653 |
654 if (m->buffer != b) | |
655 { | |
656 unchain_marker (marker); | |
657 m->buffer = b; | |
10315
c78d0bb85d30
Use BUF_MARKERS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
9315
diff
changeset
|
658 m->chain = BUF_MARKERS (b); |
c78d0bb85d30
Use BUF_MARKERS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
9315
diff
changeset
|
659 BUF_MARKERS (b) = marker; |
118 | 660 } |
661 | |
662 return marker; | |
663 } | |
664 | |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
665 /* This version of set_marker_both won't let the position |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
666 be outside the visible part. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
667 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
668 Lisp_Object |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
669 set_marker_restricted_both (marker, buffer, charpos, bytepos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
670 Lisp_Object marker, buffer; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
671 int charpos, bytepos; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
672 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
673 register struct buffer *b; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
674 register struct Lisp_Marker *m; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
675 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40553
diff
changeset
|
676 CHECK_MARKER (marker); |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
677 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
678 if (NILP (buffer)) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
679 b = current_buffer; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
680 else |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
681 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40553
diff
changeset
|
682 CHECK_BUFFER (buffer); |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
683 b = XBUFFER (buffer); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
684 /* If buffer is dead, set marker to point nowhere. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
685 if (EQ (b->name, Qnil)) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
686 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
687 unchain_marker (marker); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
688 return marker; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
689 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
690 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
691 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
692 m = XMARKER (marker); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
693 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
694 if (charpos < BUF_BEGV (b)) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
695 charpos = BUF_BEGV (b); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
696 if (charpos > BUF_ZV (b)) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
697 charpos = BUF_ZV (b); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
698 if (bytepos < BUF_BEGV_BYTE (b)) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
699 bytepos = BUF_BEGV_BYTE (b); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
700 if (bytepos > BUF_ZV_BYTE (b)) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
701 bytepos = BUF_ZV_BYTE (b); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
702 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
703 /* In a single-byte buffer, the two positions must be equal. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
704 if (BUF_Z (b) == BUF_Z_BYTE (b) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
705 && charpos != bytepos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
706 abort (); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
707 /* Every character is at least one byte. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
708 if (charpos > bytepos) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
709 abort (); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
710 |
20563
d4de7ffb567d
(buf_bytepos_to_charpos): Use marker bytepos, not bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20537
diff
changeset
|
711 m->bytepos = bytepos; |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
712 m->charpos = charpos; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
713 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
714 if (m->buffer != b) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
715 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
716 unchain_marker (marker); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
717 m->buffer = b; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
718 m->chain = BUF_MARKERS (b); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
719 BUF_MARKERS (b) = marker; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
720 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
721 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
722 return marker; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
723 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
724 |
41235 | 725 /* Remove MARKER from the chain of whatever buffer it is in. |
726 Leave it "in no buffer". | |
727 | |
728 This is called during garbage collection, | |
118 | 729 so we must be careful to ignore and preserve mark bits, |
730 including those in chain fields of markers. */ | |
731 | |
20301
6e2ea54ad704
(unchain_marker): Define as returning nothing.
Andreas Schwab <schwab@suse.de>
parents:
16418
diff
changeset
|
732 void |
118 | 733 unchain_marker (marker) |
734 register Lisp_Object marker; | |
735 { | |
736 register Lisp_Object tail, prev, next; | |
8829
6f0d48241807
(unchain_marker): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
737 register EMACS_INT omark; |
118 | 738 register struct buffer *b; |
739 | |
740 b = XMARKER (marker)->buffer; | |
741 if (b == 0) | |
742 return; | |
743 | |
744 if (EQ (b->name, Qnil)) | |
745 abort (); | |
746 | |
22022
64ac294567a6
(unchain_marker): Abort if the marker is not in its buffer's chain.
Richard M. Stallman <rms@gnu.org>
parents:
21528
diff
changeset
|
747 XMARKER (marker)->buffer = 0; |
64ac294567a6
(unchain_marker): Abort if the marker is not in its buffer's chain.
Richard M. Stallman <rms@gnu.org>
parents:
21528
diff
changeset
|
748 |
10315
c78d0bb85d30
Use BUF_MARKERS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
9315
diff
changeset
|
749 tail = BUF_MARKERS (b); |
118 | 750 prev = Qnil; |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
22744
diff
changeset
|
751 while (! GC_NILP (tail)) |
118 | 752 { |
753 next = XMARKER (tail)->chain; | |
754 XUNMARK (next); | |
755 | |
756 if (XMARKER (marker) == XMARKER (tail)) | |
757 { | |
484 | 758 if (NILP (prev)) |
118 | 759 { |
10315
c78d0bb85d30
Use BUF_MARKERS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
9315
diff
changeset
|
760 BUF_MARKERS (b) = next; |
c78d0bb85d30
Use BUF_MARKERS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
9315
diff
changeset
|
761 /* Deleting first marker from the buffer's chain. Crash |
c78d0bb85d30
Use BUF_MARKERS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
9315
diff
changeset
|
762 if new first marker in chain does not say it belongs |
10999
84076f6a1f1b
(unchain_marker): Allow differing buffers
Richard M. Stallman <rms@gnu.org>
parents:
10315
diff
changeset
|
763 to the same buffer, or at least that they have the same |
84076f6a1f1b
(unchain_marker): Allow differing buffers
Richard M. Stallman <rms@gnu.org>
parents:
10315
diff
changeset
|
764 base buffer. */ |
84076f6a1f1b
(unchain_marker): Allow differing buffers
Richard M. Stallman <rms@gnu.org>
parents:
10315
diff
changeset
|
765 if (!NILP (next) && b->text != XMARKER (next)->buffer->text) |
118 | 766 abort (); |
767 } | |
768 else | |
769 { | |
770 omark = XMARKBIT (XMARKER (prev)->chain); | |
771 XMARKER (prev)->chain = next; | |
772 XSETMARKBIT (XMARKER (prev)->chain, omark); | |
773 } | |
22022
64ac294567a6
(unchain_marker): Abort if the marker is not in its buffer's chain.
Richard M. Stallman <rms@gnu.org>
parents:
21528
diff
changeset
|
774 /* We have removed the marker from the chain; |
64ac294567a6
(unchain_marker): Abort if the marker is not in its buffer's chain.
Richard M. Stallman <rms@gnu.org>
parents:
21528
diff
changeset
|
775 no need to scan the rest of the chain. */ |
64ac294567a6
(unchain_marker): Abort if the marker is not in its buffer's chain.
Richard M. Stallman <rms@gnu.org>
parents:
21528
diff
changeset
|
776 return; |
118 | 777 } |
778 else | |
779 prev = tail; | |
780 tail = next; | |
781 } | |
22022
64ac294567a6
(unchain_marker): Abort if the marker is not in its buffer's chain.
Richard M. Stallman <rms@gnu.org>
parents:
21528
diff
changeset
|
782 |
64ac294567a6
(unchain_marker): Abort if the marker is not in its buffer's chain.
Richard M. Stallman <rms@gnu.org>
parents:
21528
diff
changeset
|
783 /* Marker was not in its chain. */ |
64ac294567a6
(unchain_marker): Abort if the marker is not in its buffer's chain.
Richard M. Stallman <rms@gnu.org>
parents:
21528
diff
changeset
|
784 abort (); |
118 | 785 } |
786 | |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
787 /* Return the char position of marker MARKER, as a C integer. */ |
10315
c78d0bb85d30
Use BUF_MARKERS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
9315
diff
changeset
|
788 |
c78d0bb85d30
Use BUF_MARKERS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
9315
diff
changeset
|
789 int |
118 | 790 marker_position (marker) |
791 Lisp_Object marker; | |
792 { | |
793 register struct Lisp_Marker *m = XMARKER (marker); | |
794 register struct buffer *buf = m->buffer; | |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
795 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
796 if (!buf) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
797 error ("Marker does not point anywhere"); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
798 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
799 return m->charpos; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
800 } |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
801 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
802 /* Return the byte position of marker MARKER, as a C integer. */ |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
803 |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
804 int |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
805 marker_byte_position (marker) |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
806 Lisp_Object marker; |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
807 { |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
808 register struct Lisp_Marker *m = XMARKER (marker); |
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
809 register struct buffer *buf = m->buffer; |
20563
d4de7ffb567d
(buf_bytepos_to_charpos): Use marker bytepos, not bufpos.
Richard M. Stallman <rms@gnu.org>
parents:
20537
diff
changeset
|
810 register int i = m->bytepos; |
118 | 811 |
812 if (!buf) | |
813 error ("Marker does not point anywhere"); | |
814 | |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
815 if (i < BUF_BEG_BYTE (buf) || i > BUF_Z_BYTE (buf)) |
118 | 816 abort (); |
817 | |
818 return i; | |
819 } | |
12999
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
820 |
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
821 DEFUN ("copy-marker", Fcopy_marker, Scopy_marker, 1, 2, 0, |
40553
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
822 doc: /* Return a new marker pointing at the same place as MARKER. |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
823 If argument is a number, makes a new marker pointing |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
824 at that position in the current buffer. |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
825 The optional argument TYPE specifies the insertion type of the new marker; |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
826 see `marker-insertion-type'. */) |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
827 (marker, type) |
12999
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
828 register Lisp_Object marker, type; |
118 | 829 { |
830 register Lisp_Object new; | |
831 | |
22744
79ca732d9740
(Fcopy_marker): Make return from wrong_type_argument
Karl Heuer <kwzh@gnu.org>
parents:
22022
diff
changeset
|
832 if (! (INTEGERP (marker) || MARKERP (marker))) |
12999
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
833 marker = wrong_type_argument (Qinteger_or_marker_p, marker); |
22744
79ca732d9740
(Fcopy_marker): Make return from wrong_type_argument
Karl Heuer <kwzh@gnu.org>
parents:
22022
diff
changeset
|
834 |
79ca732d9740
(Fcopy_marker): Make return from wrong_type_argument
Karl Heuer <kwzh@gnu.org>
parents:
22022
diff
changeset
|
835 new = Fmake_marker (); |
79ca732d9740
(Fcopy_marker): Make return from wrong_type_argument
Karl Heuer <kwzh@gnu.org>
parents:
22022
diff
changeset
|
836 Fset_marker (new, marker, |
79ca732d9740
(Fcopy_marker): Make return from wrong_type_argument
Karl Heuer <kwzh@gnu.org>
parents:
22022
diff
changeset
|
837 (MARKERP (marker) ? Fmarker_buffer (marker) : Qnil)); |
79ca732d9740
(Fcopy_marker): Make return from wrong_type_argument
Karl Heuer <kwzh@gnu.org>
parents:
22022
diff
changeset
|
838 XMARKER (new)->insertion_type = !NILP (type); |
79ca732d9740
(Fcopy_marker): Make return from wrong_type_argument
Karl Heuer <kwzh@gnu.org>
parents:
22022
diff
changeset
|
839 return new; |
12999
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
840 } |
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
841 |
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
842 DEFUN ("marker-insertion-type", Fmarker_insertion_type, |
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
843 Smarker_insertion_type, 1, 1, 0, |
40553
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
844 doc: /* Return insertion type of MARKER: t if it stays after inserted text. |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
845 nil means the marker stays before text inserted there. */) |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
846 (marker) |
12999
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
847 register Lisp_Object marker; |
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
848 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40553
diff
changeset
|
849 CHECK_MARKER (marker); |
12999
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
850 return XMARKER (marker)->insertion_type ? Qt : Qnil; |
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
851 } |
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
852 |
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
853 DEFUN ("set-marker-insertion-type", Fset_marker_insertion_type, |
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
854 Sset_marker_insertion_type, 2, 2, 0, |
40553
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
855 doc: /* Set the insertion-type of MARKER to TYPE. |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
856 If TYPE is t, it means the marker advances when you insert text at it. |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
857 If TYPE is nil, it means the marker stays behind when you insert text at it. */) |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
858 (marker, type) |
12999
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
859 Lisp_Object marker, type; |
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
860 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40553
diff
changeset
|
861 CHECK_MARKER (marker); |
12999
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
862 |
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
863 XMARKER (marker)->insertion_type = ! NILP (type); |
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
864 return type; |
118 | 865 } |
16418
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
866 |
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
867 DEFUN ("buffer-has-markers-at", Fbuffer_has_markers_at, Sbuffer_has_markers_at, |
40553
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
868 1, 1, 0, |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
869 doc: /* Return t if there are markers pointing at POSITION in the current buffer. */) |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
870 (position) |
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
871 Lisp_Object position; |
16418
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
872 { |
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
873 register Lisp_Object tail; |
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
874 register int charno; |
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
875 |
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
876 charno = XINT (position); |
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
877 |
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
878 if (charno < BEG) |
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
879 charno = BEG; |
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
880 if (charno > Z) |
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
881 charno = Z; |
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
882 |
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
883 for (tail = BUF_MARKERS (current_buffer); |
21458
96dd58f4f3bb
(Fbuffer_has_markers_at): Fix termination condition.
Karl Heuer <kwzh@gnu.org>
parents:
21332
diff
changeset
|
884 !NILP (tail); |
16418
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
885 tail = XMARKER (tail)->chain) |
20537
cc87b03bad13
(marker_byte_position): Renamed from marker_position.
Richard M. Stallman <rms@gnu.org>
parents:
20301
diff
changeset
|
886 if (XMARKER (tail)->charpos == charno) |
16418
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
887 return Qt; |
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
888 |
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
889 return Qnil; |
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
890 } |
118 | 891 |
20301
6e2ea54ad704
(unchain_marker): Define as returning nothing.
Andreas Schwab <schwab@suse.de>
parents:
16418
diff
changeset
|
892 void |
118 | 893 syms_of_marker () |
894 { | |
895 defsubr (&Smarker_position); | |
896 defsubr (&Smarker_buffer); | |
897 defsubr (&Sset_marker); | |
898 defsubr (&Scopy_marker); | |
12999
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
899 defsubr (&Smarker_insertion_type); |
b889a50f71db
(Fcopy_marker): New arg TYPE.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
900 defsubr (&Sset_marker_insertion_type); |
16418
cf4260218aec
(Fbuffer_has_markers_at): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
901 defsubr (&Sbuffer_has_markers_at); |
20872
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
902 |
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
903 DEFVAR_BOOL ("byte-debug-flag", &byte_debug_flag, |
40553
440be654a370
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
34972
diff
changeset
|
904 doc: /* Non-nil enables debugging checks in byte/char position conversions. */); |
20872
431f875501a6
(byte_char_debug_check): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
905 byte_debug_flag = 0; |
118 | 906 } |