Mercurial > emacs
annotate src/buffer.c @ 34488:7892b27e1636
(Fkill_buffer): Don't Fset_buffer when testing if
the buffer is the sole visible buffer when in the mini-buffer.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Tue, 12 Dec 2000 15:29:00 +0000 |
parents | 435668e914b1 |
children | e5e6579e8308 |
rev | line source |
---|---|
333 | 1 /* Buffer manipulation primitives for GNU Emacs. |
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2 Copyright (C) 1985,86,87,88,89,93,94,95,97,98, 1999, 2000 |
1953
714df59790af
(Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents:
1952
diff
changeset
|
3 Free Software Foundation, Inc. |
333 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
1953
714df59790af
(Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents:
1952
diff
changeset
|
9 the Free Software Foundation; either version 2, or (at your option) |
333 | 10 any later version. |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 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:
14060
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14060
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
333 | 21 |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26056
diff
changeset
|
22 #include <config.h> |
333 | 23 |
1563
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
24 #include <sys/types.h> |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
25 #include <sys/stat.h> |
333 | 26 #include <sys/param.h> |
19581 | 27 #include <errno.h> |
31886 | 28 #include <stdio.h> |
19581 | 29 |
31102
6a0caa788013
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30911
diff
changeset
|
30 #ifndef USE_CRT_DLL |
19581 | 31 extern int errno; |
31102
6a0caa788013
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30911
diff
changeset
|
32 #endif |
333 | 33 |
34 #ifndef MAXPATHLEN | |
35 /* in 4.1, param.h fails to define this. */ | |
36 #define MAXPATHLEN 1024 | |
37 #endif /* not MAXPATHLEN */ | |
38 | |
21514 | 39 #ifdef HAVE_UNISTD_H |
40 #include <unistd.h> | |
41 #endif | |
333 | 42 #include "lisp.h" |
1308
2660a7053836
* buffer.c: #include intervals.h.
Joseph Arceneaux <jla@gnu.org>
parents:
1291
diff
changeset
|
43 #include "intervals.h" |
333 | 44 #include "window.h" |
45 #include "commands.h" | |
46 #include "buffer.h" | |
17022 | 47 #include "charset.h" |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
48 #include "region-cache.h" |
333 | 49 #include "indent.h" |
2480 | 50 #include "blockinput.h" |
31102
6a0caa788013
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30911
diff
changeset
|
51 #include "keyboard.h" |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
52 #include "frame.h" |
333 | 53 |
54 struct buffer *current_buffer; /* the current buffer */ | |
55 | |
56 /* First buffer in chain of all buffers (in reverse order of creation). | |
57 Threaded through ->next. */ | |
58 | |
59 struct buffer *all_buffers; | |
60 | |
61 /* This structure holds the default values of the buffer-local variables | |
62 defined with DEFVAR_PER_BUFFER, that have special slots in each buffer. | |
63 The default value occupies the same slot in this structure | |
64 as an individual buffer's value occupies in that buffer. | |
65 Setting the default value also goes through the alist of buffers | |
66 and stores into each buffer that does not say it has a local value. */ | |
67 | |
68 struct buffer buffer_defaults; | |
69 | |
70 /* A Lisp_Object pointer to the above, used for staticpro */ | |
71 | |
72 static Lisp_Object Vbuffer_defaults; | |
73 | |
74 /* This structure marks which slots in a buffer have corresponding | |
75 default values in buffer_defaults. | |
76 Each such slot has a nonzero value in this structure. | |
77 The value has only one nonzero bit. | |
78 | |
79 When a buffer has its own local value for a slot, | |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
80 the entry for that slot (found in the same slot in this structure) |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
81 is turned on in the buffer's local_flags array. |
333 | 82 |
83 If a slot in this structure is -1, then even though there may | |
84 be a DEFVAR_PER_BUFFER for the slot, there is no default value for it; | |
85 and the corresponding slot in buffer_defaults is not used. | |
86 | |
87 If a slot is -2, then there is no DEFVAR_PER_BUFFER for it, | |
88 but there is a default value which is copied into each buffer. | |
89 | |
90 If a slot in this structure is negative, then even though there may | |
91 be a DEFVAR_PER_BUFFER for the slot, there is no default value for it; | |
92 and the corresponding slot in buffer_defaults is not used. | |
93 | |
94 If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is | |
95 zero, that is a bug */ | |
96 | |
97 struct buffer buffer_local_flags; | |
98 | |
99 /* This structure holds the names of symbols whose values may be | |
100 buffer-local. It is indexed and accessed in the same way as the above. */ | |
101 | |
102 struct buffer buffer_local_symbols; | |
103 /* A Lisp_Object pointer to the above, used for staticpro */ | |
104 static Lisp_Object Vbuffer_local_symbols; | |
105 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
106 /* This structure holds the required types for the values in the |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
107 buffer-local slots. If a slot contains Qnil, then the |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
108 corresponding buffer slot may contain a value of any type. If a |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
109 slot contains an integer, then prospective values' tags must be |
20995
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
110 equal to that integer (except nil is always allowed). |
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
111 When a tag does not match, the function |
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
112 buffer_slot_type_mismatch will signal an error. |
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
113 |
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
114 If a slot here contains -1, the corresponding variable is read-only. */ |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
115 struct buffer buffer_local_types; |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
116 |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
117 /* Flags indicating which built-in buffer-local variables |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
118 are permanent locals. */ |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
119 static char buffer_permanent_local_flags[MAX_PER_BUFFER_VARS]; |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
120 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
121 /* Number of per-buffer variables used. */ |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
122 |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
123 int last_per_buffer_idx; |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
124 |
333 | 125 Lisp_Object Fset_buffer (); |
392 | 126 void set_buffer_internal (); |
11889
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
127 void set_buffer_internal_1 (); |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
128 static void call_overlay_mod_hooks (); |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
129 static void swap_out_buffer_local_variables (); |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
130 static void reset_buffer_local_variables (); |
333 | 131 |
132 /* Alist of all buffer names vs the buffers. */ | |
133 /* This used to be a variable, but is no longer, | |
134 to prevent lossage due to user rplac'ing this alist or its elements. */ | |
135 Lisp_Object Vbuffer_alist; | |
136 | |
137 /* Functions to call before and after each text change. */ | |
6785
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
138 Lisp_Object Vbefore_change_functions; |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
139 Lisp_Object Vafter_change_functions; |
333 | 140 |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
141 Lisp_Object Vtransient_mark_mode; |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
142 |
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
143 /* t means ignore all read-only text properties. |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
144 A list means ignore such a property if its value is a member of the list. |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
145 Any non-nil value means ignore buffer-read-only. */ |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
146 Lisp_Object Vinhibit_read_only; |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
147 |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
148 /* List of functions to call that can query about killing a buffer. |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
149 If any of these functions returns nil, we don't kill it. */ |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
150 Lisp_Object Vkill_buffer_query_functions; |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
151 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
152 /* List of functions to call before changing an unmodified buffer. */ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
153 Lisp_Object Vfirst_change_hook; |
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
154 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
155 Lisp_Object Qfirst_change_hook; |
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
156 Lisp_Object Qbefore_change_functions; |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
157 Lisp_Object Qafter_change_functions; |
333 | 158 |
23399
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
159 /* If nonzero, all modification hooks are suppressed. */ |
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
160 int inhibit_modification_hooks; |
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
161 |
333 | 162 Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; |
163 | |
164 Lisp_Object Qprotected_field; | |
165 | |
166 Lisp_Object QSFundamental; /* A string "Fundamental" */ | |
167 | |
168 Lisp_Object Qkill_buffer_hook; | |
169 | |
5433 | 170 Lisp_Object Qget_file_buffer; |
171 | |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
172 Lisp_Object Qoverlayp; |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
173 |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
174 Lisp_Object Qpriority, Qwindow, Qevaporate, Qbefore_string, Qafter_string; |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
175 |
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
176 Lisp_Object Qmodification_hooks; |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
177 Lisp_Object Qinsert_in_front_hooks; |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
178 Lisp_Object Qinsert_behind_hooks; |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
179 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
180 static void alloc_buffer_text P_ ((struct buffer *, size_t)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
181 static void free_buffer_text P_ ((struct buffer *b)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
182 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
183 |
333 | 184 /* For debugging; temporary. See set_buffer_internal. */ |
185 /* Lisp_Object Qlisp_mode, Vcheck_symbol; */ | |
186 | |
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
187 void |
333 | 188 nsberror (spec) |
189 Lisp_Object spec; | |
190 { | |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
191 if (STRINGP (spec)) |
333 | 192 error ("No buffer named %s", XSTRING (spec)->data); |
193 error ("Invalid buffer argument"); | |
194 } | |
195 | |
14506
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
196 DEFUN ("buffer-live-p", Fbuffer_live_p, Sbuffer_live_p, 1, 1, 0, |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
197 "Return non-nil if OBJECT is a buffer which has not been killed.\n\ |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
198 Value is nil if OBJECT is not a buffer or if it has been killed.") |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
199 (object) |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
200 Lisp_Object object; |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
201 { |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
202 return ((BUFFERP (object) && ! NILP (XBUFFER (object)->name)) |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
203 ? Qt : Qnil); |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
204 } |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
205 |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
206 DEFUN ("buffer-list", Fbuffer_list, Sbuffer_list, 0, 1, 0, |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
207 "Return a list of all existing live buffers.\n\ |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
208 If the optional arg FRAME is a frame, we return that frame's buffer list.") |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
209 (frame) |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
210 Lisp_Object frame; |
333 | 211 { |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
212 Lisp_Object framelist, general; |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
213 general = Fmapcar (Qcdr, Vbuffer_alist); |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
214 |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
215 if (FRAMEP (frame)) |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
216 { |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
217 Lisp_Object tail; |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
218 |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
219 CHECK_FRAME (frame, 1); |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
220 |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
221 framelist = Fcopy_sequence (XFRAME (frame)->buffer_list); |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
222 |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
223 /* Remove from GENERAL any buffer that duplicates one in FRAMELIST. */ |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
224 tail = framelist; |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
225 while (! NILP (tail)) |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
226 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
227 general = Fdelq (XCAR (tail), general); |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
228 tail = XCDR (tail); |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
229 } |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
230 return nconc2 (framelist, general); |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
231 } |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
232 |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
233 return general; |
333 | 234 } |
235 | |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
236 /* Like Fassoc, but use Fstring_equal to compare |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
237 (which ignores text properties), |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
238 and don't ever QUIT. */ |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
239 |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
240 static Lisp_Object |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
241 assoc_ignore_text_properties (key, list) |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
242 register Lisp_Object key; |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
243 Lisp_Object list; |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
244 { |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
245 register Lisp_Object tail; |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
246 for (tail = list; !NILP (tail); tail = Fcdr (tail)) |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
247 { |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
248 register Lisp_Object elt, tem; |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
249 elt = Fcar (tail); |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
250 tem = Fstring_equal (Fcar (elt), key); |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
251 if (!NILP (tem)) |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
252 return elt; |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
253 } |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
254 return Qnil; |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
255 } |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
256 |
333 | 257 DEFUN ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0, |
258 "Return the buffer named NAME (a string).\n\ | |
259 If there is no live buffer named NAME, return nil.\n\ | |
260 NAME may also be a buffer; if so, the value is that buffer.") | |
261 (name) | |
262 register Lisp_Object name; | |
263 { | |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
264 if (BUFFERP (name)) |
333 | 265 return name; |
266 CHECK_STRING (name, 0); | |
267 | |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
268 return Fcdr (assoc_ignore_text_properties (name, Vbuffer_alist)); |
333 | 269 } |
270 | |
271 DEFUN ("get-file-buffer", Fget_file_buffer, Sget_file_buffer, 1, 1, 0, | |
272 "Return the buffer visiting file FILENAME (a string).\n\ | |
6169 | 273 The buffer's `buffer-file-name' must match exactly the expansion of FILENAME.\n\ |
9047
122d7c1a868b
(get-file-buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9006
diff
changeset
|
274 If there is no such live buffer, return nil.\n\ |
122d7c1a868b
(get-file-buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9006
diff
changeset
|
275 See also `find-buffer-visiting'.") |
333 | 276 (filename) |
277 register Lisp_Object filename; | |
278 { | |
279 register Lisp_Object tail, buf, tem; | |
5433 | 280 Lisp_Object handler; |
281 | |
333 | 282 CHECK_STRING (filename, 0); |
283 filename = Fexpand_file_name (filename, Qnil); | |
284 | |
5433 | 285 /* If the file name has special constructs in it, |
286 call the corresponding file handler. */ | |
7028
6915bf781a38
Pass operation to Ffind_file_name_handler.
Karl Heuer <kwzh@gnu.org>
parents:
6785
diff
changeset
|
287 handler = Ffind_file_name_handler (filename, Qget_file_buffer); |
5433 | 288 if (!NILP (handler)) |
289 return call2 (handler, Qget_file_buffer, filename); | |
290 | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
291 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
333 | 292 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
293 buf = Fcdr (XCAR (tail)); |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
294 if (!BUFFERP (buf)) continue; |
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
295 if (!STRINGP (XBUFFER (buf)->filename)) continue; |
333 | 296 tem = Fstring_equal (XBUFFER (buf)->filename, filename); |
485 | 297 if (!NILP (tem)) |
333 | 298 return buf; |
299 } | |
300 return Qnil; | |
301 } | |
302 | |
12810
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
303 Lisp_Object |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
304 get_truename_buffer (filename) |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
305 register Lisp_Object filename; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
306 { |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
307 register Lisp_Object tail, buf, tem; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
308 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
309 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
12810
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
310 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
311 buf = Fcdr (XCAR (tail)); |
12810
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
312 if (!BUFFERP (buf)) continue; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
313 if (!STRINGP (XBUFFER (buf)->file_truename)) continue; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
314 tem = Fstring_equal (XBUFFER (buf)->file_truename, filename); |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
315 if (!NILP (tem)) |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
316 return buf; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
317 } |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
318 return Qnil; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
319 } |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
320 |
333 | 321 /* Incremented for each buffer created, to assign the buffer number. */ |
322 int buffer_count; | |
323 | |
324 DEFUN ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0, | |
325 "Return the buffer named NAME, or create such a buffer and return it.\n\ | |
326 A new buffer is created if there is no live buffer named NAME.\n\ | |
1195
beefc235076e
* buffer.c (Fget_buffer_create): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1041
diff
changeset
|
327 If NAME starts with a space, the new buffer does not keep undo information.\n\ |
333 | 328 If NAME is a buffer instead of a string, then it is the value returned.\n\ |
329 The value is never nil.") | |
330 (name) | |
331 register Lisp_Object name; | |
332 { | |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
333 register Lisp_Object buf; |
333 | 334 register struct buffer *b; |
335 | |
336 buf = Fget_buffer (name); | |
485 | 337 if (!NILP (buf)) |
333 | 338 return buf; |
339 | |
6697
28e36f59e856
(Fget_buffer_create): Disallow empty string.
Karl Heuer <kwzh@gnu.org>
parents:
6675
diff
changeset
|
340 if (XSTRING (name)->size == 0) |
28e36f59e856
(Fget_buffer_create): Disallow empty string.
Karl Heuer <kwzh@gnu.org>
parents:
6675
diff
changeset
|
341 error ("Empty string for buffer name is not allowed"); |
28e36f59e856
(Fget_buffer_create): Disallow empty string.
Karl Heuer <kwzh@gnu.org>
parents:
6675
diff
changeset
|
342 |
27739
e272d652619a
(Fget_buffer_create, Fmake_indirect_buffer): Use
Gerd Moellmann <gerd@gnu.org>
parents:
27480
diff
changeset
|
343 b = (struct buffer *) allocate_buffer (); |
333 | 344 |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
345 b->size = sizeof (struct buffer) / sizeof (EMACS_INT); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
346 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
347 /* An ordinary buffer uses its own struct buffer_text. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
348 b->text = &b->own_text; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
349 b->base_buffer = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
350 |
333 | 351 BUF_GAP_SIZE (b) = 20; |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
352 BLOCK_INPUT; |
17022 | 353 /* We allocate extra 1-byte at the tail and keep it always '\0' for |
354 anchoring a search. */ | |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
355 alloc_buffer_text (b, BUF_GAP_SIZE (b) + 1); |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
356 UNBLOCK_INPUT; |
333 | 357 if (! BUF_BEG_ADDR (b)) |
10668
acbd9fab366a
(Fget_buffer_create): Call buffer_memory_full.
Richard M. Stallman <rms@gnu.org>
parents:
10611
diff
changeset
|
358 buffer_memory_full (); |
333 | 359 |
360 BUF_PT (b) = 1; | |
361 BUF_GPT (b) = 1; | |
362 BUF_BEGV (b) = 1; | |
363 BUF_ZV (b) = 1; | |
364 BUF_Z (b) = 1; | |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
365 BUF_PT_BYTE (b) = 1; |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
366 BUF_GPT_BYTE (b) = 1; |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
367 BUF_BEGV_BYTE (b) = 1; |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
368 BUF_ZV_BYTE (b) = 1; |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
369 BUF_Z_BYTE (b) = 1; |
333 | 370 BUF_MODIFF (b) = 1; |
16213
3b8851bebc76
(Fget_buffer_create): Initialize BUF_OVERLAY_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents:
16193
diff
changeset
|
371 BUF_OVERLAY_MODIFF (b) = 1; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
372 BUF_SAVE_MODIFF (b) = 1; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
373 BUF_INTERVALS (b) = 0; |
25368
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
374 BUF_UNCHANGED_MODIFIED (b) = 1; |
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
375 BUF_OVERLAY_UNCHANGED_MODIFIED (b) = 1; |
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
376 BUF_END_UNCHANGED (b) = 0; |
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
377 BUF_BEG_UNCHANGED (b) = 0; |
17022 | 378 *(BUF_GPT_ADDR (b)) = *(BUF_Z_ADDR (b)) = 0; /* Put an anchor '\0'. */ |
333 | 379 |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
380 b->newline_cache = 0; |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
381 b->width_run_cache = 0; |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
382 b->width_table = Qnil; |
25368
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
383 b->prevent_redisplay_optimizations_p = 1; |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
384 |
333 | 385 /* Put this on the chain of all buffers including killed ones. */ |
386 b->next = all_buffers; | |
387 all_buffers = b; | |
388 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
389 /* An ordinary buffer normally doesn't need markers |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
390 to handle BEGV and ZV. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
391 b->pt_marker = Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
392 b->begv_marker = Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
393 b->zv_marker = Qnil; |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
394 |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
395 name = Fcopy_sequence (name); |
30911
c1de0fc3a34b
(Fget_buffer_create, Fmake_indirect_buffer): Avoid
Dave Love <fx@gnu.org>
parents:
30695
diff
changeset
|
396 XSTRING (name)->intervals = NULL_INTERVAL; |
333 | 397 b->name = name; |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
398 |
333 | 399 if (XSTRING (name)->data[0] != ' ') |
400 b->undo_list = Qnil; | |
401 else | |
402 b->undo_list = Qt; | |
403 | |
404 reset_buffer (b); | |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
405 reset_buffer_local_variables (b, 1); |
333 | 406 |
407 /* Put this in the alist of all live buffers. */ | |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
408 XSETBUFFER (buf, b); |
333 | 409 Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil)); |
410 | |
411 b->mark = Fmake_marker (); | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
412 BUF_MARKERS (b) = Qnil; |
333 | 413 b->name = name; |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
414 return buf; |
333 | 415 } |
416 | |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
417 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
418 /* Clone per-buffer values of buffer FROM. |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
419 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
420 Buffer TO gets the same per-buffer values as FROM, with the |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
421 following exceptions: (1) TO's name is left untouched, (2) markers |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
422 are copied and made to refer to TO, and (3) overlay lists are |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
423 copied. */ |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
424 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
425 static void |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
426 clone_per_buffer_values (from, to) |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
427 struct buffer *from, *to; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
428 { |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
429 Lisp_Object to_buffer; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
430 int offset; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
431 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
432 XSETBUFFER (to_buffer, to); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
433 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
434 for (offset = PER_BUFFER_VAR_OFFSET (name) + sizeof (Lisp_Object); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
435 offset < sizeof *to; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
436 offset += sizeof (Lisp_Object)) |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
437 { |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
438 Lisp_Object obj; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
439 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
440 obj = PER_BUFFER_VALUE (from, offset); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
441 if (MARKERP (obj)) |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
442 { |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
443 struct Lisp_Marker *m = XMARKER (obj); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
444 obj = Fmake_marker (); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
445 XMARKER (obj)->insertion_type = m->insertion_type; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
446 set_marker_both (obj, to_buffer, m->charpos, m->bytepos); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
447 } |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
448 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
449 PER_BUFFER_VALUE (to, offset) = obj; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
450 } |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
451 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
452 to->overlays_after = Fcopy_sequence (from->overlays_after); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
453 to->overlays_before = Fcopy_sequence (to->overlays_before); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
454 bcopy (from->local_flags, to->local_flags, sizeof to->local_flags); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
455 } |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
456 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
457 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
458 DEFUN ("make-indirect-buffer", Fmake_indirect_buffer, Smake_indirect_buffer, |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
459 2, 3, |
11838
92a61e91ec05
(Fmake_indirect_buffer): Fix interactive spec.
Karl Heuer <kwzh@gnu.org>
parents:
11823
diff
changeset
|
460 "bMake indirect buffer (to buffer): \nBName of indirect buffer: ", |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
461 "Create and return an indirect buffer for buffer BASE-BUFFER, named NAME.\n\ |
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
462 BASE-BUFFER should be an existing buffer (or buffer name).\n\ |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
463 NAME should be a string which is not the name of an existing buffer.\n\ |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
464 Optional argument CLONE non-nil means preserve BASE-BUFFER's state,\n\ |
28636
19c81f320db5
(Fmake_indirect_buffer): Escape newline in doc.
Dave Love <fx@gnu.org>
parents:
28625
diff
changeset
|
465 such as major and minor modes, in the indirect buffer.\n\ |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
466 CLONE nil means the indirect buffer's state is reset to default values.") |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
467 (base_buffer, name, clone) |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
468 Lisp_Object base_buffer, name, clone; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
469 { |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
470 Lisp_Object buf; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
471 struct buffer *b; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
472 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
473 buf = Fget_buffer (name); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
474 if (!NILP (buf)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
475 error ("Buffer name `%s' is in use", XSTRING (name)->data); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
476 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
477 base_buffer = Fget_buffer (base_buffer); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
478 if (NILP (base_buffer)) |
33791
435668e914b1
(Fmake_indirect_buffer): Don't treat nil as a
Gerd Moellmann <gerd@gnu.org>
parents:
33698
diff
changeset
|
479 error ("No such buffer: `%s'", XSTRING (name)->data); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
480 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
481 if (XSTRING (name)->size == 0) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
482 error ("Empty string for buffer name is not allowed"); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
483 |
27739
e272d652619a
(Fget_buffer_create, Fmake_indirect_buffer): Use
Gerd Moellmann <gerd@gnu.org>
parents:
27480
diff
changeset
|
484 b = (struct buffer *) allocate_buffer (); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
485 b->size = sizeof (struct buffer) / sizeof (EMACS_INT); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
486 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
487 if (XBUFFER (base_buffer)->base_buffer) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
488 b->base_buffer = XBUFFER (base_buffer)->base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
489 else |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
490 b->base_buffer = XBUFFER (base_buffer); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
491 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
492 /* Use the base buffer's text object. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
493 b->text = b->base_buffer->text; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
494 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
495 BUF_BEGV (b) = BUF_BEGV (b->base_buffer); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
496 BUF_ZV (b) = BUF_ZV (b->base_buffer); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
497 BUF_PT (b) = BUF_PT (b->base_buffer); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
498 BUF_BEGV_BYTE (b) = BUF_BEGV_BYTE (b->base_buffer); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
499 BUF_ZV_BYTE (b) = BUF_ZV_BYTE (b->base_buffer); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
500 BUF_PT_BYTE (b) = BUF_PT_BYTE (b->base_buffer); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
501 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
502 b->newline_cache = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
503 b->width_run_cache = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
504 b->width_table = Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
505 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
506 /* Put this on the chain of all buffers including killed ones. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
507 b->next = all_buffers; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
508 all_buffers = b; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
509 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
510 name = Fcopy_sequence (name); |
30911
c1de0fc3a34b
(Fget_buffer_create, Fmake_indirect_buffer): Avoid
Dave Love <fx@gnu.org>
parents:
30695
diff
changeset
|
511 XSTRING (name)->intervals = NULL_INTERVAL; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
512 b->name = name; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
513 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
514 reset_buffer (b); |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
515 reset_buffer_local_variables (b, 1); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
516 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
517 /* Put this in the alist of all live buffers. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
518 XSETBUFFER (buf, b); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
519 Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil)); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
520 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
521 b->mark = Fmake_marker (); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
522 b->name = name; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
523 |
24604
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
524 /* The multibyte status belongs to the base buffer. */ |
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
525 b->enable_multibyte_characters = b->base_buffer->enable_multibyte_characters; |
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
526 |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
527 /* Make sure the base buffer has markers for its narrowing. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
528 if (NILP (b->base_buffer->pt_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
529 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
530 b->base_buffer->pt_marker = Fmake_marker (); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
531 set_marker_both (b->base_buffer->pt_marker, base_buffer, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
532 BUF_PT (b->base_buffer), |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
533 BUF_PT_BYTE (b->base_buffer)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
534 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
535 if (NILP (b->base_buffer->begv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
536 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
537 b->base_buffer->begv_marker = Fmake_marker (); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
538 set_marker_both (b->base_buffer->begv_marker, base_buffer, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
539 BUF_BEGV (b->base_buffer), |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
540 BUF_BEGV_BYTE (b->base_buffer)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
541 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
542 if (NILP (b->base_buffer->zv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
543 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
544 b->base_buffer->zv_marker = Fmake_marker (); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
545 set_marker_both (b->base_buffer->zv_marker, base_buffer, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
546 BUF_ZV (b->base_buffer), |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
547 BUF_ZV_BYTE (b->base_buffer)); |
12998
404ae27d5148
(Fmake_indirect_buffer): Set the insertion_type of the zv_marker markers to 1.
Richard M. Stallman <rms@gnu.org>
parents:
12810
diff
changeset
|
548 XMARKER (b->base_buffer->zv_marker)->insertion_type = 1; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
549 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
550 |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
551 if (NILP (clone)) |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
552 { |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
553 /* Give the indirect buffer markers for its narrowing. */ |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
554 b->pt_marker = Fmake_marker (); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
555 set_marker_both (b->pt_marker, buf, BUF_PT (b), BUF_PT_BYTE (b)); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
556 b->begv_marker = Fmake_marker (); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
557 set_marker_both (b->begv_marker, buf, BUF_BEGV (b), BUF_BEGV_BYTE (b)); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
558 b->zv_marker = Fmake_marker (); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
559 set_marker_both (b->zv_marker, buf, BUF_ZV (b), BUF_ZV_BYTE (b)); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
560 XMARKER (b->zv_marker)->insertion_type = 1; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
561 } |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
562 else |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
563 clone_per_buffer_values (b->base_buffer, b); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
564 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
565 return buf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
566 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
567 |
8873
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
568 /* Reinitialize everything about a buffer except its name and contents |
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
569 and local variables. */ |
333 | 570 |
571 void | |
572 reset_buffer (b) | |
573 register struct buffer *b; | |
574 { | |
575 b->filename = Qnil; | |
10751
dea8f022819d
(syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents:
10668
diff
changeset
|
576 b->file_truename = Qnil; |
333 | 577 b->directory = (current_buffer) ? current_buffer->directory : Qnil; |
578 b->modtime = 0; | |
9296
a1a7fc21ded9
(reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9262
diff
changeset
|
579 XSETFASTINT (b->save_length, 0); |
333 | 580 b->last_window_start = 1; |
17566
7ed40081342f
(reset_buffer): Initialize clip_changed field.
Richard M. Stallman <rms@gnu.org>
parents:
17238
diff
changeset
|
581 /* It is more conservative to start out "changed" than "unchanged". */ |
25368
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
582 b->clip_changed = 0; |
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
583 b->prevent_redisplay_optimizations_p = 1; |
333 | 584 b->backed_up = Qnil; |
585 b->auto_save_modified = 0; | |
6477
95a4c1f81d0c
(reset_buffer): Init auto_save_failure_time slot.
Richard M. Stallman <rms@gnu.org>
parents:
6348
diff
changeset
|
586 b->auto_save_failure_time = -1; |
333 | 587 b->auto_save_file_name = Qnil; |
588 b->read_only = Qnil; | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
589 b->overlays_before = Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
590 b->overlays_after = Qnil; |
9296
a1a7fc21ded9
(reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9262
diff
changeset
|
591 XSETFASTINT (b->overlay_center, 1); |
3242
f873e6b9af52
(reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents:
3226
diff
changeset
|
592 b->mark_active = Qnil; |
10561
53f34c870201
(init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
10505
diff
changeset
|
593 b->point_before_scroll = Qnil; |
11052
35664a2851e7
(reset_buffer): Reset file_format element too.(init_buffer_once): Define file_format flag; reset file_format.
Boris Goldowsky <boris@gnu.org>
parents:
11000
diff
changeset
|
594 b->file_format = Qnil; |
16067
5c9f298c9875
(reset_buffer): Initialize last_selected_window slot.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
595 b->last_selected_window = Qnil; |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
596 XSETINT (b->display_count, 0); |
22150
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
597 b->display_time = Qnil; |
20995
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
598 b->enable_multibyte_characters = buffer_defaults.enable_multibyte_characters; |
28322
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
599 b->cursor_type = buffer_defaults.cursor_type; |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
600 b->extra_line_spacing = buffer_defaults.extra_line_spacing; |
333 | 601 } |
602 | |
8873
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
603 /* Reset buffer B's local variables info. |
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
604 Don't use this on a buffer that has already been in use; |
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
605 it does not treat permanent locals consistently. |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
606 Instead, use Fkill_all_local_variables. |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
607 |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
608 If PERMANENT_TOO is 1, then we reset permanent built-in |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
609 buffer-local variables. If PERMANENT_TOO is 0, |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
610 we preserve those. */ |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
611 |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
612 static void |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
613 reset_buffer_local_variables (b, permanent_too) |
333 | 614 register struct buffer *b; |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
615 int permanent_too; |
333 | 616 { |
617 register int offset; | |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
618 int i; |
333 | 619 |
620 /* Reset the major mode to Fundamental, together with all the | |
621 things that depend on the major mode. | |
622 default-major-mode is handled at a higher level. | |
623 We ignore it here. */ | |
624 b->major_mode = Qfundamental_mode; | |
625 b->keymap = Qnil; | |
626 b->abbrev_table = Vfundamental_mode_abbrev_table; | |
627 b->mode_name = QSFundamental; | |
628 b->minor_modes = Qnil; | |
13270
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
629 |
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
630 /* If the standard case table has been altered and invalidated, |
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
631 fix up its insides first. */ |
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
632 if (! (CHAR_TABLE_P (XCHAR_TABLE (Vascii_downcase_table)->extras[0]) |
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
633 && CHAR_TABLE_P (XCHAR_TABLE (Vascii_downcase_table)->extras[1]) |
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
634 && CHAR_TABLE_P (XCHAR_TABLE (Vascii_downcase_table)->extras[2]))) |
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
635 Fset_standard_case_table (Vascii_downcase_table); |
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
636 |
333 | 637 b->downcase_table = Vascii_downcase_table; |
13240
f6e51f3f092a
(reset_buffer_local_variables): Init case_table slots the new way.
Richard M. Stallman <rms@gnu.org>
parents:
13175
diff
changeset
|
638 b->upcase_table = XCHAR_TABLE (Vascii_downcase_table)->extras[0]; |
f6e51f3f092a
(reset_buffer_local_variables): Init case_table slots the new way.
Richard M. Stallman <rms@gnu.org>
parents:
13175
diff
changeset
|
639 b->case_canon_table = XCHAR_TABLE (Vascii_downcase_table)->extras[1]; |
f6e51f3f092a
(reset_buffer_local_variables): Init case_table slots the new way.
Richard M. Stallman <rms@gnu.org>
parents:
13175
diff
changeset
|
640 b->case_eqv_table = XCHAR_TABLE (Vascii_downcase_table)->extras[2]; |
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
641 b->invisibility_spec = Qt; |
15786
f2d0e8928d57
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15776
diff
changeset
|
642 #ifndef DOS_NT |
f2d0e8928d57
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15776
diff
changeset
|
643 b->buffer_file_type = Qnil; |
f2d0e8928d57
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15776
diff
changeset
|
644 #endif |
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
645 |
333 | 646 #if 0 |
647 b->sort_table = XSTRING (Vascii_sort_table); | |
648 b->folding_sort_table = XSTRING (Vascii_folding_sort_table); | |
649 #endif /* 0 */ | |
650 | |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
651 /* Reset all (or most) per-buffer variables to their defaults. */ |
333 | 652 b->local_var_alist = Qnil; |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
653 for (i = 0; i < last_per_buffer_idx; ++i) |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
654 if (permanent_too || buffer_permanent_local_flags[i] == 0) |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
655 SET_PER_BUFFER_VALUE_P (b, i, 0); |
333 | 656 |
657 /* For each slot that has a default value, | |
658 copy that into the slot. */ | |
659 | |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
660 for (offset = PER_BUFFER_VAR_OFFSET (name); |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
661 offset < sizeof *b; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
662 offset += sizeof (Lisp_Object)) |
9362
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
663 { |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
664 int idx = PER_BUFFER_IDX (offset); |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
665 if ((idx > 0 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
666 && (permanent_too |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
667 || buffer_permanent_local_flags[idx] == 0)) |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
668 /* Is -2 used anywhere? */ |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
669 || idx == -2) |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
670 PER_BUFFER_VALUE (b, offset) = PER_BUFFER_DEFAULT (offset); |
9362
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
671 } |
333 | 672 } |
673 | |
392 | 674 /* We split this away from generate-new-buffer, because rename-buffer |
675 and set-visited-file-name ought to be able to use this to really | |
676 rename the buffer properly. */ | |
677 | |
678 DEFUN ("generate-new-buffer-name", Fgenerate_new_buffer_name, Sgenerate_new_buffer_name, | |
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
679 1, 2, 0, |
392 | 680 "Return a string that is the name of no existing buffer based on NAME.\n\ |
681 If there is no live buffer named NAME, then return NAME.\n\ | |
333 | 682 Otherwise modify name by appending `<NUMBER>', incrementing NUMBER\n\ |
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
683 until an unused name is found, and then return that name.\n\ |
3329
c9443f73d329
(Fgenerate_new_buffer_name): Doc fix.
Roland McGrath <roland@gnu.org>
parents:
3295
diff
changeset
|
684 Optional second argument IGNORE specifies a name that is okay to use\n\ |
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
685 \(if it is in the sequence to be tried)\n\ |
3295
4d405f172c79
(reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents:
3242
diff
changeset
|
686 even if a buffer with that name exists.") |
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
687 (name, ignore) |
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
688 register Lisp_Object name, ignore; |
333 | 689 { |
690 register Lisp_Object gentemp, tem; | |
691 int count; | |
692 char number[10]; | |
693 | |
694 CHECK_STRING (name, 0); | |
695 | |
696 tem = Fget_buffer (name); | |
485 | 697 if (NILP (tem)) |
392 | 698 return name; |
333 | 699 |
700 count = 1; | |
701 while (1) | |
702 { | |
703 sprintf (number, "<%d>", ++count); | |
704 gentemp = concat2 (name, build_string (number)); | |
3665
0cffa82ec7de
(Fgenerate_new_buffer_name): GENTEMP is the value compare against IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
705 tem = Fstring_equal (gentemp, ignore); |
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
706 if (!NILP (tem)) |
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
707 return gentemp; |
333 | 708 tem = Fget_buffer (gentemp); |
485 | 709 if (NILP (tem)) |
392 | 710 return gentemp; |
333 | 711 } |
712 } | |
713 | |
714 | |
715 DEFUN ("buffer-name", Fbuffer_name, Sbuffer_name, 0, 1, 0, | |
716 "Return the name of BUFFER, as a string.\n\ | |
392 | 717 With no argument or nil as argument, return the name of the current buffer.") |
333 | 718 (buffer) |
719 register Lisp_Object buffer; | |
720 { | |
485 | 721 if (NILP (buffer)) |
333 | 722 return current_buffer->name; |
723 CHECK_BUFFER (buffer, 0); | |
724 return XBUFFER (buffer)->name; | |
725 } | |
726 | |
727 DEFUN ("buffer-file-name", Fbuffer_file_name, Sbuffer_file_name, 0, 1, 0, | |
728 "Return name of file BUFFER is visiting, or nil if none.\n\ | |
729 No argument or nil as argument means use the current buffer.") | |
730 (buffer) | |
731 register Lisp_Object buffer; | |
732 { | |
485 | 733 if (NILP (buffer)) |
333 | 734 return current_buffer->filename; |
735 CHECK_BUFFER (buffer, 0); | |
736 return XBUFFER (buffer)->filename; | |
737 } | |
738 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
739 DEFUN ("buffer-base-buffer", Fbuffer_base_buffer, Sbuffer_base_buffer, |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
740 0, 1, 0, |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
741 "Return the base buffer of indirect buffer BUFFER.\n\ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
742 If BUFFER is not indirect, return nil.") |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
743 (buffer) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
744 register Lisp_Object buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
745 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
746 struct buffer *base; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
747 Lisp_Object base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
748 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
749 if (NILP (buffer)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
750 base = current_buffer->base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
751 else |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
752 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
753 CHECK_BUFFER (buffer, 0); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
754 base = XBUFFER (buffer)->base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
755 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
756 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
757 if (! base) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
758 return Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
759 XSETBUFFER (base_buffer, base); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
760 return base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
761 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
762 |
333 | 763 DEFUN ("buffer-local-variables", Fbuffer_local_variables, |
764 Sbuffer_local_variables, 0, 1, 0, | |
765 "Return an alist of variables that are buffer-local in BUFFER.\n\ | |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
766 Most elements look like (SYMBOL . VALUE), describing one variable.\n\ |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
767 For a symbol that is locally unbound, just the symbol appears in the value.\n\ |
333 | 768 Note that storing new VALUEs in these elements doesn't change the variables.\n\ |
769 No argument or nil as argument means use current buffer as BUFFER.") | |
770 (buffer) | |
771 register Lisp_Object buffer; | |
772 { | |
773 register struct buffer *buf; | |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
774 register Lisp_Object result; |
333 | 775 |
485 | 776 if (NILP (buffer)) |
333 | 777 buf = current_buffer; |
778 else | |
779 { | |
780 CHECK_BUFFER (buffer, 0); | |
781 buf = XBUFFER (buffer); | |
782 } | |
783 | |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
784 result = Qnil; |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
785 |
333 | 786 { |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
787 register Lisp_Object tail; |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
788 for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail)) |
333 | 789 { |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
790 Lisp_Object val, elt; |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
791 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
792 elt = XCAR (tail); |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
793 |
10505
4f7f9b9ff513
(syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents:
10443
diff
changeset
|
794 /* Reference each variable in the alist in buf. |
4f7f9b9ff513
(syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents:
10443
diff
changeset
|
795 If inquiring about the current buffer, this gets the current values, |
4f7f9b9ff513
(syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents:
10443
diff
changeset
|
796 so store them into the alist so the alist is up to date. |
4f7f9b9ff513
(syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents:
10443
diff
changeset
|
797 If inquiring about some other buffer, this swaps out any values |
4f7f9b9ff513
(syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents:
10443
diff
changeset
|
798 for that buffer, making the alist up to date automatically. */ |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
799 val = find_symbol_value (XCAR (elt)); |
10505
4f7f9b9ff513
(syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents:
10443
diff
changeset
|
800 /* Use the current buffer value only if buf is the current buffer. */ |
4f7f9b9ff513
(syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents:
10443
diff
changeset
|
801 if (buf != current_buffer) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
802 val = XCDR (elt); |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
803 |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
804 /* If symbol is unbound, put just the symbol in the list. */ |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
805 if (EQ (val, Qunbound)) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
806 result = Fcons (XCAR (elt), result); |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
807 /* Otherwise, put (symbol . value) in the list. */ |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
808 else |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
809 result = Fcons (Fcons (XCAR (elt), val), result); |
333 | 810 } |
811 } | |
812 | |
813 /* Add on all the variables stored in special slots. */ | |
814 { | |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
815 int offset, idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
816 |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
817 for (offset = PER_BUFFER_VAR_OFFSET (name); |
333 | 818 offset < sizeof (struct buffer); |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
819 /* sizeof EMACS_INT == sizeof Lisp_Object */ |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
820 offset += (sizeof (EMACS_INT))) |
333 | 821 { |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
822 idx = PER_BUFFER_IDX (offset); |
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
823 if ((idx == -1 || PER_BUFFER_VALUE_P (buf, idx)) |
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
824 && SYMBOLP (PER_BUFFER_SYMBOL (offset))) |
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
825 result = Fcons (Fcons (PER_BUFFER_SYMBOL (offset), |
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
826 PER_BUFFER_VALUE (buf, offset)), |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
827 result); |
333 | 828 } |
829 } | |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
830 |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
831 return result; |
333 | 832 } |
833 | |
834 | |
835 DEFUN ("buffer-modified-p", Fbuffer_modified_p, Sbuffer_modified_p, | |
836 0, 1, 0, | |
837 "Return t if BUFFER was modified since its file was last read or saved.\n\ | |
838 No argument or nil as argument means use current buffer as BUFFER.") | |
839 (buffer) | |
840 register Lisp_Object buffer; | |
841 { | |
842 register struct buffer *buf; | |
485 | 843 if (NILP (buffer)) |
333 | 844 buf = current_buffer; |
845 else | |
846 { | |
847 CHECK_BUFFER (buffer, 0); | |
848 buf = XBUFFER (buffer); | |
849 } | |
850 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
851 return BUF_SAVE_MODIFF (buf) < BUF_MODIFF (buf) ? Qt : Qnil; |
333 | 852 } |
853 | |
854 DEFUN ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p, | |
855 1, 1, 0, | |
856 "Mark current buffer as modified or unmodified according to FLAG.\n\ | |
857 A non-nil FLAG means mark the buffer modified.") | |
858 (flag) | |
859 register Lisp_Object flag; | |
860 { | |
861 register int already; | |
862 register Lisp_Object fn; | |
28207
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
863 Lisp_Object buffer, window; |
333 | 864 |
865 #ifdef CLASH_DETECTION | |
866 /* If buffer becoming modified, lock the file. | |
867 If buffer becoming unmodified, unlock the file. */ | |
868 | |
11659
f9b6e65774e7
(Fset_buffer_modified_p): Use the truename for locking.
Richard M. Stallman <rms@gnu.org>
parents:
11473
diff
changeset
|
869 fn = current_buffer->file_truename; |
24520
e8b7cb3fac8c
(Fset_buffer_modified_p): Don't lock or unlock
Karl Heuer <kwzh@gnu.org>
parents:
24434
diff
changeset
|
870 /* Test buffer-file-name so that binding it to nil is effective. */ |
e8b7cb3fac8c
(Fset_buffer_modified_p): Don't lock or unlock
Karl Heuer <kwzh@gnu.org>
parents:
24434
diff
changeset
|
871 if (!NILP (fn) && ! NILP (current_buffer->filename)) |
333 | 872 { |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
873 already = SAVE_MODIFF < MODIFF; |
485 | 874 if (!already && !NILP (flag)) |
333 | 875 lock_file (fn); |
485 | 876 else if (already && NILP (flag)) |
333 | 877 unlock_file (fn); |
878 } | |
879 #endif /* CLASH_DETECTION */ | |
880 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
881 SAVE_MODIFF = NILP (flag) ? MODIFF : 0; |
28207
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
882 |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
883 /* Set update_mode_lines only if buffer is displayed in some window. |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
884 Packages like jit-lock or lazy-lock preserve a buffer's modified |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
885 state by recording/restoring the state around blocks of code. |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
886 Setting update_mode_lines makes redisplay consider all windows |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
887 (on all frames). Stealth fontification of buffers not displayed |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
888 would incur additional redisplay costs if we'd set |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
889 update_modes_lines unconditionally. |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
890 |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
891 Ideally, I think there should be another mechanism for fontifying |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
892 buffers without "modifying" buffers, or redisplay should be |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
893 smarter about updating the `*' in mode lines. --gerd */ |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
894 XSETBUFFER (buffer, current_buffer); |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
895 window = Fget_buffer_window (buffer, Qt); |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
896 if (WINDOWP (window)) |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
897 update_mode_lines++; |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
898 |
333 | 899 return flag; |
900 } | |
901 | |
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
902 DEFUN ("restore-buffer-modified-p", Frestore_buffer_modified_p, |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
903 Srestore_buffer_modified_p, 1, 1, 0, |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
904 "Like `set-buffer-modified-p', with a differences concerning redisplay.\n\ |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
905 It is not ensured that mode lines will be updated to show the modified\n\ |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
906 state of the current buffer. Use with care.") |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
907 (flag) |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
908 Lisp_Object flag; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
909 { |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
910 #ifdef CLASH_DETECTION |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
911 Lisp_Object fn; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
912 |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
913 /* If buffer becoming modified, lock the file. |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
914 If buffer becoming unmodified, unlock the file. */ |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
915 |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
916 fn = current_buffer->file_truename; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
917 /* Test buffer-file-name so that binding it to nil is effective. */ |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
918 if (!NILP (fn) && ! NILP (current_buffer->filename)) |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
919 { |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
920 int already = SAVE_MODIFF < MODIFF; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
921 if (!already && !NILP (flag)) |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
922 lock_file (fn); |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
923 else if (already && NILP (flag)) |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
924 unlock_file (fn); |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
925 } |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
926 #endif /* CLASH_DETECTION */ |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
927 |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
928 SAVE_MODIFF = NILP (flag) ? MODIFF : 0; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
929 return flag; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
930 } |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
931 |
333 | 932 DEFUN ("buffer-modified-tick", Fbuffer_modified_tick, Sbuffer_modified_tick, |
933 0, 1, 0, | |
934 "Return BUFFER's tick counter, incremented for each change in text.\n\ | |
935 Each buffer has a tick counter which is incremented each time the text in\n\ | |
936 that buffer is changed. It wraps around occasionally.\n\ | |
937 No argument or nil as argument means use current buffer as BUFFER.") | |
938 (buffer) | |
939 register Lisp_Object buffer; | |
940 { | |
941 register struct buffer *buf; | |
485 | 942 if (NILP (buffer)) |
333 | 943 buf = current_buffer; |
944 else | |
945 { | |
946 CHECK_BUFFER (buffer, 0); | |
947 buf = XBUFFER (buffer); | |
948 } | |
949 | |
950 return make_number (BUF_MODIFF (buf)); | |
951 } | |
952 | |
392 | 953 DEFUN ("rename-buffer", Frename_buffer, Srename_buffer, 1, 2, |
5074
bbc2accd226a
Undo last change. SPC feeping at you is too annoying.
Roland McGrath <roland@gnu.org>
parents:
5073
diff
changeset
|
954 "sRename buffer (to new name): \nP", |
333 | 955 "Change current buffer's name to NEWNAME (a string).\n\ |
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
956 If second arg UNIQUE is nil or omitted, it is an error if a\n\ |
392 | 957 buffer named NEWNAME already exists.\n\ |
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
958 If UNIQUE is non-nil, come up with a new name using\n\ |
392 | 959 `generate-new-buffer-name'.\n\ |
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
960 Interactively, you can set UNIQUE with a prefix argument.\n\ |
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
961 We return the name we actually gave the buffer.\n\ |
333 | 962 This does not change the name of the visited file (if any).") |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
963 (newname, unique) |
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
964 register Lisp_Object newname, unique; |
333 | 965 { |
966 register Lisp_Object tem, buf; | |
967 | |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
968 CHECK_STRING (newname, 0); |
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
969 |
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
970 if (XSTRING (newname)->size == 0) |
7455
35657813817c
(Frename_buffer): Reject empty string as new name.
Richard M. Stallman <rms@gnu.org>
parents:
7434
diff
changeset
|
971 error ("Empty string is invalid as a buffer name"); |
35657813817c
(Frename_buffer): Reject empty string as new name.
Richard M. Stallman <rms@gnu.org>
parents:
7434
diff
changeset
|
972 |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
973 tem = Fget_buffer (newname); |
485 | 974 if (!NILP (tem)) |
392 | 975 { |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
976 /* Don't short-circuit if UNIQUE is t. That is a useful way to |
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
977 rename the buffer automatically so you can create another |
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
978 with the original name. It makes UNIQUE equivalent to |
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
979 (rename-buffer (generate-new-buffer-name NEWNAME)). */ |
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
980 if (NILP (unique) && XBUFFER (tem) == current_buffer) |
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
981 return current_buffer->name; |
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
982 if (!NILP (unique)) |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
983 newname = Fgenerate_new_buffer_name (newname, current_buffer->name); |
392 | 984 else |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
985 error ("Buffer name `%s' is in use", XSTRING (newname)->data); |
392 | 986 } |
333 | 987 |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
988 current_buffer->name = newname; |
1707
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
989 |
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
990 /* Catch redisplay's attention. Unless we do this, the mode lines for |
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
991 any windows displaying current_buffer will stay unchanged. */ |
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
992 update_mode_lines++; |
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
993 |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
994 XSETBUFFER (buf, current_buffer); |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
995 Fsetcar (Frassq (buf, Vbuffer_alist), newname); |
8599
cf3233d70e94
(Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents:
8550
diff
changeset
|
996 if (NILP (current_buffer->filename) |
cf3233d70e94
(Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents:
8550
diff
changeset
|
997 && !NILP (current_buffer->auto_save_file_name)) |
333 | 998 call0 (intern ("rename-auto-save-file")); |
9939
686916b836b4
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9933
diff
changeset
|
999 /* Refetch since that last call may have done GC. */ |
686916b836b4
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9933
diff
changeset
|
1000 return current_buffer->name; |
333 | 1001 } |
1002 | |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1003 DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 3, 0, |
333 | 1004 "Return most recently selected buffer other than BUFFER.\n\ |
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
1005 Buffers not visible in windows are preferred to visible buffers,\n\ |
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
1006 unless optional second argument VISIBLE-OK is non-nil.\n\ |
22191
c07c0604d95d
(Fother_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
22189
diff
changeset
|
1007 If the optional third argument FRAME is non-nil, use that frame's\n\ |
c07c0604d95d
(Fother_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
22189
diff
changeset
|
1008 buffer list instead of the selected frame's buffer list.\n\ |
333 | 1009 If no other buffer exists, the buffer `*scratch*' is returned.\n\ |
1010 If BUFFER is omitted or nil, some interesting buffer is returned.") | |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1011 (buffer, visible_ok, frame) |
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1012 register Lisp_Object buffer, visible_ok, frame; |
333 | 1013 { |
14226
ad275aca6fc5
(Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1014 Lisp_Object Fset_buffer_major_mode (); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1015 register Lisp_Object tail, buf, notsogood, tem, pred, add_ons; |
333 | 1016 notsogood = Qnil; |
1017 | |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1018 if (NILP (frame)) |
25664
832aeb9c3996
(Fother_buffer): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25653
diff
changeset
|
1019 frame = selected_frame; |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1020 |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1021 tail = Vbuffer_alist; |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1022 pred = frame_buffer_predicate (frame); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1023 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1024 /* Consider buffers that have been seen in the selected frame |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1025 before other buffers. */ |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1026 |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1027 tem = frame_buffer_list (frame); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1028 add_ons = Qnil; |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1029 while (CONSP (tem)) |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1030 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1031 if (BUFFERP (XCAR (tem))) |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1032 add_ons = Fcons (Fcons (Qnil, XCAR (tem)), add_ons); |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1033 tem = XCDR (tem); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1034 } |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1035 tail = nconc2 (Fnreverse (add_ons), tail); |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1036 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1037 for (; !NILP (tail); tail = Fcdr (tail)) |
333 | 1038 { |
1039 buf = Fcdr (Fcar (tail)); | |
1040 if (EQ (buf, buffer)) | |
1041 continue; | |
1042 if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ') | |
1043 continue; | |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1044 /* If the selected frame has a buffer_predicate, |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1045 disregard buffers that don't fit the predicate. */ |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1046 if (!NILP (pred)) |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1047 { |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1048 tem = call1 (pred, buf); |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1049 if (NILP (tem)) |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1050 continue; |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1051 } |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1052 |
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
1053 if (NILP (visible_ok)) |
31395
d0f522cf422b
(Fother_buffer): Consider buffers as invisible when
Gerd Moellmann <gerd@gnu.org>
parents:
31128
diff
changeset
|
1054 tem = Fget_buffer_window (buf, Qvisible); |
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
1055 else |
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
1056 tem = Qnil; |
485 | 1057 if (NILP (tem)) |
333 | 1058 return buf; |
485 | 1059 if (NILP (notsogood)) |
333 | 1060 notsogood = buf; |
1061 } | |
485 | 1062 if (!NILP (notsogood)) |
333 | 1063 return notsogood; |
27480
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1064 buf = Fget_buffer (build_string ("*scratch*")); |
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1065 if (NILP (buf)) |
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1066 { |
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1067 buf = Fget_buffer_create (build_string ("*scratch*")); |
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1068 Fset_buffer_major_mode (buf); |
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1069 } |
14226
ad275aca6fc5
(Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1070 return buf; |
333 | 1071 } |
1072 | |
12110
d7d7f15f3a92
(Fbuffer_disable_undo): Make this function interactive.
Karl Heuer <kwzh@gnu.org>
parents:
12101
diff
changeset
|
1073 DEFUN ("buffer-disable-undo", Fbuffer_disable_undo, Sbuffer_disable_undo, |
d7d7f15f3a92
(Fbuffer_disable_undo): Make this function interactive.
Karl Heuer <kwzh@gnu.org>
parents:
12101
diff
changeset
|
1074 0, 1, "", |
5247
0cf95629f6c4
(Fbuffer_disable_undo): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
5075
diff
changeset
|
1075 "Make BUFFER stop keeping undo information.\n\ |
0cf95629f6c4
(Fbuffer_disable_undo): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
5075
diff
changeset
|
1076 No argument or nil as argument means do this for the current buffer.") |
648 | 1077 (buffer) |
1078 register Lisp_Object buffer; | |
333 | 1079 { |
648 | 1080 Lisp_Object real_buffer; |
1081 | |
1082 if (NILP (buffer)) | |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
1083 XSETBUFFER (real_buffer, current_buffer); |
648 | 1084 else |
1085 { | |
1086 real_buffer = Fget_buffer (buffer); | |
1087 if (NILP (real_buffer)) | |
1088 nsberror (buffer); | |
1089 } | |
1090 | |
1091 XBUFFER (real_buffer)->undo_list = Qt; | |
1092 | |
333 | 1093 return Qnil; |
1094 } | |
1095 | |
1096 DEFUN ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo, | |
1097 0, 1, "", | |
1098 "Start keeping undo information for buffer BUFFER.\n\ | |
1099 No argument or nil as argument means do this for the current buffer.") | |
648 | 1100 (buffer) |
1101 register Lisp_Object buffer; | |
333 | 1102 { |
648 | 1103 Lisp_Object real_buffer; |
333 | 1104 |
648 | 1105 if (NILP (buffer)) |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
1106 XSETBUFFER (real_buffer, current_buffer); |
333 | 1107 else |
1108 { | |
648 | 1109 real_buffer = Fget_buffer (buffer); |
1110 if (NILP (real_buffer)) | |
1111 nsberror (buffer); | |
333 | 1112 } |
1113 | |
648 | 1114 if (EQ (XBUFFER (real_buffer)->undo_list, Qt)) |
1115 XBUFFER (real_buffer)->undo_list = Qnil; | |
333 | 1116 |
1117 return Qnil; | |
1118 } | |
1119 | |
1120 /* | |
1121 DEFVAR_LISP ("kill-buffer-hook", no_cell, "\ | |
1122 Hook to be run (by `run-hooks', which see) when a buffer is killed.\n\ | |
1123 The buffer being killed will be current while the hook is running.\n\ | |
1124 See `kill-buffer'." | |
1125 */ | |
1126 DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 1, 1, "bKill buffer: ", | |
1127 "Kill the buffer BUFFER.\n\ | |
1128 The argument may be a buffer or may be the name of a buffer.\n\ | |
1129 An argument of nil means kill the current buffer.\n\n\ | |
1130 Value is t if the buffer is actually killed, nil if user says no.\n\n\ | |
1131 The value of `kill-buffer-hook' (which may be local to that buffer),\n\ | |
1132 if not void, is a list of functions to be called, with no arguments,\n\ | |
1133 before the buffer is actually killed. The buffer to be killed is current\n\ | |
1134 when the hook functions are called.\n\n\ | |
1135 Any processes that have this buffer as the `process-buffer' are killed\n\ | |
15421
2dc1a3e42a20
(Fkill_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15307
diff
changeset
|
1136 with SIGHUP.") |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1137 (buffer) |
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1138 Lisp_Object buffer; |
333 | 1139 { |
1140 Lisp_Object buf; | |
1141 register struct buffer *b; | |
1142 register Lisp_Object tem; | |
1143 register struct Lisp_Marker *m; | |
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
1144 struct gcpro gcpro1; |
333 | 1145 |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1146 if (NILP (buffer)) |
333 | 1147 buf = Fcurrent_buffer (); |
1148 else | |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1149 buf = Fget_buffer (buffer); |
485 | 1150 if (NILP (buf)) |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1151 nsberror (buffer); |
333 | 1152 |
1153 b = XBUFFER (buf); | |
1154 | |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1155 /* Avoid trouble for buffer already dead. */ |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1156 if (NILP (b->name)) |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1157 return Qnil; |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1158 |
333 | 1159 /* Query if the buffer is still modified. */ |
485 | 1160 if (INTERACTIVE && !NILP (b->filename) |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1161 && BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) |
333 | 1162 { |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1163 GCPRO1 (buf); |
333 | 1164 tem = do_yes_or_no_p (format1 ("Buffer %s modified; kill anyway? ", |
1165 XSTRING (b->name)->data)); | |
1166 UNGCPRO; | |
485 | 1167 if (NILP (tem)) |
333 | 1168 return Qnil; |
1169 } | |
1170 | |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1171 /* Run hooks with the buffer to be killed the current buffer. */ |
333 | 1172 { |
1173 int count = specpdl_ptr - specpdl; | |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1174 Lisp_Object list; |
333 | 1175 |
1176 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
1177 set_buffer_internal (b); | |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1178 |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1179 /* First run the query functions; if any query is answered no, |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1180 don't kill the buffer. */ |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1181 for (list = Vkill_buffer_query_functions; !NILP (list); list = Fcdr (list)) |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1182 { |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1183 tem = call0 (Fcar (list)); |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1184 if (NILP (tem)) |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1185 return unbind_to (count, Qnil); |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1186 } |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1187 |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1188 /* Then run the hooks. */ |
6205
88e41d7d1e27
(Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents:
6169
diff
changeset
|
1189 if (!NILP (Vrun_hooks)) |
88e41d7d1e27
(Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents:
6169
diff
changeset
|
1190 call1 (Vrun_hooks, Qkill_buffer_hook); |
333 | 1191 unbind_to (count, Qnil); |
1192 } | |
1193 | |
1194 /* We have no more questions to ask. Verify that it is valid | |
1195 to kill the buffer. This must be done after the questions | |
1196 since anything can happen within do_yes_or_no_p. */ | |
1197 | |
1198 /* Don't kill the minibuffer now current. */ | |
1199 if (EQ (buf, XWINDOW (minibuf_window)->buffer)) | |
1200 return Qnil; | |
1201 | |
485 | 1202 if (NILP (b->name)) |
333 | 1203 return Qnil; |
1204 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1205 /* When we kill a base buffer, kill all its indirect buffers. |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1206 We do it at this stage so nothing terrible happens if they |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1207 ask questions or their hooks get errors. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1208 if (! b->base_buffer) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1209 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1210 struct buffer *other; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1211 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1212 GCPRO1 (buf); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1213 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1214 for (other = all_buffers; other; other = other->next) |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1215 /* all_buffers contains dead buffers too; |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1216 don't re-kill them. */ |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1217 if (other->base_buffer == b && !NILP (other->name)) |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1218 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1219 Lisp_Object buf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1220 XSETBUFFER (buf, other); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1221 Fkill_buffer (buf); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1222 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1223 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1224 UNGCPRO; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1225 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1226 |
333 | 1227 /* Make this buffer not be current. |
1228 In the process, notice if this is the sole visible buffer | |
1229 and give up if so. */ | |
1230 if (b == current_buffer) | |
1231 { | |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1232 tem = Fother_buffer (buf, Qnil, Qnil); |
333 | 1233 Fset_buffer (tem); |
1234 if (b == current_buffer) | |
1235 return Qnil; | |
1236 } | |
1237 | |
33698
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1238 /* Notice if the buffer to kill is the sole visible buffer |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1239 when we're currently in the mini-buffer, and give up if so. */ |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1240 XSETBUFFER (tem, current_buffer); |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1241 if (EQ (tem, XWINDOW (minibuf_window)->buffer)) |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1242 { |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1243 tem = Fother_buffer (buf, Qnil, Qnil); |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1244 if (EQ (buf, tem)) |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1245 return Qnil; |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1246 } |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1247 |
333 | 1248 /* Now there is no question: we can kill the buffer. */ |
1249 | |
1250 #ifdef CLASH_DETECTION | |
1251 /* Unlock this buffer's file, if it is locked. */ | |
1252 unlock_buffer (b); | |
1253 #endif /* CLASH_DETECTION */ | |
1254 | |
1255 kill_buffer_processes (buf); | |
1256 | |
1257 tem = Vinhibit_quit; | |
1258 Vinhibit_quit = Qt; | |
13922
5636ed4243ec
(Fkill_buffer): Delete buffer from Vbuffer_alist after replacing it.
Erik Naggum <erik@naggum.no>
parents:
13917
diff
changeset
|
1259 replace_buffer_in_all_windows (buf); |
333 | 1260 Vbuffer_alist = Fdelq (Frassq (buf, Vbuffer_alist), Vbuffer_alist); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1261 frames_discard_buffer (buf); |
333 | 1262 Vinhibit_quit = tem; |
1263 | |
7994
c5b7f74b5023
(Fkill_buffer): Don't delete auto save file
Richard M. Stallman <rms@gnu.org>
parents:
7985
diff
changeset
|
1264 /* Delete any auto-save file, if we saved it in this session. */ |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1265 if (STRINGP (b->auto_save_file_name) |
13175
86fef98acedc
(Fkill_buffer): Don't kill auto save file if not recent.
Richard M. Stallman <rms@gnu.org>
parents:
13169
diff
changeset
|
1266 && b->auto_save_modified != 0 |
20186
6c9879dee580
(Fkill_buffer): Don't assume buffer is current.
Karl Heuer <kwzh@gnu.org>
parents:
20080
diff
changeset
|
1267 && BUF_SAVE_MODIFF (b) < b->auto_save_modified) |
333 | 1268 { |
1269 Lisp_Object tem; | |
1270 tem = Fsymbol_value (intern ("delete-auto-save-files")); | |
485 | 1271 if (! NILP (tem)) |
10082
8d3a71736423
(Fkill_buffer): Use internal_delete_file.
Richard M. Stallman <rms@gnu.org>
parents:
9950
diff
changeset
|
1272 internal_delete_file (b->auto_save_file_name); |
333 | 1273 } |
1274 | |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1275 if (b->base_buffer) |
333 | 1276 { |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1277 /* Unchain all markers that belong to this indirect buffer. |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1278 Don't unchain the markers that belong to the base buffer |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1279 or its other indirect buffers. */ |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1280 for (tem = BUF_MARKERS (b); !NILP (tem); ) |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1281 { |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1282 Lisp_Object next; |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1283 m = XMARKER (tem); |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1284 next = m->chain; |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1285 if (m->buffer == b) |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1286 unchain_marker (tem); |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1287 tem = next; |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1288 } |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1289 } |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1290 else |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1291 { |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1292 /* Unchain all markers of this buffer and its indirect buffers. |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1293 and leave them pointing nowhere. */ |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1294 for (tem = BUF_MARKERS (b); !NILP (tem); ) |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1295 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1296 m = XMARKER (tem); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1297 m->buffer = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1298 tem = m->chain; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1299 m->chain = Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1300 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1301 BUF_MARKERS (b) = Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1302 BUF_INTERVALS (b) = NULL_INTERVAL; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1303 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1304 /* Perhaps we should explicitly free the interval tree here... */ |
333 | 1305 } |
1291
7c32612174c3
* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents:
1281
diff
changeset
|
1306 |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1307 /* Reset the local variables, so that this buffer's local values |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1308 won't be protected from GC. They would be protected |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1309 if they happened to remain encached in their symbols. |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1310 This gets rid of them for certain. */ |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1311 swap_out_buffer_local_variables (b); |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
1312 reset_buffer_local_variables (b, 1); |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1313 |
333 | 1314 b->name = Qnil; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1315 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
1316 BLOCK_INPUT; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1317 if (! b->base_buffer) |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
1318 free_buffer_text (b); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1319 |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1320 if (b->newline_cache) |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1321 { |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1322 free_region_cache (b->newline_cache); |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1323 b->newline_cache = 0; |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1324 } |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1325 if (b->width_run_cache) |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1326 { |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1327 free_region_cache (b->width_run_cache); |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1328 b->width_run_cache = 0; |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1329 } |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1330 b->width_table = Qnil; |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
1331 UNBLOCK_INPUT; |
333 | 1332 b->undo_list = Qnil; |
1333 | |
1334 return Qt; | |
1335 } | |
1336 | |
550 | 1337 /* Move the assoc for buffer BUF to the front of buffer-alist. Since |
1338 we do this each time BUF is selected visibly, the more recently | |
1339 selected buffers are always closer to the front of the list. This | |
1340 means that other_buffer is more likely to choose a relevant buffer. */ | |
333 | 1341 |
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
1342 void |
333 | 1343 record_buffer (buf) |
1344 Lisp_Object buf; | |
1345 { | |
1346 register Lisp_Object link, prev; | |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1347 Lisp_Object frame; |
25664
832aeb9c3996
(Fother_buffer): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25653
diff
changeset
|
1348 frame = selected_frame; |
333 | 1349 |
1350 prev = Qnil; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1351 for (link = Vbuffer_alist; CONSP (link); link = XCDR (link)) |
333 | 1352 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1353 if (EQ (XCDR (XCAR (link)), buf)) |
333 | 1354 break; |
1355 prev = link; | |
1356 } | |
1357 | |
550 | 1358 /* Effectively do Vbuffer_alist = Fdelq (link, Vbuffer_alist); |
1359 we cannot use Fdelq itself here because it allows quitting. */ | |
333 | 1360 |
485 | 1361 if (NILP (prev)) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1362 Vbuffer_alist = XCDR (Vbuffer_alist); |
333 | 1363 else |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1364 XCDR (prev) = XCDR (XCDR (prev)); |
333 | 1365 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1366 XCDR (link) = Vbuffer_alist; |
333 | 1367 Vbuffer_alist = link; |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1368 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1369 /* Now move this buffer to the front of frame_buffer_list also. */ |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1370 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1371 prev = Qnil; |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1372 for (link = frame_buffer_list (frame); CONSP (link); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1373 link = XCDR (link)) |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1374 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1375 if (EQ (XCAR (link), buf)) |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1376 break; |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1377 prev = link; |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1378 } |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1379 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1380 /* Effectively do delq. */ |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1381 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1382 if (CONSP (link)) |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1383 { |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1384 if (NILP (prev)) |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1385 set_frame_buffer_list (frame, |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1386 XCDR (frame_buffer_list (frame))); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1387 else |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1388 XCDR (prev) = XCDR (XCDR (prev)); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1389 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1390 XCDR (link) = frame_buffer_list (frame); |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1391 set_frame_buffer_list (frame, link); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1392 } |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1393 else |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1394 set_frame_buffer_list (frame, Fcons (buf, frame_buffer_list (frame))); |
333 | 1395 } |
1396 | |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1397 DEFUN ("set-buffer-major-mode", Fset_buffer_major_mode, Sset_buffer_major_mode, 1, 1, 0, |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1398 "Set an appropriate major mode for BUFFER, according to `default-major-mode'.\n\ |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1399 Use this function before selecting the buffer, since it may need to inspect\n\ |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1400 the current buffer's major mode.") |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1401 (buffer) |
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1402 Lisp_Object buffer; |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1403 { |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1404 int count; |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1405 Lisp_Object function; |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1406 |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1407 function = buffer_defaults.major_mode; |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1408 if (NILP (function) && NILP (Fget (current_buffer->major_mode, Qmode_class))) |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1409 function = current_buffer->major_mode; |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1410 |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1411 if (NILP (function) || EQ (function, Qfundamental_mode)) |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1412 return Qnil; |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1413 |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1414 count = specpdl_ptr - specpdl; |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1415 |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1416 /* To select a nonfundamental mode, |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1417 select the buffer temporarily and then call the mode function. */ |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1418 |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1419 record_unwind_protect (save_excursion_restore, save_excursion_save ()); |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1420 |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1421 Fset_buffer (buffer); |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1422 call0 (function); |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1423 |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1424 return unbind_to (count, Qnil); |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1425 } |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1426 |
25181
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1427 /* If switching buffers in WINDOW would be an error, return |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1428 a C string saying what the error would be. */ |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1429 |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1430 char * |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1431 no_switch_window (window) |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1432 Lisp_Object window; |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1433 { |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1434 Lisp_Object tem; |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1435 if (EQ (minibuf_window, window)) |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1436 return "Cannot switch buffers in minibuffer window"; |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1437 tem = Fwindow_dedicated_p (window); |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1438 if (!NILP (tem)) |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1439 return "Cannot switch buffers in a dedicated window"; |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1440 return NULL; |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1441 } |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1442 |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1443 /* Switch to buffer BUFFER in the selected window. |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1444 If NORECORD is non-nil, don't call record_buffer. */ |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1445 |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1446 Lisp_Object |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1447 switch_to_buffer_1 (buffer, norecord) |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1448 Lisp_Object buffer, norecord; |
333 | 1449 { |
1450 register Lisp_Object buf; | |
1451 | |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1452 if (NILP (buffer)) |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1453 buf = Fother_buffer (Fcurrent_buffer (), Qnil, Qnil); |
333 | 1454 else |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1455 { |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1456 buf = Fget_buffer (buffer); |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1457 if (NILP (buf)) |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1458 { |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1459 buf = Fget_buffer_create (buffer); |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1460 Fset_buffer_major_mode (buf); |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1461 } |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1462 } |
333 | 1463 Fset_buffer (buf); |
485 | 1464 if (NILP (norecord)) |
333 | 1465 record_buffer (buf); |
1466 | |
1467 Fset_window_buffer (EQ (selected_window, minibuf_window) | |
1909
ea6c75bc0d38
* buffer.c (Fswitch_to_buffer): Pass the correct number of
Jim Blandy <jimb@redhat.com>
parents:
1876
diff
changeset
|
1468 ? Fnext_window (minibuf_window, Qnil, Qnil) |
ea6c75bc0d38
* buffer.c (Fswitch_to_buffer): Pass the correct number of
Jim Blandy <jimb@redhat.com>
parents:
1876
diff
changeset
|
1469 : selected_window, |
333 | 1470 buf); |
1471 | |
16840
299b0e0f0a93
Fix typo editing previous change.
Richard M. Stallman <rms@gnu.org>
parents:
16830
diff
changeset
|
1472 return buf; |
333 | 1473 } |
1474 | |
25181
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1475 DEFUN ("switch-to-buffer", Fswitch_to_buffer, Sswitch_to_buffer, 1, 2, "BSwitch to buffer: ", |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1476 "Select buffer BUFFER in the current window.\n\ |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1477 BUFFER may be a buffer or a buffer name.\n\ |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1478 Optional second arg NORECORD non-nil means\n\ |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1479 do not put this buffer at the front of the list of recently selected ones.\n\ |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1480 \n\ |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1481 WARNING: This is NOT the way to work on another buffer temporarily\n\ |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1482 within a Lisp program! Use `set-buffer' instead. That avoids messing with\n\ |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1483 the window-buffer correspondences.") |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1484 (buffer, norecord) |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1485 Lisp_Object buffer, norecord; |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1486 { |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1487 char *err; |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1488 |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1489 err = no_switch_window (selected_window); |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1490 if (err) error (err); |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1491 |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1492 return switch_to_buffer_1 (buffer, norecord); |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1493 } |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1494 |
16840
299b0e0f0a93
Fix typo editing previous change.
Richard M. Stallman <rms@gnu.org>
parents:
16830
diff
changeset
|
1495 DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0, |
333 | 1496 "Select buffer BUFFER in some window, preferably a different one.\n\ |
1497 If BUFFER is nil, then some other buffer is chosen.\n\ | |
1498 If `pop-up-windows' is non-nil, windows can be split to do this.\n\ | |
1499 If optional second arg OTHER-WINDOW is non-nil, insist on finding another\n\ | |
15307
08ce5fa97ce3
(Fpop_to_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15122
diff
changeset
|
1500 window even if BUFFER is already visible in the selected window.\n\ |
08ce5fa97ce3
(Fpop_to_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15122
diff
changeset
|
1501 This uses the function `display-buffer' as a subroutine; see the documentation\n\ |
16830
4792e73d511f
(Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents:
16665
diff
changeset
|
1502 of `display-buffer' for additional customization information.\n\ |
4792e73d511f
(Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents:
16665
diff
changeset
|
1503 \n\ |
4792e73d511f
(Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents:
16665
diff
changeset
|
1504 Optional third arg NORECORD non-nil means\n\ |
4792e73d511f
(Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents:
16665
diff
changeset
|
1505 do not put this buffer at the front of the list of recently selected ones.") |
4792e73d511f
(Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents:
16665
diff
changeset
|
1506 (buffer, other_window, norecord) |
4792e73d511f
(Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents:
16665
diff
changeset
|
1507 Lisp_Object buffer, other_window, norecord; |
333 | 1508 { |
1509 register Lisp_Object buf; | |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1510 if (NILP (buffer)) |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1511 buf = Fother_buffer (Fcurrent_buffer (), Qnil, Qnil); |
333 | 1512 else |
10916
3aea65d9eb68
(Fpop_to_buffer): Call Fset_buffer_major_mode if we create a buffer.
Richard M. Stallman <rms@gnu.org>
parents:
10751
diff
changeset
|
1513 { |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1514 buf = Fget_buffer (buffer); |
10916
3aea65d9eb68
(Fpop_to_buffer): Call Fset_buffer_major_mode if we create a buffer.
Richard M. Stallman <rms@gnu.org>
parents:
10751
diff
changeset
|
1515 if (NILP (buf)) |
3aea65d9eb68
(Fpop_to_buffer): Call Fset_buffer_major_mode if we create a buffer.
Richard M. Stallman <rms@gnu.org>
parents:
10751
diff
changeset
|
1516 { |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1517 buf = Fget_buffer_create (buffer); |
10916
3aea65d9eb68
(Fpop_to_buffer): Call Fset_buffer_major_mode if we create a buffer.
Richard M. Stallman <rms@gnu.org>
parents:
10751
diff
changeset
|
1518 Fset_buffer_major_mode (buf); |
3aea65d9eb68
(Fpop_to_buffer): Call Fset_buffer_major_mode if we create a buffer.
Richard M. Stallman <rms@gnu.org>
parents:
10751
diff
changeset
|
1519 } |
3aea65d9eb68
(Fpop_to_buffer): Call Fset_buffer_major_mode if we create a buffer.
Richard M. Stallman <rms@gnu.org>
parents:
10751
diff
changeset
|
1520 } |
333 | 1521 Fset_buffer (buf); |
16830
4792e73d511f
(Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents:
16665
diff
changeset
|
1522 if (NILP (norecord)) |
4792e73d511f
(Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents:
16665
diff
changeset
|
1523 record_buffer (buf); |
20853
58bb74217a10
(Fpop_to_buffer): Pass new arg to Fdisplay_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
1524 Fselect_window (Fdisplay_buffer (buf, other_window, Qnil)); |
3295
4d405f172c79
(reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents:
3242
diff
changeset
|
1525 return buf; |
333 | 1526 } |
1527 | |
1528 DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0, | |
1529 "Return the current buffer as a Lisp object.") | |
1530 () | |
1531 { | |
1532 register Lisp_Object buf; | |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
1533 XSETBUFFER (buf, current_buffer); |
333 | 1534 return buf; |
1535 } | |
1536 | |
25491
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1537 /* Set the current buffer to B. |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1538 |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1539 We previously set windows_or_buffers_changed here to invalidate |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1540 global unchanged information in beg_unchanged and end_unchanged. |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1541 This is no longer necessary because we now compute unchanged |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1542 information on a buffer-basis. Every action affecting other |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1543 windows than the selected one requires a select_window at some |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1544 time, and that increments windows_or_buffers_changed. */ |
333 | 1545 |
1546 void | |
1547 set_buffer_internal (b) | |
1548 register struct buffer *b; | |
1549 { | |
25368
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
1550 if (current_buffer != b) |
25491
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1551 set_buffer_internal_1 (b); |
11889
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1552 } |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1553 |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1554 /* Set the current buffer to B, and do not set windows_or_buffers_changed. |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1555 This is used by redisplay. */ |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1556 |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1557 void |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1558 set_buffer_internal_1 (b) |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1559 register struct buffer *b; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1560 { |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1561 register struct buffer *old_buf; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1562 register Lisp_Object tail, valcontents; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1563 Lisp_Object tem; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1564 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
1565 #ifdef USE_MMAP_FOR_BUFFERS |
31416
9b8c5bea5e8d
(set_buffer_internal_1) [REL_ALLOC_MMAP]: If
Gerd Moellmann <gerd@gnu.org>
parents:
31412
diff
changeset
|
1566 if (b->text->beg == NULL) |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
1567 enlarge_buffer_text (b, 0); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
1568 #endif /* USE_MMAP_FOR_BUFFERS */ |
31416
9b8c5bea5e8d
(set_buffer_internal_1) [REL_ALLOC_MMAP]: If
Gerd Moellmann <gerd@gnu.org>
parents:
31412
diff
changeset
|
1569 |
11889
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1570 if (current_buffer == b) |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1571 return; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1572 |
333 | 1573 old_buf = current_buffer; |
1574 current_buffer = b; | |
1575 last_known_column_point = -1; /* invalidate indentation cache */ | |
1576 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1577 if (old_buf) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1578 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1579 /* Put the undo list back in the base buffer, so that it appears |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1580 that an indirect buffer shares the undo list of its base. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1581 if (old_buf->base_buffer) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1582 old_buf->base_buffer->undo_list = old_buf->undo_list; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1583 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1584 /* If the old current buffer has markers to record PT, BEGV and ZV |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1585 when it is not current, update them now. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1586 if (! NILP (old_buf->pt_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1587 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1588 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1589 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1590 set_marker_both (old_buf->pt_marker, obuf, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1591 BUF_PT (old_buf), BUF_PT_BYTE (old_buf)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1592 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1593 if (! NILP (old_buf->begv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1594 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1595 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1596 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1597 set_marker_both (old_buf->begv_marker, obuf, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1598 BUF_BEGV (old_buf), BUF_BEGV_BYTE (old_buf)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1599 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1600 if (! NILP (old_buf->zv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1601 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1602 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1603 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1604 set_marker_both (old_buf->zv_marker, obuf, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1605 BUF_ZV (old_buf), BUF_ZV_BYTE (old_buf)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1606 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1607 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1608 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1609 /* Get the undo list from the base buffer, so that it appears |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1610 that an indirect buffer shares the undo list of its base. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1611 if (b->base_buffer) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1612 b->undo_list = b->base_buffer->undo_list; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1613 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1614 /* If the new current buffer has markers to record PT, BEGV and ZV |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1615 when it is not current, fetch them now. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1616 if (! NILP (b->pt_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1617 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1618 BUF_PT (b) = marker_position (b->pt_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1619 BUF_PT_BYTE (b) = marker_byte_position (b->pt_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1620 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1621 if (! NILP (b->begv_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1622 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1623 BUF_BEGV (b) = marker_position (b->begv_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1624 BUF_BEGV_BYTE (b) = marker_byte_position (b->begv_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1625 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1626 if (! NILP (b->zv_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1627 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1628 BUF_ZV (b) = marker_position (b->zv_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1629 BUF_ZV_BYTE (b) = marker_byte_position (b->zv_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1630 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1631 |
333 | 1632 /* Look down buffer's list of local Lisp variables |
1633 to find and update any that forward into C variables. */ | |
1634 | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1635 for (tail = b->local_var_alist; !NILP (tail); tail = XCDR (tail)) |
333 | 1636 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1637 valcontents = XSYMBOL (XCAR (XCAR (tail)))->value; |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1638 if ((BUFFER_LOCAL_VALUEP (valcontents) |
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1639 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
21141
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
1640 && (tem = XBUFFER_LOCAL_VALUE (valcontents)->realvalue, |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1641 (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem)))) |
333 | 1642 /* Just reference the variable |
1643 to cause it to become set for this buffer. */ | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1644 Fsymbol_value (XCAR (XCAR (tail))); |
333 | 1645 } |
1646 | |
1647 /* Do the same with any others that were local to the previous buffer */ | |
1648 | |
1649 if (old_buf) | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1650 for (tail = old_buf->local_var_alist; !NILP (tail); tail = XCDR (tail)) |
333 | 1651 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1652 valcontents = XSYMBOL (XCAR (XCAR (tail)))->value; |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1653 if ((BUFFER_LOCAL_VALUEP (valcontents) |
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1654 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
21141
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
1655 && (tem = XBUFFER_LOCAL_VALUE (valcontents)->realvalue, |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1656 (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem)))) |
333 | 1657 /* Just reference the variable |
1658 to cause it to become set for this buffer. */ | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1659 Fsymbol_value (XCAR (XCAR (tail))); |
333 | 1660 } |
1661 } | |
1662 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1663 /* Switch to buffer B temporarily for redisplay purposes. |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
1664 This avoids certain things that don't need to be done within redisplay. */ |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1665 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1666 void |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1667 set_buffer_temp (b) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1668 struct buffer *b; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1669 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1670 register struct buffer *old_buf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1671 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1672 if (current_buffer == b) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1673 return; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1674 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1675 old_buf = current_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1676 current_buffer = b; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1677 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1678 if (old_buf) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1679 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1680 /* If the old current buffer has markers to record PT, BEGV and ZV |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1681 when it is not current, update them now. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1682 if (! NILP (old_buf->pt_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1683 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1684 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1685 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1686 set_marker_both (old_buf->pt_marker, obuf, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1687 BUF_PT (old_buf), BUF_PT_BYTE (old_buf)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1688 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1689 if (! NILP (old_buf->begv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1690 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1691 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1692 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1693 set_marker_both (old_buf->begv_marker, obuf, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1694 BUF_BEGV (old_buf), BUF_BEGV_BYTE (old_buf)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1695 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1696 if (! NILP (old_buf->zv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1697 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1698 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1699 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1700 set_marker_both (old_buf->zv_marker, obuf, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1701 BUF_ZV (old_buf), BUF_ZV_BYTE (old_buf)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1702 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1703 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1704 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1705 /* If the new current buffer has markers to record PT, BEGV and ZV |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1706 when it is not current, fetch them now. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1707 if (! NILP (b->pt_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1708 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1709 BUF_PT (b) = marker_position (b->pt_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1710 BUF_PT_BYTE (b) = marker_byte_position (b->pt_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1711 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1712 if (! NILP (b->begv_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1713 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1714 BUF_BEGV (b) = marker_position (b->begv_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1715 BUF_BEGV_BYTE (b) = marker_byte_position (b->begv_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1716 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1717 if (! NILP (b->zv_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1718 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1719 BUF_ZV (b) = marker_position (b->zv_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1720 BUF_ZV_BYTE (b) = marker_byte_position (b->zv_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1721 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1722 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1723 |
333 | 1724 DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0, |
1725 "Make the buffer BUFFER current for editing operations.\n\ | |
1726 BUFFER may be a buffer or the name of an existing buffer.\n\ | |
1727 See also `save-excursion' when you want to make a buffer current temporarily.\n\ | |
1728 This function does not display the buffer, so its effect ends\n\ | |
1729 when the current command terminates.\n\ | |
1730 Use `switch-to-buffer' or `pop-to-buffer' to switch buffers permanently.") | |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1731 (buffer) |
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1732 register Lisp_Object buffer; |
333 | 1733 { |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1734 register Lisp_Object buf; |
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1735 buf = Fget_buffer (buffer); |
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1736 if (NILP (buf)) |
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1737 nsberror (buffer); |
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1738 if (NILP (XBUFFER (buf)->name)) |
333 | 1739 error ("Selecting deleted buffer"); |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1740 set_buffer_internal (XBUFFER (buf)); |
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1741 return buf; |
333 | 1742 } |
20698
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1743 |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1744 /* Set the current buffer to BUFFER provided it is alive. */ |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1745 |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1746 Lisp_Object |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1747 set_buffer_if_live (buffer) |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1748 Lisp_Object buffer; |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1749 { |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1750 if (! NILP (XBUFFER (buffer)->name)) |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1751 Fset_buffer (buffer); |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1752 return Qnil; |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1753 } |
333 | 1754 |
1755 DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only, | |
1756 Sbarf_if_buffer_read_only, 0, 0, 0, | |
1757 "Signal a `buffer-read-only' error if the current buffer is read-only.") | |
1758 () | |
1759 { | |
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
1760 if (!NILP (current_buffer->read_only) |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
1761 && NILP (Vinhibit_read_only)) |
333 | 1762 Fsignal (Qbuffer_read_only, (Fcons (Fcurrent_buffer (), Qnil))); |
1763 return Qnil; | |
1764 } | |
1765 | |
1766 DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "", | |
1767 "Put BUFFER at the end of the list of all buffers.\n\ | |
1768 There it is the least likely candidate for `other-buffer' to return;\n\ | |
739
0bb85f26b79c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
1769 thus, the least likely buffer for \\[switch-to-buffer] to select by default.\n\ |
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1770 If BUFFER is nil or omitted, bury the current buffer.\n\ |
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1771 Also, if BUFFER is nil or omitted, remove the current buffer from the\n\ |
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1772 selected window if it is displayed there.") |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1773 (buffer) |
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1774 register Lisp_Object buffer; |
333 | 1775 { |
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1776 /* Figure out what buffer we're going to bury. */ |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1777 if (NILP (buffer)) |
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1778 { |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1779 XSETBUFFER (buffer, current_buffer); |
18485
d6e8b92585e9
(Fbury_buffer): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18455
diff
changeset
|
1780 |
d6e8b92585e9
(Fbury_buffer): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18455
diff
changeset
|
1781 /* If we're burying the current buffer, unshow it. */ |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1782 Fswitch_to_buffer (Fother_buffer (buffer, Qnil, Qnil), Qnil); |
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1783 } |
333 | 1784 else |
1785 { | |
1786 Lisp_Object buf1; | |
1787 | |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1788 buf1 = Fget_buffer (buffer); |
485 | 1789 if (NILP (buf1)) |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1790 nsberror (buffer); |
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1791 buffer = buf1; |
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1792 } |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1793 |
28991
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1794 /* Move buffer to the end of the buffer list. Do nothing if the |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1795 buffer is killed. */ |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1796 if (!NILP (XBUFFER (buffer)->name)) |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1797 { |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1798 Lisp_Object aelt, link; |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1799 |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1800 aelt = Frassq (buffer, Vbuffer_alist); |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1801 link = Fmemq (aelt, Vbuffer_alist); |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1802 Vbuffer_alist = Fdelq (aelt, Vbuffer_alist); |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1803 XCDR (link) = Qnil; |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1804 Vbuffer_alist = nconc2 (Vbuffer_alist, link); |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1805 |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1806 frames_bury_buffer (buffer); |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1807 } |
17234
bda734eef575
(Fbury_buffer): Call frames_bury_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
17220
diff
changeset
|
1808 |
333 | 1809 return Qnil; |
1810 } | |
1811 | |
1953
714df59790af
(Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents:
1952
diff
changeset
|
1812 DEFUN ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, "*", |
333 | 1813 "Delete the entire contents of the current buffer.\n\ |
4942
0ea29f510ba0
(Ferase_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
4852
diff
changeset
|
1814 Any narrowing restriction in effect (see `narrow-to-region') is removed,\n\ |
333 | 1815 so the buffer is truly empty after this.") |
1816 () | |
1817 { | |
1818 Fwiden (); | |
26056
9c4556ef15de
(Fget_buffer_create, Fmake_indirect_buffer, Fkill_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
25744
diff
changeset
|
1819 |
9c4556ef15de
(Fget_buffer_create, Fmake_indirect_buffer, Fkill_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
25744
diff
changeset
|
1820 del_range (BEG, Z); |
25626
acfb741e6e24
(Ferase_buffer): Don't erase the minibuffer prompt.
Richard M. Stallman <rms@gnu.org>
parents:
25546
diff
changeset
|
1821 |
333 | 1822 current_buffer->last_window_start = 1; |
1823 /* Prevent warnings, or suspension of auto saving, that would happen | |
1824 if future size is less than past size. Use of erase-buffer | |
1825 implies that the future text is not really related to the past text. */ | |
9296
a1a7fc21ded9
(reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9262
diff
changeset
|
1826 XSETFASTINT (current_buffer->save_length, 0); |
333 | 1827 return Qnil; |
1828 } | |
1829 | |
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
1830 void |
333 | 1831 validate_region (b, e) |
1832 register Lisp_Object *b, *e; | |
1833 { | |
1834 CHECK_NUMBER_COERCE_MARKER (*b, 0); | |
1835 CHECK_NUMBER_COERCE_MARKER (*e, 1); | |
1836 | |
1837 if (XINT (*b) > XINT (*e)) | |
1838 { | |
9335
8cf58b38d244
(validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents:
9296
diff
changeset
|
1839 Lisp_Object tem; |
8cf58b38d244
(validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents:
9296
diff
changeset
|
1840 tem = *b; *b = *e; *e = tem; |
333 | 1841 } |
1842 | |
1843 if (!(BEGV <= XINT (*b) && XINT (*b) <= XINT (*e) | |
1844 && XINT (*e) <= ZV)) | |
1845 args_out_of_range (*b, *e); | |
1846 } | |
1847 | |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1848 /* Advance BYTE_POS up to a character boundary |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1849 and return the adjusted position. */ |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1850 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1851 static int |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1852 advance_to_char_boundary (byte_pos) |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1853 int byte_pos; |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1854 { |
21085
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1855 int c; |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1856 |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1857 if (byte_pos == BEG) |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1858 /* Beginning of buffer is always a character boundary. */ |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1859 return 1; |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1860 |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1861 c = FETCH_BYTE (byte_pos); |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1862 if (! CHAR_HEAD_P (c)) |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1863 { |
25508 | 1864 /* We should advance BYTE_POS only when C is a constituent of a |
21085
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1865 multibyte sequence. */ |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1866 int orig_byte_pos = byte_pos; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1867 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1868 do |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1869 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1870 byte_pos--; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1871 c = FETCH_BYTE (byte_pos); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1872 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1873 while (! CHAR_HEAD_P (c) && byte_pos > BEG); |
21085
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1874 INC_POS (byte_pos); |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1875 if (byte_pos < orig_byte_pos) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1876 byte_pos = orig_byte_pos; |
21085
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1877 /* If C is a constituent of a multibyte sequence, BYTE_POS was |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1878 surely advance to the correct character boundary. If C is |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1879 not, BYTE_POS was unchanged. */ |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1880 } |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1881 |
20935
2fc5eb0799fe
(advance_to_char_boundary): Make the behaviour
Kenichi Handa <handa@m17n.org>
parents:
20868
diff
changeset
|
1882 return byte_pos; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1883 } |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1884 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1885 DEFUN ("set-buffer-multibyte", Fset_buffer_multibyte, Sset_buffer_multibyte, |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1886 1, 1, 0, |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1887 "Set the multibyte flag of the current buffer to FLAG.\n\ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1888 If FLAG is t, this makes the buffer a multibyte buffer.\n\ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1889 If FLAG is nil, this makes the buffer a single-byte buffer.\n\ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1890 The buffer contents remain unchanged as a sequence of bytes\n\ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1891 but the contents viewed as characters do change.") |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1892 (flag) |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1893 Lisp_Object flag; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1894 { |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1895 Lisp_Object tail, markers; |
24604
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
1896 struct buffer *other; |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1897 int undo_enabled_p = !EQ (current_buffer->undo_list, Qt); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1898 int begv = BEGV, zv = ZV; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1899 int narrowed = (BEG != begv || Z != zv); |
29456
1aa0c1122f75
(Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents:
29380
diff
changeset
|
1900 int modified_p = !NILP (Fbuffer_modified_p (Qnil)); |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1901 |
24240
6ea9058180ec
(Fset_buffer_multibyte): Error if buffer is multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
23760
diff
changeset
|
1902 if (current_buffer->base_buffer) |
6ea9058180ec
(Fset_buffer_multibyte): Error if buffer is multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
23760
diff
changeset
|
1903 error ("Cannot do `set-buffer-multibyte' on an indirect buffer"); |
6ea9058180ec
(Fset_buffer_multibyte): Error if buffer is multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
23760
diff
changeset
|
1904 |
21506
a44f9f59c656
(Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
1905 /* Do nothing if nothing actually changes. */ |
a44f9f59c656
(Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
1906 if (NILP (flag) == NILP (current_buffer->enable_multibyte_characters)) |
a44f9f59c656
(Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
1907 return flag; |
a44f9f59c656
(Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
1908 |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1909 /* It would be better to update the list, |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1910 but this is good enough for now. */ |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1911 if (undo_enabled_p) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1912 current_buffer->undo_list = Qt; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1913 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1914 /* If the cached position is for this buffer, clear it out. */ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1915 clear_charpos_cache (current_buffer); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1916 |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1917 if (narrowed) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1918 Fwiden (); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1919 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1920 if (NILP (flag)) |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1921 { |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1922 int pos, stop; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1923 unsigned char *p; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1924 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1925 /* Do this first, so it can use CHAR_TO_BYTE |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1926 to calculate the old correspondences. */ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1927 set_intervals_multibyte (0); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1928 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1929 current_buffer->enable_multibyte_characters = Qnil; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1930 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1931 Z = Z_BYTE; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1932 BEGV = BEGV_BYTE; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1933 ZV = ZV_BYTE; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1934 GPT = GPT_BYTE; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1935 TEMP_SET_PT_BOTH (PT_BYTE, PT_BYTE); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1936 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1937 tail = BUF_MARKERS (current_buffer); |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
1938 while (! NILP (tail)) |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1939 { |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1940 XMARKER (tail)->charpos = XMARKER (tail)->bytepos; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1941 tail = XMARKER (tail)->chain; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1942 } |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1943 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1944 /* Convert multibyte form of 8-bit characters to unibyte. */ |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1945 pos = BEG; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1946 stop = GPT; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1947 p = BEG_ADDR; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1948 while (1) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1949 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1950 int c, bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1951 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1952 if (pos == stop) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1953 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1954 if (pos == Z) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1955 break; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1956 p = GAP_END_ADDR; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1957 stop = Z; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1958 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1959 if (MULTIBYTE_STR_AS_UNIBYTE_P (p, bytes)) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1960 p += bytes, pos += bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1961 else |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1962 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1963 c = STRING_CHAR (p, stop - pos); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1964 /* Delete all bytes for this 8-bit character but the |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1965 last one, and change the last one to the charcter |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1966 code. */ |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1967 bytes--; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1968 del_range_2 (pos, pos, pos + bytes, pos + bytes, 0); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1969 p = GAP_END_ADDR; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1970 *p++ = c; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1971 pos++; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1972 if (begv > pos) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1973 begv -= bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1974 if (zv > pos) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1975 zv -= bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1976 stop = Z; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1977 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1978 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1979 if (narrowed) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1980 Fnarrow_to_region (make_number (begv), make_number (zv)); |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1981 } |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1982 else |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
1983 { |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1984 int pt = PT; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1985 int pos, stop; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1986 unsigned char *p; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1987 |
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
1988 /* Be sure not to have a multibyte sequence striding over the GAP. |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1989 Ex: We change this: "...abc\201 _GAP_ \241def..." |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1990 to: "...abc _GAP_ \201\241def..." */ |
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
1991 |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
1992 if (GPT_BYTE > 1 && GPT_BYTE < Z_BYTE |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
1993 && ! CHAR_HEAD_P (*(GAP_END_ADDR))) |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
1994 { |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
1995 unsigned char *p = GPT_ADDR - 1; |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
1996 |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
1997 while (! CHAR_HEAD_P (*p) && p > BEG_ADDR) p--; |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
1998 if (BASE_LEADING_CODE_P (*p)) |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
1999 { |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2000 int new_gpt = GPT_BYTE - (GPT_ADDR - p); |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2001 |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2002 move_gap_both (new_gpt, new_gpt); |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2003 } |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2004 } |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2005 |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2006 /* Make the buffer contents valid as multibyte by converting |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2007 8-bit characters to multibyte form. */ |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2008 pos = BEG; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2009 stop = GPT; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2010 p = BEG_ADDR; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2011 while (1) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2012 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2013 int bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2014 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2015 if (pos == stop) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2016 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2017 if (pos == Z) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2018 break; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2019 p = GAP_END_ADDR; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2020 stop = Z; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2021 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2022 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2023 if (UNIBYTE_STR_AS_MULTIBYTE_P (p, stop - pos, bytes)) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2024 p += bytes, pos += bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2025 else |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2026 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2027 unsigned char tmp[MAX_MULTIBYTE_LENGTH]; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2028 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2029 bytes = CHAR_STRING (*p, tmp); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2030 *p = tmp[0]; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2031 TEMP_SET_PT_BOTH (pos + 1, pos + 1); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2032 bytes--; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2033 insert_1_both (tmp + 1, bytes, bytes, 1, 0, 0); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2034 /* Now the gap is after the just inserted data. */ |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2035 pos = GPT; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2036 p = GAP_END_ADDR; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2037 if (pos <= begv) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2038 begv += bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2039 if (pos <= zv) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2040 zv += bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2041 if (pos <= pt) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2042 pt += bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2043 stop = Z; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2044 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2045 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2046 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2047 if (pt != PT) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2048 TEMP_SET_PT (pt); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2049 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2050 if (narrowed) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2051 Fnarrow_to_region (make_number (begv), make_number (zv)); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2052 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2053 /* Do this first, so that chars_in_text asks the right question. |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2054 set_intervals_multibyte needs it too. */ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2055 current_buffer->enable_multibyte_characters = Qt; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2056 |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2057 GPT_BYTE = advance_to_char_boundary (GPT_BYTE); |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2058 GPT = chars_in_text (BEG_ADDR, GPT_BYTE - BEG_BYTE) + BEG; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2059 |
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2060 Z = chars_in_text (GAP_END_ADDR, Z_BYTE - GPT_BYTE) + GPT; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2061 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2062 BEGV_BYTE = advance_to_char_boundary (BEGV_BYTE); |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2063 if (BEGV_BYTE > GPT_BYTE) |
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2064 BEGV = chars_in_text (GAP_END_ADDR, BEGV_BYTE - GPT_BYTE) + GPT; |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2065 else |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2066 BEGV = chars_in_text (BEG_ADDR, BEGV_BYTE - BEG_BYTE) + BEG; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2067 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2068 ZV_BYTE = advance_to_char_boundary (ZV_BYTE); |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2069 if (ZV_BYTE > GPT_BYTE) |
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2070 ZV = chars_in_text (GAP_END_ADDR, ZV_BYTE - GPT_BYTE) + GPT; |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2071 else |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2072 ZV = chars_in_text (BEG_ADDR, ZV_BYTE - BEG_BYTE) + BEG; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2073 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2074 { |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2075 int pt_byte = advance_to_char_boundary (PT_BYTE); |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2076 int pt; |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2077 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2078 if (pt_byte > GPT_BYTE) |
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2079 pt = chars_in_text (GAP_END_ADDR, pt_byte - GPT_BYTE) + GPT; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2080 else |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2081 pt = chars_in_text (BEG_ADDR, pt_byte - BEG_BYTE) + BEG; |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2082 TEMP_SET_PT_BOTH (pt, pt_byte); |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2083 } |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2084 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2085 tail = markers = BUF_MARKERS (current_buffer); |
22021 | 2086 |
2087 /* This prevents BYTE_TO_CHAR (that is, buf_bytepos_to_charpos) from | |
2088 getting confused by the markers that have not yet been updated. | |
2089 It is also a signal that it should never create a marker. */ | |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2090 BUF_MARKERS (current_buffer) = Qnil; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2091 |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
2092 while (! NILP (tail)) |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2093 { |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2094 XMARKER (tail)->bytepos |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2095 = advance_to_char_boundary (XMARKER (tail)->bytepos); |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2096 XMARKER (tail)->charpos = BYTE_TO_CHAR (XMARKER (tail)->bytepos); |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2097 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2098 tail = XMARKER (tail)->chain; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2099 } |
22023
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2100 |
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2101 /* Make sure no markers were put on the chain |
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2102 while the chain value was incorrect. */ |
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2103 if (! EQ (BUF_MARKERS (current_buffer), Qnil)) |
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2104 abort (); |
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2105 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2106 BUF_MARKERS (current_buffer) = markers; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2107 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2108 /* Do this last, so it can calculate the new correspondences |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2109 between chars and bytes. */ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2110 set_intervals_multibyte (1); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2111 } |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2112 |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2113 if (undo_enabled_p) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2114 current_buffer->undo_list = Qnil; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2115 |
26970
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2116 /* Changing the multibyteness of a buffer means that all windows |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2117 showing that buffer must be updated thoroughly. */ |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2118 current_buffer->prevent_redisplay_optimizations_p = 1; |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2119 ++windows_or_buffers_changed; |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2120 |
24604
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
2121 /* Copy this buffer's new multibyte status |
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
2122 into all of its indirect buffers. */ |
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
2123 for (other = all_buffers; other; other = other->next) |
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
2124 if (other->base_buffer == current_buffer && !NILP (other->name)) |
26970
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2125 { |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2126 other->enable_multibyte_characters |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2127 = current_buffer->enable_multibyte_characters; |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2128 other->prevent_redisplay_optimizations_p = 1; |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2129 } |
24604
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
2130 |
29456
1aa0c1122f75
(Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents:
29380
diff
changeset
|
2131 /* Restore the modifiedness of the buffer. */ |
1aa0c1122f75
(Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents:
29380
diff
changeset
|
2132 if (!modified_p && !NILP (Fbuffer_modified_p (Qnil))) |
1aa0c1122f75
(Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents:
29380
diff
changeset
|
2133 Fset_buffer_modified_p (Qnil); |
1aa0c1122f75
(Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents:
29380
diff
changeset
|
2134 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2135 return flag; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2136 } |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2137 |
333 | 2138 DEFUN ("kill-all-local-variables", Fkill_all_local_variables, Skill_all_local_variables, |
2139 0, 0, 0, | |
2140 "Switch to Fundamental mode by killing current buffer's local variables.\n\ | |
2141 Most local variable bindings are eliminated so that the default values\n\ | |
2142 become effective once more. Also, the syntax table is set from\n\ | |
2143 `standard-syntax-table', the local keymap is set to nil,\n\ | |
2144 and the abbrev table from `fundamental-mode-abbrev-table'.\n\ | |
2145 This function also forces redisplay of the mode line.\n\ | |
2146 \n\ | |
2147 Every function to select a new major mode starts by\n\ | |
2148 calling this function.\n\n\ | |
2149 As a special exception, local variables whose names have\n\ | |
7062
6356b8d3144e
(Fkill_all_local_variables): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7053
diff
changeset
|
2150 a non-nil `permanent-local' property are not eliminated by this function.\n\ |
6356b8d3144e
(Fkill_all_local_variables): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7053
diff
changeset
|
2151 \n\ |
6356b8d3144e
(Fkill_all_local_variables): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7053
diff
changeset
|
2152 The first thing this function does is run\n\ |
6356b8d3144e
(Fkill_all_local_variables): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7053
diff
changeset
|
2153 the normal hook `change-major-mode-hook'.") |
333 | 2154 () |
2155 { | |
2156 register Lisp_Object alist, sym, tem; | |
2157 Lisp_Object oalist; | |
5873
fa8b769ef564
(Fkill_all_local_variables): Run change-major-mode-hook.
Karl Heuer <kwzh@gnu.org>
parents:
5857
diff
changeset
|
2158 |
6205
88e41d7d1e27
(Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents:
6169
diff
changeset
|
2159 if (!NILP (Vrun_hooks)) |
88e41d7d1e27
(Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents:
6169
diff
changeset
|
2160 call1 (Vrun_hooks, intern ("change-major-mode-hook")); |
333 | 2161 oalist = current_buffer->local_var_alist; |
2162 | |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2163 /* Make sure none of the bindings in oalist |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2164 remain swapped in, in their symbols. */ |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2165 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2166 swap_out_buffer_local_variables (current_buffer); |
333 | 2167 |
2168 /* Actually eliminate all local bindings of this buffer. */ | |
2169 | |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
2170 reset_buffer_local_variables (current_buffer, 0); |
333 | 2171 |
2172 /* Redisplay mode lines; we are changing major mode. */ | |
2173 | |
2174 update_mode_lines++; | |
2175 | |
2176 /* Any which are supposed to be permanent, | |
2177 make local again, with the same values they had. */ | |
2178 | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2179 for (alist = oalist; !NILP (alist); alist = XCDR (alist)) |
333 | 2180 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2181 sym = XCAR (XCAR (alist)); |
333 | 2182 tem = Fget (sym, Qpermanent_local); |
485 | 2183 if (! NILP (tem)) |
392 | 2184 { |
2185 Fmake_local_variable (sym); | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2186 Fset (sym, XCDR (XCAR (alist))); |
392 | 2187 } |
333 | 2188 } |
2189 | |
2190 /* Force mode-line redisplay. Useful here because all major mode | |
2191 commands call this function. */ | |
2192 update_mode_lines++; | |
2193 | |
2194 return Qnil; | |
2195 } | |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2196 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2197 /* Make sure no local variables remain set up with buffer B |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2198 for their current values. */ |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2199 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2200 static void |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2201 swap_out_buffer_local_variables (b) |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2202 struct buffer *b; |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2203 { |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2204 Lisp_Object oalist, alist, sym, tem, buffer; |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2205 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2206 XSETBUFFER (buffer, b); |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2207 oalist = b->local_var_alist; |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2208 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2209 for (alist = oalist; !NILP (alist); alist = XCDR (alist)) |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2210 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2211 sym = XCAR (XCAR (alist)); |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2212 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2213 /* Need not do anything if some other buffer's binding is now encached. */ |
21141
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
2214 tem = XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->buffer; |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
2215 if (BUFFERP (tem) && XBUFFER (tem) == current_buffer) |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2216 { |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2217 /* Symbol is set up for this buffer's old local value. |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2218 Set it up for the current buffer with the default value. */ |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2219 |
21141
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
2220 tem = XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->cdr; |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2221 /* Store the symbol's current value into the alist entry |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2222 it is currently set up for. This is so that, if the |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2223 local is marked permanent, and we make it local again |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2224 later in Fkill_all_local_variables, we don't lose the value. */ |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2225 XCDR (XCAR (tem)) |
21141
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
2226 = do_symval_forwarding (XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->realvalue); |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2227 /* Switch to the symbol's default-value alist entry. */ |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2228 XCAR (tem) = tem; |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2229 /* Mark it as current for buffer B. */ |
21141
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
2230 XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->buffer = buffer; |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2231 /* Store the current value into any forwarding in the symbol. */ |
21141
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
2232 store_symval_forwarding (sym, |
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
2233 XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->realvalue, |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2234 XCDR (tem)); |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2235 } |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2236 } |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2237 } |
333 | 2238 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2239 /* Find all the overlays in the current buffer that contain position POS. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2240 Return the number found, and store them in a vector in *VEC_PTR. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2241 Store in *LEN_PTR the size allocated for the vector. |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2242 Store in *NEXT_PTR the next position after POS where an overlay starts, |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2243 or ZV if there are no more overlays. |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2244 Store in *PREV_PTR the previous position before POS where an overlay ends, |
25184
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2245 or where an overlay starts which ends at or after POS; |
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2246 or BEGV if there are no such overlays. |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2247 NEXT_PTR and/or PREV_PTR may be 0, meaning don't store that info. |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2248 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2249 *VEC_PTR and *LEN_PTR should contain a valid vector and size |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2250 when this function is called. |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2251 |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2252 If EXTEND is non-zero, we make the vector bigger if necessary. |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2253 If EXTEND is zero, we never extend the vector, |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2254 and we store only as many overlays as will fit. |
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2255 But we still return the total number of overlays. |
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2256 |
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2257 If CHANGE_REQ is true, then any position written into *PREV_PTR or |
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2258 *NEXT_PTR is guaranteed to be not equal to POS, unless it is the |
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2259 default (BEGV or ZV). */ |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2260 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2261 int |
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2262 overlays_at (pos, extend, vec_ptr, len_ptr, next_ptr, prev_ptr, change_req) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2263 int pos; |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2264 int extend; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2265 Lisp_Object **vec_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2266 int *len_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2267 int *next_ptr; |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2268 int *prev_ptr; |
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2269 int change_req; |
333 | 2270 { |
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
2271 Lisp_Object tail, overlay, start, end; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2272 int idx = 0; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2273 int len = *len_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2274 Lisp_Object *vec = *vec_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2275 int next = ZV; |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2276 int prev = BEGV; |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2277 int inhibit_storing = 0; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2278 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2279 for (tail = current_buffer->overlays_before; |
9950
605bd2a8f816
(overlays_at): Use the new type-test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9939
diff
changeset
|
2280 GC_CONSP (tail); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2281 tail = XCDR (tail)) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2282 { |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2283 int startpos, endpos; |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2284 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2285 overlay = XCAR (tail); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2286 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2287 start = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2288 end = OVERLAY_END (overlay); |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2289 endpos = OVERLAY_POSITION (end); |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2290 if (endpos < pos) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2291 { |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2292 if (prev < endpos) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2293 prev = endpos; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2294 break; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2295 } |
25184
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2296 startpos = OVERLAY_POSITION (start); |
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2297 /* This one ends at or after POS |
25205
14269f6d315b
(Fprevious_overlay_change): Just return the answer obtained from overlays_at.
Richard M. Stallman <rms@gnu.org>
parents:
25184
diff
changeset
|
2298 so its start counts for PREV_PTR if it's before POS. */ |
25184
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2299 if (prev < startpos && startpos < pos) |
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2300 prev = startpos; |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2301 if (endpos == pos) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2302 continue; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2303 if (startpos <= pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2304 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2305 if (idx == len) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2306 { |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2307 /* The supplied vector is full. |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2308 Either make it bigger, or don't store any more in it. */ |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2309 if (extend) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2310 { |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2311 /* Make it work with an initial len == 0. */ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2312 len *= 2; |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2313 if (len == 0) |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2314 len = 4; |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2315 *len_ptr = len; |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2316 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2317 *vec_ptr = vec; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2318 } |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2319 else |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2320 inhibit_storing = 1; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2321 } |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2322 |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2323 if (!inhibit_storing) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2324 vec[idx] = overlay; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2325 /* Keep counting overlays even if we can't return them all. */ |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2326 idx++; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2327 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2328 else if (startpos < next) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2329 next = startpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2330 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2331 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2332 for (tail = current_buffer->overlays_after; |
9950
605bd2a8f816
(overlays_at): Use the new type-test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9939
diff
changeset
|
2333 GC_CONSP (tail); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2334 tail = XCDR (tail)) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2335 { |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2336 int startpos, endpos; |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2337 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2338 overlay = XCAR (tail); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2339 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2340 start = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2341 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2342 startpos = OVERLAY_POSITION (start); |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2343 if (pos < startpos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2344 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2345 if (startpos < next) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2346 next = startpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2347 break; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2348 } |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2349 endpos = OVERLAY_POSITION (end); |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2350 if (pos < endpos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2351 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2352 if (idx == len) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2353 { |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2354 if (extend) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2355 { |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2356 *len_ptr = len *= 2; |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2357 if (len == 0) |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2358 len = *len_ptr = 4; |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2359 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2360 *vec_ptr = vec; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2361 } |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2362 else |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2363 inhibit_storing = 1; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2364 } |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2365 |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2366 if (!inhibit_storing) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2367 vec[idx] = overlay; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2368 idx++; |
25184
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2369 |
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2370 if (startpos < pos && startpos > prev) |
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2371 prev = startpos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2372 } |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2373 else if (endpos < pos && endpos > prev) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2374 prev = endpos; |
32856
5fe3b3dc5dd9
(overlays_at): Only let CHANGE_REQ inhibit an assignment of startpos to
Miles Bader <miles@gnu.org>
parents:
31886
diff
changeset
|
2375 else if (endpos == pos && startpos > prev |
5fe3b3dc5dd9
(overlays_at): Only let CHANGE_REQ inhibit an assignment of startpos to
Miles Bader <miles@gnu.org>
parents:
31886
diff
changeset
|
2376 && (!change_req || startpos < pos)) |
25184
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2377 prev = startpos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2378 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2379 |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2380 if (next_ptr) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2381 *next_ptr = next; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2382 if (prev_ptr) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2383 *prev_ptr = prev; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2384 return idx; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2385 } |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2386 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2387 /* Find all the overlays in the current buffer that overlap the range BEG-END |
12488
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2388 or are empty at BEG. |
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2389 |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2390 Return the number found, and store them in a vector in *VEC_PTR. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2391 Store in *LEN_PTR the size allocated for the vector. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2392 Store in *NEXT_PTR the next position after POS where an overlay starts, |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2393 or ZV if there are no more overlays. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2394 Store in *PREV_PTR the previous position before POS where an overlay ends, |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2395 or BEGV if there are no previous overlays. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2396 NEXT_PTR and/or PREV_PTR may be 0, meaning don't store that info. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2397 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2398 *VEC_PTR and *LEN_PTR should contain a valid vector and size |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2399 when this function is called. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2400 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2401 If EXTEND is non-zero, we make the vector bigger if necessary. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2402 If EXTEND is zero, we never extend the vector, |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2403 and we store only as many overlays as will fit. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2404 But we still return the total number of overlays. */ |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2405 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2406 int |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2407 overlays_in (beg, end, extend, vec_ptr, len_ptr, next_ptr, prev_ptr) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2408 int beg, end; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2409 int extend; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2410 Lisp_Object **vec_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2411 int *len_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2412 int *next_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2413 int *prev_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2414 { |
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
2415 Lisp_Object tail, overlay, ostart, oend; |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2416 int idx = 0; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2417 int len = *len_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2418 Lisp_Object *vec = *vec_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2419 int next = ZV; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2420 int prev = BEGV; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2421 int inhibit_storing = 0; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2422 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2423 for (tail = current_buffer->overlays_before; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2424 GC_CONSP (tail); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2425 tail = XCDR (tail)) |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2426 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2427 int startpos, endpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2428 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2429 overlay = XCAR (tail); |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2430 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2431 ostart = OVERLAY_START (overlay); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2432 oend = OVERLAY_END (overlay); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2433 endpos = OVERLAY_POSITION (oend); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2434 if (endpos < beg) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2435 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2436 if (prev < endpos) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2437 prev = endpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2438 break; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2439 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2440 startpos = OVERLAY_POSITION (ostart); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2441 /* Count an interval if it either overlaps the range |
12488
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2442 or is empty at the start of the range. */ |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2443 if ((beg < endpos && startpos < end) |
12488
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2444 || (startpos == endpos && beg == endpos)) |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2445 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2446 if (idx == len) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2447 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2448 /* The supplied vector is full. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2449 Either make it bigger, or don't store any more in it. */ |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2450 if (extend) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2451 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2452 *len_ptr = len *= 2; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2453 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2454 *vec_ptr = vec; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2455 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2456 else |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2457 inhibit_storing = 1; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2458 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2459 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2460 if (!inhibit_storing) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2461 vec[idx] = overlay; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2462 /* Keep counting overlays even if we can't return them all. */ |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2463 idx++; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2464 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2465 else if (startpos < next) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2466 next = startpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2467 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2468 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2469 for (tail = current_buffer->overlays_after; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2470 GC_CONSP (tail); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2471 tail = XCDR (tail)) |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2472 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2473 int startpos, endpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2474 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2475 overlay = XCAR (tail); |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2476 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2477 ostart = OVERLAY_START (overlay); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2478 oend = OVERLAY_END (overlay); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2479 startpos = OVERLAY_POSITION (ostart); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2480 if (end < startpos) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2481 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2482 if (startpos < next) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2483 next = startpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2484 break; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2485 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2486 endpos = OVERLAY_POSITION (oend); |
12488
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2487 /* Count an interval if it either overlaps the range |
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2488 or is empty at the start of the range. */ |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2489 if ((beg < endpos && startpos < end) |
12488
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2490 || (startpos == endpos && beg == endpos)) |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2491 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2492 if (idx == len) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2493 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2494 if (extend) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2495 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2496 *len_ptr = len *= 2; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2497 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2498 *vec_ptr = vec; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2499 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2500 else |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2501 inhibit_storing = 1; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2502 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2503 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2504 if (!inhibit_storing) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2505 vec[idx] = overlay; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2506 idx++; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2507 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2508 else if (endpos < beg && endpos > prev) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2509 prev = endpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2510 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2511 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2512 if (next_ptr) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2513 *next_ptr = next; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2514 if (prev_ptr) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2515 *prev_ptr = prev; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2516 return idx; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2517 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2518 |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2519 /* Fast function to just test if we're at an overlay boundary. */ |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2520 int |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2521 overlay_touches_p (pos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2522 int pos; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2523 { |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2524 Lisp_Object tail, overlay; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2525 |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2526 for (tail = current_buffer->overlays_before; GC_CONSP (tail); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2527 tail = XCDR (tail)) |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2528 { |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2529 int endpos; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2530 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2531 overlay = XCAR (tail); |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2532 if (!GC_OVERLAYP (overlay)) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2533 abort (); |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2534 |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2535 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2536 if (endpos < pos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2537 break; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2538 if (endpos == pos || OVERLAY_POSITION (OVERLAY_START (overlay)) == pos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2539 return 1; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2540 } |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2541 |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2542 for (tail = current_buffer->overlays_after; GC_CONSP (tail); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2543 tail = XCDR (tail)) |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2544 { |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2545 int startpos; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2546 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2547 overlay = XCAR (tail); |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2548 if (!GC_OVERLAYP (overlay)) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2549 abort (); |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2550 |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2551 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2552 if (pos < startpos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2553 break; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2554 if (startpos == pos || OVERLAY_POSITION (OVERLAY_END (overlay)) == pos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2555 return 1; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2556 } |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2557 return 0; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2558 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2559 |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2560 struct sortvec |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2561 { |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2562 Lisp_Object overlay; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2563 int beg, end; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2564 int priority; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2565 }; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2566 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2567 static int |
21514 | 2568 compare_overlays (v1, v2) |
2569 const void *v1, *v2; | |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2570 { |
21514 | 2571 const struct sortvec *s1 = (const struct sortvec *) v1; |
2572 const struct sortvec *s2 = (const struct sortvec *) v2; | |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2573 if (s1->priority != s2->priority) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2574 return s1->priority - s2->priority; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2575 if (s1->beg != s2->beg) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2576 return s1->beg - s2->beg; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2577 if (s1->end != s2->end) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2578 return s2->end - s1->end; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2579 return 0; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2580 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2581 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2582 /* Sort an array of overlays by priority. The array is modified in place. |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2583 The return value is the new size; this may be smaller than the original |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2584 size if some of the overlays were invalid or were window-specific. */ |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2585 int |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2586 sort_overlays (overlay_vec, noverlays, w) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2587 Lisp_Object *overlay_vec; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2588 int noverlays; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2589 struct window *w; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2590 { |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2591 int i, j; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2592 struct sortvec *sortvec; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2593 sortvec = (struct sortvec *) alloca (noverlays * sizeof (struct sortvec)); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2594 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2595 /* Put the valid and relevant overlays into sortvec. */ |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2596 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2597 for (i = 0, j = 0; i < noverlays; i++) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2598 { |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2599 Lisp_Object tem; |
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
2600 Lisp_Object overlay; |
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
2601 |
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
2602 overlay = overlay_vec[i]; |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2603 if (OVERLAY_VALID (overlay) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2604 && OVERLAY_POSITION (OVERLAY_START (overlay)) > 0 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2605 && OVERLAY_POSITION (OVERLAY_END (overlay)) > 0) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2606 { |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2607 /* If we're interested in a specific window, then ignore |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2608 overlays that are limited to some other window. */ |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2609 if (w) |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2610 { |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2611 Lisp_Object window; |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2612 |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2613 window = Foverlay_get (overlay, Qwindow); |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
2614 if (WINDOWP (window) && XWINDOW (window) != w) |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2615 continue; |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2616 } |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2617 |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2618 /* This overlay is good and counts: put it into sortvec. */ |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2619 sortvec[j].overlay = overlay; |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2620 sortvec[j].beg = OVERLAY_POSITION (OVERLAY_START (overlay)); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2621 sortvec[j].end = OVERLAY_POSITION (OVERLAY_END (overlay)); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2622 tem = Foverlay_get (overlay, Qpriority); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2623 if (INTEGERP (tem)) |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2624 sortvec[j].priority = XINT (tem); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2625 else |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2626 sortvec[j].priority = 0; |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2627 j++; |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2628 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2629 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2630 noverlays = j; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2631 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2632 /* Sort the overlays into the proper order: increasing priority. */ |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2633 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2634 if (noverlays > 1) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2635 qsort (sortvec, noverlays, sizeof (struct sortvec), compare_overlays); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2636 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2637 for (i = 0; i < noverlays; i++) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2638 overlay_vec[i] = sortvec[i].overlay; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2639 return (noverlays); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2640 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2641 |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2642 struct sortstr |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2643 { |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2644 Lisp_Object string, string2; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2645 int size; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2646 int priority; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2647 }; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2648 |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2649 struct sortstrlist |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2650 { |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2651 struct sortstr *buf; /* An array that expands as needed; never freed. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2652 int size; /* Allocated length of that array. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2653 int used; /* How much of the array is currently in use. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2654 int bytes; /* Total length of the strings in buf. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2655 }; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2656 |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2657 /* Buffers for storing information about the overlays touching a given |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2658 position. These could be automatic variables in overlay_strings, but |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2659 it's more efficient to hold onto the memory instead of repeatedly |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2660 allocating and freeing it. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2661 static struct sortstrlist overlay_heads, overlay_tails; |
18526
e0d1b341124c
(overlay_str_buf): Declare as unsigned char *.
Richard M. Stallman <rms@gnu.org>
parents:
18495
diff
changeset
|
2662 static unsigned char *overlay_str_buf; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2663 |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2664 /* Allocated length of overlay_str_buf. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2665 static int overlay_str_len; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2666 |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2667 /* A comparison function suitable for passing to qsort. */ |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2668 static int |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2669 cmp_for_strings (as1, as2) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2670 char *as1, *as2; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2671 { |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2672 struct sortstr *s1 = (struct sortstr *)as1; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2673 struct sortstr *s2 = (struct sortstr *)as2; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2674 if (s1->size != s2->size) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2675 return s2->size - s1->size; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2676 if (s1->priority != s2->priority) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2677 return s1->priority - s2->priority; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2678 return 0; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2679 } |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2680 |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2681 static void |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2682 record_overlay_string (ssl, str, str2, pri, size) |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2683 struct sortstrlist *ssl; |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2684 Lisp_Object str, str2, pri; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2685 int size; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2686 { |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2687 int nbytes; |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2688 |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2689 if (ssl->used == ssl->size) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2690 { |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2691 if (ssl->buf) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2692 ssl->size *= 2; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2693 else |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2694 ssl->size = 5; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2695 ssl->buf = ((struct sortstr *) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2696 xrealloc (ssl->buf, ssl->size * sizeof (struct sortstr))); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2697 } |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2698 ssl->buf[ssl->used].string = str; |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2699 ssl->buf[ssl->used].string2 = str2; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2700 ssl->buf[ssl->used].size = size; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2701 ssl->buf[ssl->used].priority = (INTEGERP (pri) ? XINT (pri) : 0); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2702 ssl->used++; |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2703 |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2704 if (NILP (current_buffer->enable_multibyte_characters)) |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2705 nbytes = XSTRING (str)->size; |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2706 else if (! STRING_MULTIBYTE (str)) |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2707 nbytes = count_size_as_multibyte (XSTRING (str)->data, |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21141
diff
changeset
|
2708 STRING_BYTES (XSTRING (str))); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2709 else |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21141
diff
changeset
|
2710 nbytes = STRING_BYTES (XSTRING (str)); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2711 |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2712 ssl->bytes += nbytes; |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2713 |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2714 if (STRINGP (str2)) |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2715 { |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2716 if (NILP (current_buffer->enable_multibyte_characters)) |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2717 nbytes = XSTRING (str2)->size; |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2718 else if (! STRING_MULTIBYTE (str2)) |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2719 nbytes = count_size_as_multibyte (XSTRING (str2)->data, |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21141
diff
changeset
|
2720 STRING_BYTES (XSTRING (str2))); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2721 else |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21141
diff
changeset
|
2722 nbytes = STRING_BYTES (XSTRING (str2)); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2723 |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2724 ssl->bytes += nbytes; |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2725 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2726 } |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2727 |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2728 /* Return the concatenation of the strings associated with overlays that |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2729 begin or end at POS, ignoring overlays that are specific to a window |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2730 other than W. The strings are concatenated in the appropriate order: |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2731 shorter overlays nest inside longer ones, and higher priority inside |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2732 lower. Normally all of the after-strings come first, but zero-sized |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2733 overlays have their after-strings ride along with the before-strings |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2734 because it would look strange to print them inside-out. |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2735 |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2736 Returns the string length, and stores the contents indirectly through |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2737 PSTR, if that variable is non-null. The string may be overwritten by |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2738 subsequent calls. */ |
16243
b311d8755530
(overlay_strings): Declare pstr using unsigned char.
Richard M. Stallman <rms@gnu.org>
parents:
16213
diff
changeset
|
2739 |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2740 int |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2741 overlay_strings (pos, w, pstr) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2742 int pos; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2743 struct window *w; |
16243
b311d8755530
(overlay_strings): Declare pstr using unsigned char.
Richard M. Stallman <rms@gnu.org>
parents:
16213
diff
changeset
|
2744 unsigned char **pstr; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2745 { |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2746 Lisp_Object ov, overlay, window, str; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2747 int startpos, endpos; |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2748 int multibyte = ! NILP (current_buffer->enable_multibyte_characters); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2749 |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2750 overlay_heads.used = overlay_heads.bytes = 0; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2751 overlay_tails.used = overlay_tails.bytes = 0; |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2752 for (ov = current_buffer->overlays_before; CONSP (ov); ov = XCDR (ov)) |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2753 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2754 overlay = XCAR (ov); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2755 if (!OVERLAYP (overlay)) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2756 abort (); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2757 |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2758 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2759 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2760 if (endpos < pos) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2761 break; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2762 if (endpos != pos && startpos != pos) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2763 continue; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2764 window = Foverlay_get (overlay, Qwindow); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2765 if (WINDOWP (window) && XWINDOW (window) != w) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2766 continue; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2767 if (startpos == pos |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2768 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2769 record_overlay_string (&overlay_heads, str, |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2770 (startpos == endpos |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2771 ? Foverlay_get (overlay, Qafter_string) |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2772 : Qnil), |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2773 Foverlay_get (overlay, Qpriority), |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2774 endpos - startpos); |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2775 else if (endpos == pos |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2776 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str))) |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2777 record_overlay_string (&overlay_tails, str, Qnil, |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2778 Foverlay_get (overlay, Qpriority), |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2779 endpos - startpos); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2780 } |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2781 for (ov = current_buffer->overlays_after; CONSP (ov); ov = XCDR (ov)) |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2782 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2783 overlay = XCAR (ov); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2784 if (!OVERLAYP (overlay)) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2785 abort (); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2786 |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2787 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2788 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2789 if (startpos > pos) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2790 break; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2791 if (endpos != pos && startpos != pos) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2792 continue; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2793 window = Foverlay_get (overlay, Qwindow); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2794 if (WINDOWP (window) && XWINDOW (window) != w) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2795 continue; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2796 if (startpos == pos |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2797 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2798 record_overlay_string (&overlay_heads, str, |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2799 (startpos == endpos |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2800 ? Foverlay_get (overlay, Qafter_string) |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2801 : Qnil), |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2802 Foverlay_get (overlay, Qpriority), |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2803 endpos - startpos); |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2804 else if (endpos == pos |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2805 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str))) |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2806 record_overlay_string (&overlay_tails, str, Qnil, |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2807 Foverlay_get (overlay, Qpriority), |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2808 endpos - startpos); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2809 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2810 if (overlay_tails.used > 1) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2811 qsort (overlay_tails.buf, overlay_tails.used, sizeof (struct sortstr), |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2812 cmp_for_strings); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2813 if (overlay_heads.used > 1) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2814 qsort (overlay_heads.buf, overlay_heads.used, sizeof (struct sortstr), |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2815 cmp_for_strings); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2816 if (overlay_heads.bytes || overlay_tails.bytes) |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2817 { |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2818 Lisp_Object tem; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2819 int i; |
18603
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
2820 unsigned char *p; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2821 int total = overlay_heads.bytes + overlay_tails.bytes; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2822 |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2823 if (total > overlay_str_len) |
18603
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
2824 { |
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
2825 overlay_str_len = total; |
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
2826 overlay_str_buf = (unsigned char *)xrealloc (overlay_str_buf, |
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
2827 total); |
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
2828 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2829 p = overlay_str_buf; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2830 for (i = overlay_tails.used; --i >= 0;) |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2831 { |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2832 int nbytes; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2833 tem = overlay_tails.buf[i].string; |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21141
diff
changeset
|
2834 nbytes = copy_text (XSTRING (tem)->data, p, |
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21141
diff
changeset
|
2835 STRING_BYTES (XSTRING (tem)), |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2836 STRING_MULTIBYTE (tem), multibyte); |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2837 p += nbytes; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2838 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2839 for (i = 0; i < overlay_heads.used; ++i) |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2840 { |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2841 int nbytes; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2842 tem = overlay_heads.buf[i].string; |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21141
diff
changeset
|
2843 nbytes = copy_text (XSTRING (tem)->data, p, |
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21141
diff
changeset
|
2844 STRING_BYTES (XSTRING (tem)), |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2845 STRING_MULTIBYTE (tem), multibyte); |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2846 p += nbytes; |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2847 tem = overlay_heads.buf[i].string2; |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2848 if (STRINGP (tem)) |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2849 { |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2850 nbytes = copy_text (XSTRING (tem)->data, p, |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21141
diff
changeset
|
2851 STRING_BYTES (XSTRING (tem)), |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2852 STRING_MULTIBYTE (tem), multibyte); |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2853 p += nbytes; |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2854 } |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2855 } |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2856 if (p != overlay_str_buf + total) |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2857 abort (); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2858 if (pstr) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2859 *pstr = overlay_str_buf; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2860 return total; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2861 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2862 return 0; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2863 } |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2864 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2865 /* Shift overlays in BUF's overlay lists, to center the lists at POS. */ |
333 | 2866 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2867 void |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2868 recenter_overlay_lists (buf, pos) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2869 struct buffer *buf; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2870 int pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2871 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2872 Lisp_Object overlay, tail, next, prev, beg, end; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2873 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2874 /* See if anything in overlays_before should move to overlays_after. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2875 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2876 /* We don't strictly need prev in this loop; it should always be nil. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2877 But we use it for symmetry and in case that should cease to be true |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2878 with some future change. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2879 prev = Qnil; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2880 for (tail = buf->overlays_before; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2881 CONSP (tail); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2882 prev = tail, tail = next) |
333 | 2883 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2884 next = XCDR (tail); |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2885 overlay = XCAR (tail); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2886 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2887 /* If the overlay is not valid, get rid of it. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2888 if (!OVERLAY_VALID (overlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2889 #if 1 |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2890 abort (); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2891 #else |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2892 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2893 /* Splice the cons cell TAIL out of overlays_before. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2894 if (!NILP (prev)) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2895 XCDR (prev) = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2896 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2897 buf->overlays_before = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2898 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2899 continue; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2900 } |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2901 #endif |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2902 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2903 beg = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2904 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2905 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2906 if (OVERLAY_POSITION (end) > pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2907 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2908 /* OVERLAY needs to be moved. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2909 int where = OVERLAY_POSITION (beg); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2910 Lisp_Object other, other_prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2911 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2912 /* Splice the cons cell TAIL out of overlays_before. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2913 if (!NILP (prev)) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2914 XCDR (prev) = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2915 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2916 buf->overlays_before = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2917 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2918 /* Search thru overlays_after for where to put it. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2919 other_prev = Qnil; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2920 for (other = buf->overlays_after; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2921 CONSP (other); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2922 other_prev = other, other = XCDR (other)) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2923 { |
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
2924 Lisp_Object otherbeg, otheroverlay; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2925 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2926 otheroverlay = XCAR (other); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2927 if (! OVERLAY_VALID (otheroverlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2928 abort (); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2929 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2930 otherbeg = OVERLAY_START (otheroverlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2931 if (OVERLAY_POSITION (otherbeg) >= where) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2932 break; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2933 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2934 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2935 /* Add TAIL to overlays_after before OTHER. */ |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2936 XCDR (tail) = other; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2937 if (!NILP (other_prev)) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2938 XCDR (other_prev) = tail; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2939 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2940 buf->overlays_after = tail; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2941 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2942 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2943 else |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2944 /* We've reached the things that should stay in overlays_before. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2945 All the rest of overlays_before must end even earlier, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2946 so stop now. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2947 break; |
333 | 2948 } |
2949 | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2950 /* See if anything in overlays_after should be in overlays_before. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2951 prev = Qnil; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2952 for (tail = buf->overlays_after; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2953 CONSP (tail); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2954 prev = tail, tail = next) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2955 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2956 next = XCDR (tail); |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2957 overlay = XCAR (tail); |
333 | 2958 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2959 /* If the overlay is not valid, get rid of it. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2960 if (!OVERLAY_VALID (overlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2961 #if 1 |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2962 abort (); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2963 #else |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2964 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2965 /* Splice the cons cell TAIL out of overlays_after. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2966 if (!NILP (prev)) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2967 XCDR (prev) = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2968 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2969 buf->overlays_after = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2970 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2971 continue; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2972 } |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2973 #endif |
333 | 2974 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2975 beg = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2976 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2977 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2978 /* Stop looking, when we know that nothing further |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2979 can possibly end before POS. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2980 if (OVERLAY_POSITION (beg) > pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2981 break; |
333 | 2982 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2983 if (OVERLAY_POSITION (end) <= pos) |
333 | 2984 { |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2985 /* OVERLAY needs to be moved. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2986 int where = OVERLAY_POSITION (end); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2987 Lisp_Object other, other_prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2988 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2989 /* Splice the cons cell TAIL out of overlays_after. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2990 if (!NILP (prev)) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2991 XCDR (prev) = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2992 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2993 buf->overlays_after = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2994 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2995 /* Search thru overlays_before for where to put it. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2996 other_prev = Qnil; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2997 for (other = buf->overlays_before; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2998 CONSP (other); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2999 other_prev = other, other = XCDR (other)) |
333 | 3000 { |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3001 Lisp_Object otherend, otheroverlay; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3002 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3003 otheroverlay = XCAR (other); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3004 if (! OVERLAY_VALID (otheroverlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3005 abort (); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3006 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3007 otherend = OVERLAY_END (otheroverlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3008 if (OVERLAY_POSITION (otherend) <= where) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3009 break; |
333 | 3010 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3011 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3012 /* Add TAIL to overlays_before before OTHER. */ |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3013 XCDR (tail) = other; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3014 if (!NILP (other_prev)) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3015 XCDR (other_prev) = tail; |
333 | 3016 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3017 buf->overlays_before = tail; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3018 tail = prev; |
333 | 3019 } |
3020 } | |
3021 | |
9296
a1a7fc21ded9
(reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9262
diff
changeset
|
3022 XSETFASTINT (buf->overlay_center, pos); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3023 } |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3024 |
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3025 void |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3026 adjust_overlays_for_insert (pos, length) |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3027 int pos; |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3028 int length; |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3029 { |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3030 /* After an insertion, the lists are still sorted properly, |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3031 but we may need to update the value of the overlay center. */ |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3032 if (XFASTINT (current_buffer->overlay_center) >= pos) |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3033 XSETFASTINT (current_buffer->overlay_center, |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3034 XFASTINT (current_buffer->overlay_center) + length); |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3035 } |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3036 |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3037 void |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3038 adjust_overlays_for_delete (pos, length) |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3039 int pos; |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3040 int length; |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3041 { |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3042 if (XFASTINT (current_buffer->overlay_center) < pos) |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3043 /* The deletion was to our right. No change needed; the before- and |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3044 after-lists are still consistent. */ |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3045 ; |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3046 else if (XFASTINT (current_buffer->overlay_center) > pos + length) |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3047 /* The deletion was to our left. We need to adjust the center value |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3048 to account for the change in position, but the lists are consistent |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3049 given the new value. */ |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3050 XSETFASTINT (current_buffer->overlay_center, |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3051 XFASTINT (current_buffer->overlay_center) - length); |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3052 else |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3053 /* We're right in the middle. There might be things on the after-list |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3054 that now belong on the before-list. Recentering will move them, |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3055 and also update the center point. */ |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3056 recenter_overlay_lists (current_buffer, pos); |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3057 } |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3058 |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3059 /* Fix up overlays that were garbled as a result of permuting markers |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3060 in the range START through END. Any overlay with at least one |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3061 endpoint in this range will need to be unlinked from the overlay |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3062 list and reinserted in its proper place. |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3063 Such an overlay might even have negative size at this point. |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3064 If so, we'll reverse the endpoints. Can you think of anything |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3065 better to do in this situation? */ |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3066 void |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3067 fix_overlays_in_range (start, end) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3068 register int start, end; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3069 { |
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
3070 Lisp_Object overlay; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3071 Lisp_Object before_list, after_list; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3072 Lisp_Object *ptail, *pbefore = &before_list, *pafter = &after_list; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3073 int startpos, endpos; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3074 |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3075 /* This algorithm shifts links around instead of consing and GCing. |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3076 The loop invariant is that before_list (resp. after_list) is a |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3077 well-formed list except that its last element, the one that |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3078 *pbefore (resp. *pafter) points to, is still uninitialized. |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3079 So it's not a bug that before_list isn't initialized, although |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3080 it may look strange. */ |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3081 for (ptail = ¤t_buffer->overlays_before; CONSP (*ptail);) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3082 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3083 overlay = XCAR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3084 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3085 if (endpos < start) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3086 break; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3087 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3088 if (endpos < end |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3089 || (startpos >= start && startpos < end)) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3090 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3091 /* If the overlay is backwards, fix that now. */ |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3092 if (startpos > endpos) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3093 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3094 int tem; |
18751
c8135c48a66d
(set_buffer_internal_1): Convert Fset_marker argument to Lisp_Integer.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
3095 Fset_marker (OVERLAY_START (overlay), make_number (endpos), |
c8135c48a66d
(set_buffer_internal_1): Convert Fset_marker argument to Lisp_Integer.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
3096 Qnil); |
c8135c48a66d
(set_buffer_internal_1): Convert Fset_marker argument to Lisp_Integer.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
3097 Fset_marker (OVERLAY_END (overlay), make_number (startpos), |
c8135c48a66d
(set_buffer_internal_1): Convert Fset_marker argument to Lisp_Integer.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
3098 Qnil); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3099 tem = startpos; startpos = endpos; endpos = tem; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3100 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3101 /* Add it to the end of the wrong list. Later on, |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3102 recenter_overlay_lists will move it to the right place. */ |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3103 if (endpos < XINT (current_buffer->overlay_center)) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3104 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3105 *pafter = *ptail; |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3106 pafter = &XCDR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3107 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3108 else |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3109 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3110 *pbefore = *ptail; |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3111 pbefore = &XCDR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3112 } |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3113 *ptail = XCDR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3114 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3115 else |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3116 ptail = &XCDR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3117 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3118 for (ptail = ¤t_buffer->overlays_after; CONSP (*ptail);) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3119 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3120 overlay = XCAR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3121 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3122 if (startpos >= end) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3123 break; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3124 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3125 if (startpos >= start |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3126 || (endpos >= start && endpos < end)) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3127 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3128 if (startpos > endpos) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3129 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3130 int tem; |
18751
c8135c48a66d
(set_buffer_internal_1): Convert Fset_marker argument to Lisp_Integer.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
3131 Fset_marker (OVERLAY_START (overlay), make_number (endpos), |
c8135c48a66d
(set_buffer_internal_1): Convert Fset_marker argument to Lisp_Integer.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
3132 Qnil); |
c8135c48a66d
(set_buffer_internal_1): Convert Fset_marker argument to Lisp_Integer.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
3133 Fset_marker (OVERLAY_END (overlay), make_number (startpos), |
c8135c48a66d
(set_buffer_internal_1): Convert Fset_marker argument to Lisp_Integer.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
3134 Qnil); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3135 tem = startpos; startpos = endpos; endpos = tem; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3136 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3137 if (endpos < XINT (current_buffer->overlay_center)) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3138 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3139 *pafter = *ptail; |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3140 pafter = &XCDR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3141 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3142 else |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3143 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3144 *pbefore = *ptail; |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3145 pbefore = &XCDR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3146 } |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3147 *ptail = XCDR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3148 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3149 else |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3150 ptail = &XCDR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3151 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3152 |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3153 /* Splice the constructed (wrong) lists into the buffer's lists, |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3154 and let the recenter function make it sane again. */ |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3155 *pbefore = current_buffer->overlays_before; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3156 current_buffer->overlays_before = before_list; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3157 recenter_overlay_lists (current_buffer, |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3158 XINT (current_buffer->overlay_center)); |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3159 |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3160 *pafter = current_buffer->overlays_after; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3161 current_buffer->overlays_after = after_list; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3162 recenter_overlay_lists (current_buffer, |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3163 XINT (current_buffer->overlay_center)); |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3164 } |
17022 | 3165 |
3166 /* We have two types of overlay: the one whose ending marker is | |
3167 after-insertion-marker (this is the usual case) and the one whose | |
3168 ending marker is before-insertion-marker. When `overlays_before' | |
3169 contains overlays of the latter type and the former type in this | |
3170 order and both overlays end at inserting position, inserting a text | |
3171 increases only the ending marker of the latter type, which results | |
3172 in incorrect ordering of `overlays_before'. | |
3173 | |
3174 This function fixes ordering of overlays in the slot | |
3175 `overlays_before' of the buffer *BP. Before the insertion, `point' | |
3176 was at PREV, and now is at POS. */ | |
3177 | |
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
3178 void |
17022 | 3179 fix_overlays_before (bp, prev, pos) |
3180 struct buffer *bp; | |
3181 int prev, pos; | |
3182 { | |
3183 Lisp_Object *tailp = &bp->overlays_before; | |
3184 Lisp_Object *right_place; | |
3185 int end; | |
3186 | |
3187 /* After the insertion, the several overlays may be in incorrect | |
3188 order. The possibility is that, in the list `overlays_before', | |
3189 an overlay which ends at POS appears after an overlay which ends | |
3190 at PREV. Since POS is greater than PREV, we must fix the | |
3191 ordering of these overlays, by moving overlays ends at POS before | |
3192 the overlays ends at PREV. */ | |
3193 | |
3194 /* At first, find a place where disordered overlays should be linked | |
3195 in. It is where an overlay which end before POS exists. (i.e. an | |
3196 overlay whose ending marker is after-insertion-marker if disorder | |
3197 exists). */ | |
3198 while (!NILP (*tailp) | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3199 && ((end = OVERLAY_POSITION (OVERLAY_END (XCAR (*tailp)))) |
17022 | 3200 >= pos)) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3201 tailp = &XCDR (*tailp); |
17022 | 3202 |
3203 /* If we don't find such an overlay, | |
3204 or the found one ends before PREV, | |
3205 or the found one is the last one in the list, | |
3206 we don't have to fix anything. */ | |
3207 if (NILP (*tailp) | |
3208 || end < prev | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3209 || NILP (XCDR (*tailp))) |
17022 | 3210 return; |
3211 | |
3212 right_place = tailp; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3213 tailp = &XCDR (*tailp); |
17022 | 3214 |
3215 /* Now, end position of overlays in the list *TAILP should be before | |
3216 or equal to PREV. In the loop, an overlay which ends at POS is | |
3217 moved ahead to the place pointed by RIGHT_PLACE. If we found an | |
3218 overlay which ends before PREV, the remaining overlays are in | |
3219 correct order. */ | |
3220 while (!NILP (*tailp)) | |
3221 { | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3222 end = OVERLAY_POSITION (OVERLAY_END (XCAR (*tailp))); |
17022 | 3223 |
3224 if (end == pos) | |
3225 { /* This overlay is disordered. */ | |
3226 Lisp_Object found = *tailp; | |
3227 | |
3228 /* Unlink the found overlay. */ | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3229 *tailp = XCDR (found); |
17022 | 3230 /* Move an overlay at RIGHT_PLACE to the next of the found one. */ |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3231 XCDR (found) = *right_place; |
17022 | 3232 /* Link it into the right place. */ |
3233 *right_place = found; | |
3234 } | |
3235 else if (end == prev) | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3236 tailp = &XCDR (*tailp); |
17022 | 3237 else /* No more disordered overlay. */ |
3238 break; | |
3239 } | |
3240 } | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3241 |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3242 DEFUN ("overlayp", Foverlayp, Soverlayp, 1, 1, 0, |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3243 "Return t if OBJECT is an overlay.") |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3244 (object) |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3245 Lisp_Object object; |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3246 { |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3247 return (OVERLAYP (object) ? Qt : Qnil); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3248 } |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3249 |
13446
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3250 DEFUN ("make-overlay", Fmake_overlay, Smake_overlay, 2, 5, 0, |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3251 "Create a new overlay with range BEG to END in BUFFER.\n\ |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3252 If omitted, BUFFER defaults to the current buffer.\n\ |
13446
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3253 BEG and END may be integers or markers.\n\ |
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3254 The fourth arg FRONT-ADVANCE, if non-nil, makes the\n\ |
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3255 front delimiter advance when text is inserted there.\n\ |
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3256 The fifth arg REAR-ADVANCE, if non-nil, makes the\n\ |
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3257 rear delimiter advance when text is inserted there.") |
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3258 (beg, end, buffer, front_advance, rear_advance) |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3259 Lisp_Object beg, end, buffer; |
13446
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3260 Lisp_Object front_advance, rear_advance; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3261 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3262 Lisp_Object overlay; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3263 struct buffer *b; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3264 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3265 if (NILP (buffer)) |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
3266 XSETBUFFER (buffer, current_buffer); |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3267 else |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3268 CHECK_BUFFER (buffer, 2); |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3269 if (MARKERP (beg) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3270 && ! EQ (Fmarker_buffer (beg), buffer)) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3271 error ("Marker points into wrong buffer"); |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3272 if (MARKERP (end) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3273 && ! EQ (Fmarker_buffer (end), buffer)) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3274 error ("Marker points into wrong buffer"); |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3275 |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3276 CHECK_NUMBER_COERCE_MARKER (beg, 1); |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3277 CHECK_NUMBER_COERCE_MARKER (end, 1); |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3278 |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3279 if (XINT (beg) > XINT (end)) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3280 { |
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3281 Lisp_Object temp; |
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3282 temp = beg; beg = end; end = temp; |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3283 } |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3284 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3285 b = XBUFFER (buffer); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3286 |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3287 beg = Fset_marker (Fmake_marker (), beg, buffer); |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3288 end = Fset_marker (Fmake_marker (), end, buffer); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3289 |
13446
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3290 if (!NILP (front_advance)) |
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3291 XMARKER (beg)->insertion_type = 1; |
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3292 if (!NILP (rear_advance)) |
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3293 XMARKER (end)->insertion_type = 1; |
13110
206ed64fe032
(Fmake_overlay): Set end-marker's insertion_type to 1.
Richard M. Stallman <rms@gnu.org>
parents:
12998
diff
changeset
|
3294 |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3295 overlay = allocate_misc (); |
11244
f3b11dc9014e
(Fmake_overlay): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11214
diff
changeset
|
3296 XMISCTYPE (overlay) = Lisp_Misc_Overlay; |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3297 XOVERLAY (overlay)->start = beg; |
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3298 XOVERLAY (overlay)->end = end; |
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3299 XOVERLAY (overlay)->plist = Qnil; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3300 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3301 /* Put the new overlay on the wrong list. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3302 end = OVERLAY_END (overlay); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3303 if (OVERLAY_POSITION (end) < XINT (b->overlay_center)) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3304 b->overlays_after = Fcons (overlay, b->overlays_after); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3305 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3306 b->overlays_before = Fcons (overlay, b->overlays_before); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3307 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3308 /* This puts it in the right list, and in the right order. */ |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3309 recenter_overlay_lists (b, XINT (b->overlay_center)); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3310 |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3311 /* We don't need to redisplay the region covered by the overlay, because |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3312 the overlay has no properties at the moment. */ |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3313 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3314 return overlay; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3315 } |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3316 |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3317 /* Mark a section of BUF as needing redisplay because of overlays changes. */ |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3318 |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3319 static void |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3320 modify_overlay (buf, start, end) |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3321 struct buffer *buf; |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3322 int start, end; |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3323 { |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3324 if (start == end) |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3325 return; |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3326 |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3327 if (start > end) |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3328 { |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3329 int temp = start; |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3330 start = end; end = temp; |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3331 } |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3332 |
27012
520f982f3a9a
(modify_overlay): Always compute unchanged info.
Gerd Moellmann <gerd@gnu.org>
parents:
26970
diff
changeset
|
3333 BUF_COMPUTE_UNCHANGED (buf, start, end); |
520f982f3a9a
(modify_overlay): Always compute unchanged info.
Gerd Moellmann <gerd@gnu.org>
parents:
26970
diff
changeset
|
3334 |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3335 /* If this is a buffer not in the selected window, |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3336 we must do other windows. */ |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3337 if (buf != XBUFFER (XWINDOW (selected_window)->buffer)) |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3338 windows_or_buffers_changed = 1; |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3339 /* If multiple windows show this buffer, we must do other windows. */ |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3340 else if (buffer_shared > 1) |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3341 windows_or_buffers_changed = 1; |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3342 |
19801
7482ad23e430
(modify_overlay): Update overlay_modiff of proper buffer.
Richard M. Stallman <rms@gnu.org>
parents:
19581
diff
changeset
|
3343 ++BUF_OVERLAY_MODIFF (buf); |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3344 } |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3345 |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3346 |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3347 Lisp_Object Fdelete_overlay (); |
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3348 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3349 DEFUN ("move-overlay", Fmove_overlay, Smove_overlay, 3, 4, 0, |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3350 "Set the endpoints of OVERLAY to BEG and END in BUFFER.\n\ |
2791
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
3351 If BUFFER is omitted, leave OVERLAY in the same buffer it inhabits now.\n\ |
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
3352 If BUFFER is omitted, and OVERLAY is in no buffer, put it in the current\n\ |
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
3353 buffer.") |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3354 (overlay, beg, end, buffer) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3355 Lisp_Object overlay, beg, end, buffer; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3356 { |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3357 struct buffer *b, *ob; |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3358 Lisp_Object obuffer; |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3359 int count = specpdl_ptr - specpdl; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3360 |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3361 CHECK_OVERLAY (overlay, 0); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3362 if (NILP (buffer)) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3363 buffer = Fmarker_buffer (OVERLAY_START (overlay)); |
2791
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
3364 if (NILP (buffer)) |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
3365 XSETBUFFER (buffer, current_buffer); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3366 CHECK_BUFFER (buffer, 3); |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3367 |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3368 if (MARKERP (beg) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3369 && ! EQ (Fmarker_buffer (beg), buffer)) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3370 error ("Marker points into wrong buffer"); |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3371 if (MARKERP (end) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3372 && ! EQ (Fmarker_buffer (end), buffer)) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3373 error ("Marker points into wrong buffer"); |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3374 |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3375 CHECK_NUMBER_COERCE_MARKER (beg, 1); |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3376 CHECK_NUMBER_COERCE_MARKER (end, 1); |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3377 |
8839 | 3378 if (XINT (beg) == XINT (end) && ! NILP (Foverlay_get (overlay, Qevaporate))) |
3379 return Fdelete_overlay (overlay); | |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3380 |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3381 if (XINT (beg) > XINT (end)) |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3382 { |
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3383 Lisp_Object temp; |
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3384 temp = beg; beg = end; end = temp; |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3385 } |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3386 |
8839 | 3387 specbind (Qinhibit_quit, Qt); |
3388 | |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3389 obuffer = Fmarker_buffer (OVERLAY_START (overlay)); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3390 b = XBUFFER (buffer); |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
3391 ob = BUFFERP (obuffer) ? XBUFFER (obuffer) : (struct buffer *) 0; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3392 |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3393 /* If the overlay has changed buffers, do a thorough redisplay. */ |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3394 if (!EQ (buffer, obuffer)) |
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3395 { |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3396 /* Redisplay where the overlay was. */ |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3397 if (!NILP (obuffer)) |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3398 { |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3399 int o_beg; |
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3400 int o_end; |
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3401 |
18105
bc690c1e1950
(Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents:
18009
diff
changeset
|
3402 o_beg = OVERLAY_POSITION (OVERLAY_START (overlay)); |
bc690c1e1950
(Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents:
18009
diff
changeset
|
3403 o_end = OVERLAY_POSITION (OVERLAY_END (overlay)); |
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3404 |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3405 modify_overlay (ob, o_beg, o_end); |
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3406 } |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3407 |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3408 /* Redisplay where the overlay is going to be. */ |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3409 modify_overlay (b, XINT (beg), XINT (end)); |
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3410 } |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3411 else |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3412 /* Redisplay the area the overlay has just left, or just enclosed. */ |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3413 { |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3414 int o_beg, o_end; |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3415 |
18105
bc690c1e1950
(Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents:
18009
diff
changeset
|
3416 o_beg = OVERLAY_POSITION (OVERLAY_START (overlay)); |
bc690c1e1950
(Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents:
18009
diff
changeset
|
3417 o_end = OVERLAY_POSITION (OVERLAY_END (overlay)); |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3418 |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3419 if (o_beg == XINT (beg)) |
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3420 modify_overlay (b, o_end, XINT (end)); |
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3421 else if (o_end == XINT (end)) |
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3422 modify_overlay (b, o_beg, XINT (beg)); |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3423 else |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3424 { |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3425 if (XINT (beg) < o_beg) o_beg = XINT (beg); |
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3426 if (XINT (end) > o_end) o_end = XINT (end); |
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3427 modify_overlay (b, o_beg, o_end); |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3428 } |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3429 } |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3430 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3431 if (!NILP (obuffer)) |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3432 { |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3433 ob->overlays_before = Fdelq (overlay, ob->overlays_before); |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3434 ob->overlays_after = Fdelq (overlay, ob->overlays_after); |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3435 } |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3436 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3437 Fset_marker (OVERLAY_START (overlay), beg, buffer); |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3438 Fset_marker (OVERLAY_END (overlay), end, buffer); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3439 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3440 /* Put the overlay on the wrong list. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3441 end = OVERLAY_END (overlay); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3442 if (OVERLAY_POSITION (end) < XINT (b->overlay_center)) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3443 b->overlays_after = Fcons (overlay, b->overlays_after); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3444 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3445 b->overlays_before = Fcons (overlay, b->overlays_before); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3446 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3447 /* This puts it in the right list, and in the right order. */ |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3448 recenter_overlay_lists (b, XINT (b->overlay_center)); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3449 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3450 return unbind_to (count, overlay); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3451 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3452 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3453 DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0, |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3454 "Delete the overlay OVERLAY from its buffer.") |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3455 (overlay) |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3456 Lisp_Object overlay; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3457 { |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3458 Lisp_Object buffer; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3459 struct buffer *b; |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3460 int count = specpdl_ptr - specpdl; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3461 |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3462 CHECK_OVERLAY (overlay, 0); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3463 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3464 buffer = Fmarker_buffer (OVERLAY_START (overlay)); |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3465 if (NILP (buffer)) |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3466 return Qnil; |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3467 |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3468 b = XBUFFER (buffer); |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3469 |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3470 specbind (Qinhibit_quit, Qt); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3471 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3472 b->overlays_before = Fdelq (overlay, b->overlays_before); |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3473 b->overlays_after = Fdelq (overlay, b->overlays_after); |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3474 |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3475 modify_overlay (b, |
21898 | 3476 marker_position (OVERLAY_START (overlay)), |
3477 marker_position (OVERLAY_END (overlay))); | |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3478 |
2791
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
3479 Fset_marker (OVERLAY_START (overlay), Qnil, Qnil); |
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
3480 Fset_marker (OVERLAY_END (overlay), Qnil, Qnil); |
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
3481 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3482 return unbind_to (count, Qnil); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3483 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3484 |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3485 /* Overlay dissection functions. */ |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3486 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3487 DEFUN ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0, |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3488 "Return the position at which OVERLAY starts.") |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3489 (overlay) |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3490 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3491 { |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3492 CHECK_OVERLAY (overlay, 0); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3493 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3494 return (Fmarker_position (OVERLAY_START (overlay))); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3495 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3496 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3497 DEFUN ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0, |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3498 "Return the position at which OVERLAY ends.") |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3499 (overlay) |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3500 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3501 { |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3502 CHECK_OVERLAY (overlay, 0); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3503 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3504 return (Fmarker_position (OVERLAY_END (overlay))); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3505 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3506 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3507 DEFUN ("overlay-buffer", Foverlay_buffer, Soverlay_buffer, 1, 1, 0, |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3508 "Return the buffer OVERLAY belongs to.") |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3509 (overlay) |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3510 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3511 { |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3512 CHECK_OVERLAY (overlay, 0); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3513 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3514 return Fmarker_buffer (OVERLAY_START (overlay)); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3515 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3516 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3517 DEFUN ("overlay-properties", Foverlay_properties, Soverlay_properties, 1, 1, 0, |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3518 "Return a list of the properties on OVERLAY.\n\ |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3519 This is a copy of OVERLAY's plist; modifying its conses has no effect on\n\ |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3520 OVERLAY.") |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3521 (overlay) |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3522 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3523 { |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3524 CHECK_OVERLAY (overlay, 0); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3525 |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3526 return Fcopy_sequence (XOVERLAY (overlay)->plist); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3527 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3528 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3529 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3530 DEFUN ("overlays-at", Foverlays_at, Soverlays_at, 1, 1, 0, |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3533
diff
changeset
|
3531 "Return a list of the overlays that contain position POS.") |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3532 (pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3533 Lisp_Object pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3534 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3535 int noverlays; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3536 Lisp_Object *overlay_vec; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3537 int len; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3538 Lisp_Object result; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3539 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3540 CHECK_NUMBER_COERCE_MARKER (pos, 0); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3541 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3542 len = 10; |
30911
c1de0fc3a34b
(Fget_buffer_create, Fmake_indirect_buffer): Avoid
Dave Love <fx@gnu.org>
parents:
30695
diff
changeset
|
3543 /* We can't use alloca here because overlays_at can call xrealloc. */ |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3544 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object)); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3545 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3546 /* Put all the overlays we want in a vector in overlay_vec. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3547 Store the length in len. */ |
11418
f892e7cb7f51
(Foverlays_at, Fnext_overlay_change): Don't use NULL.
Richard M. Stallman <rms@gnu.org>
parents:
11414
diff
changeset
|
3548 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, |
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
3549 (int *) 0, (int *) 0, 0); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3550 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3551 /* Make a list of them all. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3552 result = Flist (noverlays, overlay_vec); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3553 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
3554 xfree (overlay_vec); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3555 return result; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3556 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3557 |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3558 DEFUN ("overlays-in", Foverlays_in, Soverlays_in, 2, 2, 0, |
12488
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
3559 "Return a list of the overlays that overlap the region BEG ... END.\n\ |
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
3560 Overlap means that at least one character is contained within the overlay\n\ |
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
3561 and also contained within the specified region.\n\ |
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
3562 Empty overlays are included in the result if they are located at BEG\n\ |
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
3563 or between BEG and END.") |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3564 (beg, end) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3565 Lisp_Object beg, end; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3566 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3567 int noverlays; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3568 Lisp_Object *overlay_vec; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3569 int len; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3570 Lisp_Object result; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3571 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3572 CHECK_NUMBER_COERCE_MARKER (beg, 0); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3573 CHECK_NUMBER_COERCE_MARKER (end, 0); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3574 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3575 len = 10; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3576 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object)); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3577 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3578 /* Put all the overlays we want in a vector in overlay_vec. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3579 Store the length in len. */ |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3580 noverlays = overlays_in (XINT (beg), XINT (end), 1, &overlay_vec, &len, |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3581 (int *) 0, (int *) 0); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3582 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3583 /* Make a list of them all. */ |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3584 result = Flist (noverlays, overlay_vec); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3585 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3586 xfree (overlay_vec); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3587 return result; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3588 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3589 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3590 DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3591 1, 1, 0, |
7492 | 3592 "Return the next position after POS where an overlay starts or ends.\n\ |
3593 If there are no more overlay boundaries after POS, return (point-max).") | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3594 (pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3595 Lisp_Object pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3596 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3597 int noverlays; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3598 int endpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3599 Lisp_Object *overlay_vec; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3600 int len; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3601 int i; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3602 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3603 CHECK_NUMBER_COERCE_MARKER (pos, 0); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3604 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3605 len = 10; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3606 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object)); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3607 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3608 /* Put all the overlays we want in a vector in overlay_vec. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3609 Store the length in len. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3610 endpos gets the position where the next overlay starts. */ |
11418
f892e7cb7f51
(Foverlays_at, Fnext_overlay_change): Don't use NULL.
Richard M. Stallman <rms@gnu.org>
parents:
11414
diff
changeset
|
3611 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, |
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
3612 &endpos, (int *) 0, 1); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3613 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3614 /* If any of these overlays ends before endpos, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3615 use its ending point instead. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3616 for (i = 0; i < noverlays; i++) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3617 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3618 Lisp_Object oend; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3619 int oendpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3620 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3621 oend = OVERLAY_END (overlay_vec[i]); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3622 oendpos = OVERLAY_POSITION (oend); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3623 if (oendpos < endpos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3624 endpos = oendpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3625 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3626 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
3627 xfree (overlay_vec); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3628 return make_number (endpos); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3629 } |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3630 |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3631 DEFUN ("previous-overlay-change", Fprevious_overlay_change, |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3632 Sprevious_overlay_change, 1, 1, 0, |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3633 "Return the previous position before POS where an overlay starts or ends.\n\ |
12214
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
3634 If there are no more overlay boundaries before POS, return (point-min).") |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3635 (pos) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3636 Lisp_Object pos; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3637 { |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3638 int noverlays; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3639 int prevpos; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3640 Lisp_Object *overlay_vec; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3641 int len; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3642 |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3643 CHECK_NUMBER_COERCE_MARKER (pos, 0); |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3644 |
12214
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
3645 /* At beginning of buffer, we know the answer; |
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
3646 avoid bug subtracting 1 below. */ |
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
3647 if (XINT (pos) == BEGV) |
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
3648 return pos; |
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
3649 |
30360
92f92a541686
(Fprevious_overlay_change): Avoid memory leak.
Gerd Moellmann <gerd@gnu.org>
parents:
29456
diff
changeset
|
3650 len = 10; |
92f92a541686
(Fprevious_overlay_change): Avoid memory leak.
Gerd Moellmann <gerd@gnu.org>
parents:
29456
diff
changeset
|
3651 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object)); |
92f92a541686
(Fprevious_overlay_change): Avoid memory leak.
Gerd Moellmann <gerd@gnu.org>
parents:
29456
diff
changeset
|
3652 |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3653 /* Put all the overlays we want in a vector in overlay_vec. |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3654 Store the length in len. |
25205
14269f6d315b
(Fprevious_overlay_change): Just return the answer obtained from overlays_at.
Richard M. Stallman <rms@gnu.org>
parents:
25184
diff
changeset
|
3655 prevpos gets the position of the previous change. */ |
11418
f892e7cb7f51
(Foverlays_at, Fnext_overlay_change): Don't use NULL.
Richard M. Stallman <rms@gnu.org>
parents:
11414
diff
changeset
|
3656 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, |
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
3657 (int *) 0, &prevpos, 1); |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3658 |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3659 xfree (overlay_vec); |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3660 return make_number (prevpos); |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3661 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3662 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3663 /* These functions are for debugging overlays. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3664 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3665 DEFUN ("overlay-lists", Foverlay_lists, Soverlay_lists, 0, 0, 0, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3666 "Return a pair of lists giving all the overlays of the current buffer.\n\ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3667 The car has all the overlays before the overlay center;\n\ |
7492 | 3668 the cdr has all the overlays after the overlay center.\n\ |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3669 Recentering overlays moves overlays between these lists.\n\ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3670 The lists you get are copies, so that changing them has no effect.\n\ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3671 However, the overlays you get are the real objects that the buffer uses.") |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3672 () |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3673 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3674 Lisp_Object before, after; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3675 before = current_buffer->overlays_before; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3676 if (CONSP (before)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3677 before = Fcopy_sequence (before); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3678 after = current_buffer->overlays_after; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3679 if (CONSP (after)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3680 after = Fcopy_sequence (after); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3681 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3682 return Fcons (before, after); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3683 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3684 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3685 DEFUN ("overlay-recenter", Foverlay_recenter, Soverlay_recenter, 1, 1, 0, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3686 "Recenter the overlays of the current buffer around position POS.") |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3687 (pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3688 Lisp_Object pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3689 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3690 CHECK_NUMBER_COERCE_MARKER (pos, 0); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3691 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3692 recenter_overlay_lists (current_buffer, XINT (pos)); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3693 return Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3694 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3695 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3696 DEFUN ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0, |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
3697 "Get the property of overlay OVERLAY with property name PROP.") |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3698 (overlay, prop) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3699 Lisp_Object overlay, prop; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3700 { |
9211
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3701 Lisp_Object plist, fallback; |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3702 |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3703 CHECK_OVERLAY (overlay, 0); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3704 |
9211
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3705 fallback = Qnil; |
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3706 |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3707 for (plist = XOVERLAY (overlay)->plist; |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3708 CONSP (plist) && CONSP (XCDR (plist)); |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3709 plist = XCDR (XCDR (plist))) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3710 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3711 if (EQ (XCAR (plist), prop)) |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3712 return XCAR (XCDR (plist)); |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3713 else if (EQ (XCAR (plist), Qcategory)) |
9211
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3714 { |
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3715 Lisp_Object tem; |
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3716 tem = Fcar (Fcdr (plist)); |
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3717 if (SYMBOLP (tem)) |
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3718 fallback = Fget (tem, prop); |
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3719 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3720 } |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3721 |
9211
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3722 return fallback; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3723 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3724 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3725 DEFUN ("overlay-put", Foverlay_put, Soverlay_put, 3, 3, 0, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3726 "Set one property of overlay OVERLAY: give property PROP value VALUE.") |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3727 (overlay, prop, value) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3728 Lisp_Object overlay, prop, value; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3729 { |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3730 Lisp_Object tail, buffer; |
8839 | 3731 int changed; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3732 |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3733 CHECK_OVERLAY (overlay, 0); |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3734 |
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
3735 buffer = Fmarker_buffer (OVERLAY_START (overlay)); |
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
3736 |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3737 for (tail = XOVERLAY (overlay)->plist; |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3738 CONSP (tail) && CONSP (XCDR (tail)); |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3739 tail = XCDR (XCDR (tail))) |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3740 if (EQ (XCAR (tail), prop)) |
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
3741 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3742 changed = !EQ (XCAR (XCDR (tail)), value); |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3743 XCAR (XCDR (tail)) = value; |
8839 | 3744 goto found; |
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
3745 } |
8839 | 3746 /* It wasn't in the list, so add it to the front. */ |
3747 changed = !NILP (value); | |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3748 XOVERLAY (overlay)->plist |
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3749 = Fcons (prop, Fcons (value, XOVERLAY (overlay)->plist)); |
8839 | 3750 found: |
3751 if (! NILP (buffer)) | |
3752 { | |
3753 if (changed) | |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3754 modify_overlay (XBUFFER (buffer), |
8839 | 3755 marker_position (OVERLAY_START (overlay)), |
3756 marker_position (OVERLAY_END (overlay))); | |
3757 if (EQ (prop, Qevaporate) && ! NILP (value) | |
3758 && (OVERLAY_POSITION (OVERLAY_START (overlay)) | |
3759 == OVERLAY_POSITION (OVERLAY_END (overlay)))) | |
3760 Fdelete_overlay (overlay); | |
3761 } | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3762 return value; |
333 | 3763 } |
3764 | |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3765 /* Subroutine of report_overlay_modification. */ |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3766 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3767 /* Lisp vector holding overlay hook functions to call. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3768 Vector elements come in pairs. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3769 Each even-index element is a list of hook functions. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3770 The following odd-index element is the overlay they came from. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3771 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3772 Before the buffer change, we fill in this vector |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3773 as we call overlay hook functions. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3774 After the buffer change, we get the functions to call from this vector. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3775 This way we always call the same functions before and after the change. */ |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3776 static Lisp_Object last_overlay_modification_hooks; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3777 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3778 /* Number of elements actually used in last_overlay_modification_hooks. */ |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3779 static int last_overlay_modification_hooks_used; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3780 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3781 /* Add one functionlist/overlay pair |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3782 to the end of last_overlay_modification_hooks. */ |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3783 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3784 static void |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3785 add_overlay_mod_hooklist (functionlist, overlay) |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3786 Lisp_Object functionlist, overlay; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3787 { |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3788 int oldsize = XVECTOR (last_overlay_modification_hooks)->size; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3789 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3790 if (last_overlay_modification_hooks_used == oldsize) |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3791 { |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3792 Lisp_Object old; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3793 old = last_overlay_modification_hooks; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3794 last_overlay_modification_hooks |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3795 = Fmake_vector (make_number (oldsize * 2), Qnil); |
15122
a46a40f1c30c
(add_overlay_mod_hooklist): Fix call to bcopy.
Richard M. Stallman <rms@gnu.org>
parents:
15032
diff
changeset
|
3796 bcopy (XVECTOR (old)->contents, |
a46a40f1c30c
(add_overlay_mod_hooklist): Fix call to bcopy.
Richard M. Stallman <rms@gnu.org>
parents:
15032
diff
changeset
|
3797 XVECTOR (last_overlay_modification_hooks)->contents, |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3798 sizeof (Lisp_Object) * oldsize); |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3799 } |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3800 XVECTOR (last_overlay_modification_hooks)->contents[last_overlay_modification_hooks_used++] = functionlist; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3801 XVECTOR (last_overlay_modification_hooks)->contents[last_overlay_modification_hooks_used++] = overlay; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3802 } |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3803 |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3804 /* Run the modification-hooks of overlays that include |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3805 any part of the text in START to END. |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3806 If this change is an insertion, also |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3807 run the insert-before-hooks of overlay starting at END, |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3808 and the insert-after-hooks of overlay ending at START. |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3809 |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3810 This is called both before and after the modification. |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3811 AFTER is nonzero when we call after the modification. |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3812 |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3813 ARG1, ARG2, ARG3 are arguments to pass to the hook functions. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3814 When AFTER is nonzero, they are the start position, |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3815 the position after the inserted new text, |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3816 and the length of deleted or replaced old text. */ |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3817 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3818 void |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3819 report_overlay_modification (start, end, after, arg1, arg2, arg3) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3820 Lisp_Object start, end; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3821 int after; |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3822 Lisp_Object arg1, arg2, arg3; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3823 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3824 Lisp_Object prop, overlay, tail; |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3825 /* 1 if this change is an insertion. */ |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3826 int insertion = (after ? XFASTINT (arg3) == 0 : EQ (start, end)); |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3827 int tail_copied; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3828 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3829 |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3830 overlay = Qnil; |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3831 tail = Qnil; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3832 GCPRO5 (overlay, tail, arg1, arg2, arg3); |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3833 |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3834 if (after) |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3835 { |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3836 /* Call the functions recorded in last_overlay_modification_hooks |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3837 rather than scanning the overlays again. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3838 First copy the vector contents, in case some of these hooks |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3839 do subsequent modification of the buffer. */ |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3840 int size = last_overlay_modification_hooks_used; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3841 Lisp_Object *copy = (Lisp_Object *) alloca (size * sizeof (Lisp_Object)); |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3842 int i; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3843 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3844 bcopy (XVECTOR (last_overlay_modification_hooks)->contents, |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3845 copy, size * sizeof (Lisp_Object)); |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3846 gcpro1.var = copy; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3847 gcpro1.nvars = size; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3848 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3849 for (i = 0; i < size;) |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3850 { |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3851 Lisp_Object prop, overlay; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3852 prop = copy[i++]; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3853 overlay = copy[i++]; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3854 call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3); |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3855 } |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3856 UNGCPRO; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3857 return; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3858 } |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3859 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3860 /* We are being called before a change. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3861 Scan the overlays to find the functions to call. */ |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3862 last_overlay_modification_hooks_used = 0; |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3863 tail_copied = 0; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3864 for (tail = current_buffer->overlays_before; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3865 CONSP (tail); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3866 tail = XCDR (tail)) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3867 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3868 int startpos, endpos; |
4416
9657ef911049
(Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents:
4226
diff
changeset
|
3869 Lisp_Object ostart, oend; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3870 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3871 overlay = XCAR (tail); |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3872 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3873 ostart = OVERLAY_START (overlay); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3874 oend = OVERLAY_END (overlay); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3875 endpos = OVERLAY_POSITION (oend); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3876 if (XFASTINT (start) > endpos) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3877 break; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3878 startpos = OVERLAY_POSITION (ostart); |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3879 if (insertion && (XFASTINT (start) == startpos |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3880 || XFASTINT (end) == startpos)) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3881 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3882 prop = Foverlay_get (overlay, Qinsert_in_front_hooks); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3883 if (!NILP (prop)) |
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3884 { |
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3885 /* Copy TAIL in case the hook recenters the overlay lists. */ |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3886 if (!tail_copied) |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3887 tail = Fcopy_sequence (tail); |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3888 tail_copied = 1; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3889 call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3890 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3891 } |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3892 if (insertion && (XFASTINT (start) == endpos |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3893 || XFASTINT (end) == endpos)) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3894 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3895 prop = Foverlay_get (overlay, Qinsert_behind_hooks); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3896 if (!NILP (prop)) |
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3897 { |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3898 if (!tail_copied) |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3899 tail = Fcopy_sequence (tail); |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3900 tail_copied = 1; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3901 call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3902 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3903 } |
6675
cf38c5af079d
(verify_overlay_modification): Run modification-hooks for any deletion that
Karl Heuer <kwzh@gnu.org>
parents:
6659
diff
changeset
|
3904 /* Test for intersecting intervals. This does the right thing |
cf38c5af079d
(verify_overlay_modification): Run modification-hooks for any deletion that
Karl Heuer <kwzh@gnu.org>
parents:
6659
diff
changeset
|
3905 for both insertion and deletion. */ |
cf38c5af079d
(verify_overlay_modification): Run modification-hooks for any deletion that
Karl Heuer <kwzh@gnu.org>
parents:
6659
diff
changeset
|
3906 if (XFASTINT (end) > startpos && XFASTINT (start) < endpos) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3907 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3908 prop = Foverlay_get (overlay, Qmodification_hooks); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3909 if (!NILP (prop)) |
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3910 { |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3911 if (!tail_copied) |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3912 tail = Fcopy_sequence (tail); |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3913 tail_copied = 1; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3914 call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3915 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3916 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3917 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3918 |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3919 tail_copied = 0; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3920 for (tail = current_buffer->overlays_after; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3921 CONSP (tail); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3922 tail = XCDR (tail)) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3923 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3924 int startpos, endpos; |
4416
9657ef911049
(Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents:
4226
diff
changeset
|
3925 Lisp_Object ostart, oend; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3926 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3927 overlay = XCAR (tail); |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3928 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3929 ostart = OVERLAY_START (overlay); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3930 oend = OVERLAY_END (overlay); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3931 startpos = OVERLAY_POSITION (ostart); |
4574
503af6aa135b
(verify_overlay_modification): initialize endpos.
Richard M. Stallman <rms@gnu.org>
parents:
4416
diff
changeset
|
3932 endpos = OVERLAY_POSITION (oend); |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3933 if (XFASTINT (end) < startpos) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3934 break; |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3935 if (insertion && (XFASTINT (start) == startpos |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3936 || XFASTINT (end) == startpos)) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3937 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3938 prop = Foverlay_get (overlay, Qinsert_in_front_hooks); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3939 if (!NILP (prop)) |
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3940 { |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3941 if (!tail_copied) |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3942 tail = Fcopy_sequence (tail); |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3943 tail_copied = 1; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3944 call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3945 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3946 } |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3947 if (insertion && (XFASTINT (start) == endpos |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3948 || XFASTINT (end) == endpos)) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3949 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3950 prop = Foverlay_get (overlay, Qinsert_behind_hooks); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3951 if (!NILP (prop)) |
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3952 { |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3953 if (!tail_copied) |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3954 tail = Fcopy_sequence (tail); |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3955 tail_copied = 1; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3956 call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3957 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3958 } |
6675
cf38c5af079d
(verify_overlay_modification): Run modification-hooks for any deletion that
Karl Heuer <kwzh@gnu.org>
parents:
6659
diff
changeset
|
3959 /* Test for intersecting intervals. This does the right thing |
cf38c5af079d
(verify_overlay_modification): Run modification-hooks for any deletion that
Karl Heuer <kwzh@gnu.org>
parents:
6659
diff
changeset
|
3960 for both insertion and deletion. */ |
cf38c5af079d
(verify_overlay_modification): Run modification-hooks for any deletion that
Karl Heuer <kwzh@gnu.org>
parents:
6659
diff
changeset
|
3961 if (XFASTINT (end) > startpos && XFASTINT (start) < endpos) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3962 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3963 prop = Foverlay_get (overlay, Qmodification_hooks); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3964 if (!NILP (prop)) |
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3965 { |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3966 if (!tail_copied) |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3967 tail = Fcopy_sequence (tail); |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3968 tail_copied = 1; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3969 call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3970 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3971 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3972 } |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3973 |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3974 UNGCPRO; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3975 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3976 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3977 static void |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3978 call_overlay_mod_hooks (list, overlay, after, arg1, arg2, arg3) |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3979 Lisp_Object list, overlay; |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3980 int after; |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3981 Lisp_Object arg1, arg2, arg3; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3982 { |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3983 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3984 |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3985 GCPRO4 (list, arg1, arg2, arg3); |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3986 if (! after) |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3987 add_overlay_mod_hooklist (list, overlay); |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3988 |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3989 while (!NILP (list)) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3990 { |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3991 if (NILP (arg3)) |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3992 call4 (Fcar (list), overlay, after ? Qt : Qnil, arg1, arg2); |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3993 else |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3994 call5 (Fcar (list), overlay, after ? Qt : Qnil, arg1, arg2, arg3); |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3995 list = Fcdr (list); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3996 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3997 UNGCPRO; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3998 } |
8839 | 3999 |
4000 /* Delete any zero-sized overlays at position POS, if the `evaporate' | |
4001 property is set. */ | |
4002 void | |
4003 evaporate_overlays (pos) | |
4004 int pos; | |
4005 { | |
4006 Lisp_Object tail, overlay, hit_list; | |
4007 | |
4008 hit_list = Qnil; | |
4009 if (pos <= XFASTINT (current_buffer->overlay_center)) | |
4010 for (tail = current_buffer->overlays_before; CONSP (tail); | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4011 tail = XCDR (tail)) |
8839 | 4012 { |
4013 int endpos; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4014 overlay = XCAR (tail); |
8839 | 4015 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
4016 if (endpos < pos) | |
4017 break; | |
4018 if (endpos == pos && OVERLAY_POSITION (OVERLAY_START (overlay)) == pos | |
11414
60d40ca8c16b
(evaporate_overlays): Fix type error.
Richard M. Stallman <rms@gnu.org>
parents:
11244
diff
changeset
|
4019 && ! NILP (Foverlay_get (overlay, Qevaporate))) |
8839 | 4020 hit_list = Fcons (overlay, hit_list); |
4021 } | |
4022 else | |
4023 for (tail = current_buffer->overlays_after; CONSP (tail); | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4024 tail = XCDR (tail)) |
8839 | 4025 { |
4026 int startpos; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4027 overlay = XCAR (tail); |
8839 | 4028 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
4029 if (startpos > pos) | |
4030 break; | |
4031 if (startpos == pos && OVERLAY_POSITION (OVERLAY_END (overlay)) == pos | |
11414
60d40ca8c16b
(evaporate_overlays): Fix type error.
Richard M. Stallman <rms@gnu.org>
parents:
11244
diff
changeset
|
4032 && ! NILP (Foverlay_get (overlay, Qevaporate))) |
8839 | 4033 hit_list = Fcons (overlay, hit_list); |
4034 } | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4035 for (; CONSP (hit_list); hit_list = XCDR (hit_list)) |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4036 Fdelete_overlay (XCAR (hit_list)); |
8839 | 4037 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4038 |
9464
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
4039 /* Somebody has tried to store a value with an unacceptable type |
20995
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
4040 in the slot with offset OFFSET. */ |
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
4041 |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4042 void |
9464
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
4043 buffer_slot_type_mismatch (offset) |
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
4044 int offset; |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4045 { |
9464
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
4046 Lisp_Object sym; |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4047 char *type_name; |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4048 |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
4049 switch (XINT (PER_BUFFER_TYPE (offset))) |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4050 { |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4051 case Lisp_Int: |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4052 type_name = "integers"; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4053 break; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4054 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4055 case Lisp_String: |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4056 type_name = "strings"; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4057 break; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4058 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4059 case Lisp_Symbol: |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4060 type_name = "symbols"; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4061 break; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4062 |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4063 default: |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4064 abort (); |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4065 } |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4066 |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
4067 sym = PER_BUFFER_SYMBOL (offset); |
20995
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
4068 error ("Only %s should be stored in the buffer-local variable %s", |
9464
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
4069 type_name, XSYMBOL (sym)->name->data); |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4070 } |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4071 |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4072 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4073 /*********************************************************************** |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4074 Allocation with mmap |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4075 ***********************************************************************/ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4076 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4077 #ifdef USE_MMAP_FOR_BUFFERS |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4078 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4079 #include <sys/types.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4080 #include <sys/mman.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4081 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4082 #ifndef MAP_ANON |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4083 #ifdef MAP_ANONYMOUS |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4084 #define MAP_ANON MAP_ANONYMOUS |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4085 #else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4086 #define MAP_ANON 0 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4087 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4088 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4089 |
33645
e822f94eb7d9
(MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents:
33598
diff
changeset
|
4090 #ifndef MAP_FAILED |
e822f94eb7d9
(MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents:
33598
diff
changeset
|
4091 #define MAP_FAILED ((void *) -1) |
e822f94eb7d9
(MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents:
33598
diff
changeset
|
4092 #endif |
e822f94eb7d9
(MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents:
33598
diff
changeset
|
4093 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4094 #include <stdio.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4095 #include <errno.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4096 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4097 #if MAP_ANON == 0 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4098 #include <fcntl.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4099 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4100 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4101 #include "coding.h" |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4102 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4103 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4104 /* Memory is allocated in regions which are mapped using mmap(2). |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4105 The current implementation lets the system select mapped |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4106 addresses; we're not using MAP_FIXED in general, except when |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4107 trying to enlarge regions. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4108 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4109 Each mapped region starts with a mmap_region structure, the user |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4110 area starts after that structure, aligned to MEM_ALIGN. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4111 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4112 +-----------------------+ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4113 | struct mmap_info + | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4114 | padding | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4115 +-----------------------+ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4116 | user data | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4117 | | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4118 | | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4119 +-----------------------+ */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4120 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4121 struct mmap_region |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4122 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4123 /* User-specified size. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4124 size_t nbytes_specified; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4125 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4126 /* Number of bytes mapped */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4127 size_t nbytes_mapped; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4128 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4129 /* Pointer to the location holding the address of the memory |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4130 allocated with the mmap'd block. The variable actually points |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4131 after this structure. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4132 POINTER_TYPE **var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4133 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4134 /* Next and previous in list of all mmap'd regions. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4135 struct mmap_region *next, *prev; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4136 }; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4137 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4138 /* Doubly-linked list of mmap'd regions. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4139 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4140 static struct mmap_region *mmap_regions; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4141 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4142 /* File descriptor for mmap. If we don't have anonymous mapping, |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4143 /dev/zero will be opened on it. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4144 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4145 static int mmap_fd; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4146 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4147 /* Temporary storage for mmap_set_vars, see there. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4148 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4149 static struct mmap_region *mmap_regions_1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4150 static int mmap_fd_1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4151 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4152 /* Page size on this system. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4153 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4154 static int mmap_page_size; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4155 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4156 /* 1 means mmap has been intialized. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4157 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4158 static int mmap_initialized_p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4159 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4160 /* Value is X rounded up to the next multiple of N. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4161 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4162 #define ROUND(X, N) (((X) + (N) - 1) / (N) * (N)) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4163 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4164 /* Size of mmap_region structure plus padding. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4165 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4166 #define MMAP_REGION_STRUCT_SIZE \ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4167 ROUND (sizeof (struct mmap_region), MEM_ALIGN) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4168 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4169 /* Given a pointer P to the start of the user-visible part of a mapped |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4170 region, return a pointer to the start of the region. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4171 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4172 #define MMAP_REGION(P) \ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4173 ((struct mmap_region *) ((char *) (P) - MMAP_REGION_STRUCT_SIZE)) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4174 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4175 /* Given a pointer P to the start of a mapped region, return a pointer |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4176 to the start of the user-visible part of the region. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4177 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4178 #define MMAP_USER_AREA(P) \ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4179 ((POINTER_TYPE *) ((char *) (P) + MMAP_REGION_STRUCT_SIZE)) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4180 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4181 #define MEM_ALIGN sizeof (double) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4182 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4183 /* Function prototypes. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4184 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4185 static int mmap_free_1 P_ ((struct mmap_region *)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4186 static int mmap_enlarge P_ ((struct mmap_region *, int)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4187 static struct mmap_region *mmap_find P_ ((POINTER_TYPE *, POINTER_TYPE *)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4188 static POINTER_TYPE *mmap_alloc P_ ((POINTER_TYPE **, size_t)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4189 static POINTER_TYPE *mmap_realloc P_ ((POINTER_TYPE **, size_t)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4190 static void mmap_free P_ ((POINTER_TYPE **ptr)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4191 static void mmap_init P_ ((void)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4192 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4193 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4194 /* Return a region overlapping address range START...END, or null if |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4195 none. END is not including, i.e. the last byte in the range |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4196 is at END - 1. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4197 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4198 static struct mmap_region * |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4199 mmap_find (start, end) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4200 POINTER_TYPE *start, *end; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4201 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4202 struct mmap_region *r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4203 char *s = (char *) start, *e = (char *) end; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4204 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4205 for (r = mmap_regions; r; r = r->next) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4206 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4207 char *rstart = (char *) r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4208 char *rend = rstart + r->nbytes_mapped; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4209 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4210 if (/* First byte of range, i.e. START, in this region? */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4211 (s >= rstart && s < rend) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4212 /* Last byte of range, i.e. END - 1, in this region? */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4213 || (e > rstart && e <= rend) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4214 /* First byte of this region in the range? */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4215 || (rstart >= s && rstart < e) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4216 /* Last byte of this region in the range? */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4217 || (rend > s && rend <= e)) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4218 break; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4219 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4220 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4221 return r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4222 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4223 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4224 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4225 /* Unmap a region. P is a pointer to the start of the user-araa of |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4226 the region. Value is non-zero if successful. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4227 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4228 static int |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4229 mmap_free_1 (r) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4230 struct mmap_region *r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4231 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4232 if (r->next) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4233 r->next->prev = r->prev; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4234 if (r->prev) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4235 r->prev->next = r->next; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4236 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4237 mmap_regions = r->next; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4238 |
33675
cd12ade4547d
(mmap_free_1): Avoid a compiler warning.
Gerd Moellmann <gerd@gnu.org>
parents:
33645
diff
changeset
|
4239 if (munmap ((POINTER_TYPE *) r, r->nbytes_mapped) == -1) |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4240 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4241 fprintf (stderr, "munmap: %s\n", emacs_strerror (errno)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4242 return 0; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4243 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4244 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4245 return 1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4246 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4247 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4248 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4249 /* Enlarge region R by NPAGES pages. NPAGES < 0 means shrink R. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4250 Value is non-zero if successful. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4251 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4252 static int |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4253 mmap_enlarge (r, npages) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4254 struct mmap_region *r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4255 int npages; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4256 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4257 char *region_end = (char *) r + r->nbytes_mapped; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4258 size_t nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4259 int success = 0; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4260 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4261 if (npages < 0) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4262 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4263 /* Unmap pages at the end of the region. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4264 nbytes = - npages * mmap_page_size; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4265 if (munmap (region_end - nbytes, nbytes) == -1) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4266 fprintf (stderr, "munmap: %s\n", emacs_strerror (errno)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4267 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4268 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4269 r->nbytes_mapped -= nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4270 success = 1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4271 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4272 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4273 else if (npages > 0) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4274 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4275 struct mmap_region *r2; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4276 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4277 nbytes = npages * mmap_page_size; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4278 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4279 /* Try to map additional pages at the end of the region. We |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4280 cannot do this if the address range is already occupied by |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4281 something else because mmap deletes any previous mapping. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4282 I'm not sure this is worth doing, let's see. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4283 r2 = mmap_find (region_end, region_end + nbytes); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4284 if (r2 == NULL) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4285 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4286 POINTER_TYPE *p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4287 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4288 p = mmap (region_end, nbytes, PROT_READ | PROT_WRITE, |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4289 MAP_ANON | MAP_PRIVATE | MAP_FIXED, mmap_fd, 0); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4290 if (p == MAP_FAILED) |
33598
d2ed1317ec06
(mmap_enlarge): Don't print a message on stderr
Gerd Moellmann <gerd@gnu.org>
parents:
32856
diff
changeset
|
4291 ; /* fprintf (stderr, "mmap: %s\n", emacs_strerror (errno)); */ |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4292 else if (p != (POINTER_TYPE *) region_end) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4293 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4294 /* Kernels are free to choose a different address. In |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4295 that case, unmap what we've mapped above; we have |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4296 no use for it. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4297 if (munmap (p, nbytes) == -1) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4298 fprintf (stderr, "munmap: %s\n", emacs_strerror (errno)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4299 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4300 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4301 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4302 r->nbytes_mapped += nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4303 success = 1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4304 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4305 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4306 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4307 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4308 return success; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4309 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4310 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4311 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4312 /* Set or reset variables holding references to mapped regions. If |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4313 RESTORE_P is zero, set all variables to null. If RESTORE_P is |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4314 non-zero, set all variables to the start of the user-areas |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4315 of mapped regions. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4316 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4317 This function is called from Fdump_emacs to ensure that the dumped |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4318 Emacs doesn't contain references to memory that won't be mapped |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4319 when Emacs starts. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4320 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4321 void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4322 mmap_set_vars (restore_p) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4323 int restore_p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4324 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4325 struct mmap_region *r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4326 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4327 if (restore_p) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4328 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4329 mmap_regions = mmap_regions_1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4330 mmap_fd = mmap_fd_1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4331 for (r = mmap_regions; r; r = r->next) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4332 *r->var = MMAP_USER_AREA (r); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4333 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4334 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4335 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4336 for (r = mmap_regions; r; r = r->next) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4337 *r->var = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4338 mmap_regions_1 = mmap_regions; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4339 mmap_regions = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4340 mmap_fd_1 = mmap_fd; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4341 mmap_fd = -1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4342 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4343 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4344 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4345 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4346 /* Allocate a block of storage large enough to hold NBYTES bytes of |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4347 data. A pointer to the data is returned in *VAR. VAR is thus the |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4348 address of some variable which will use the data area. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4349 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4350 The allocation of 0 bytes is valid. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4351 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4352 If we can't allocate the necessary memory, set *VAR to null, and |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4353 return null. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4354 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4355 static POINTER_TYPE * |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4356 mmap_alloc (var, nbytes) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4357 POINTER_TYPE **var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4358 size_t nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4359 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4360 void *p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4361 size_t map; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4362 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4363 mmap_init (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4364 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4365 map = ROUND (nbytes + MMAP_REGION_STRUCT_SIZE, mmap_page_size); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4366 p = mmap (NULL, map, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4367 mmap_fd, 0); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4368 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4369 if (p == MAP_FAILED) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4370 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4371 if (errno != ENOMEM) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4372 fprintf (stderr, "mmap: %s\n", emacs_strerror (errno)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4373 p = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4374 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4375 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4376 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4377 struct mmap_region *r = (struct mmap_region *) p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4378 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4379 r->nbytes_specified = nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4380 r->nbytes_mapped = map; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4381 r->var = var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4382 r->prev = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4383 r->next = mmap_regions; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4384 if (r->next) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4385 r->next->prev = r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4386 mmap_regions = r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4387 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4388 p = MMAP_USER_AREA (p); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4389 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4390 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4391 return *var = p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4392 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4393 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4394 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4395 /* Given a pointer at address VAR to data allocated with mmap_alloc, |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4396 resize it to size NBYTES. Change *VAR to reflect the new block, |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4397 and return this value. If more memory cannot be allocated, then |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4398 leave *VAR unchanged, and return null. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4399 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4400 static POINTER_TYPE * |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4401 mmap_realloc (var, nbytes) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4402 POINTER_TYPE **var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4403 size_t nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4404 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4405 POINTER_TYPE *result; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4406 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4407 mmap_init (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4408 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4409 if (*var == NULL) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4410 result = mmap_alloc (var, nbytes); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4411 else if (nbytes == 0) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4412 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4413 mmap_free (var); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4414 result = mmap_alloc (var, nbytes); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4415 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4416 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4417 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4418 struct mmap_region *r = MMAP_REGION (*var); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4419 size_t room = r->nbytes_mapped - MMAP_REGION_STRUCT_SIZE; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4420 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4421 if (room < nbytes) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4422 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4423 /* Must enlarge. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4424 POINTER_TYPE *old_ptr = *var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4425 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4426 /* Try to map additional pages at the end of the region. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4427 If that fails, allocate a new region, copy data |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4428 from the old region, then free it. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4429 if (mmap_enlarge (r, (ROUND (nbytes - room, mmap_page_size) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4430 / mmap_page_size))) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4431 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4432 r->nbytes_specified = nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4433 *var = result = old_ptr; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4434 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4435 else if (mmap_alloc (var, nbytes)) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4436 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4437 bcopy (old_ptr, *var, r->nbytes_specified); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4438 mmap_free_1 (MMAP_REGION (old_ptr)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4439 result = *var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4440 r = MMAP_REGION (result); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4441 r->nbytes_specified = nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4442 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4443 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4444 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4445 *var = old_ptr; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4446 result = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4447 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4448 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4449 else if (room - nbytes >= mmap_page_size) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4450 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4451 /* Shrinking by at least a page. Let's give some |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4452 memory back to the system. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4453 mmap_enlarge (r, - (room - nbytes) / mmap_page_size); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4454 result = *var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4455 r->nbytes_specified = nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4456 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4457 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4458 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4459 /* Leave it alone. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4460 result = *var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4461 r->nbytes_specified = nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4462 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4463 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4464 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4465 return result; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4466 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4467 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4468 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4469 /* Free a block of relocatable storage whose data is pointed to by |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4470 PTR. Store 0 in *PTR to show there's no block allocated. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4471 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4472 static void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4473 mmap_free (var) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4474 POINTER_TYPE **var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4475 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4476 mmap_init (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4477 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4478 if (*var) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4479 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4480 mmap_free_1 (MMAP_REGION (*var)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4481 *var = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4482 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4483 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4484 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4485 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4486 /* Perform necessary intializations for the use of mmap. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4487 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4488 static void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4489 mmap_init () |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4490 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4491 #if MAP_ANON == 0 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4492 /* The value of mmap_fd is initially 0 in temacs, and -1 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4493 in a dumped Emacs. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4494 if (mmap_fd <= 0) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4495 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4496 /* No anonymous mmap -- we need the file descriptor. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4497 mmap_fd = open ("/dev/zero", O_RDONLY); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4498 if (mmap_fd == -1) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4499 fatal ("Cannot open /dev/zero: %s", emacs_strerror (errno)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4500 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4501 #endif /* MAP_ANON == 0 */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4502 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4503 if (mmap_initialized_p) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4504 return; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4505 mmap_initialized_p = 1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4506 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4507 #if MAP_ANON != 0 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4508 mmap_fd = -1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4509 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4510 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4511 mmap_page_size = getpagesize (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4512 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4513 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4514 #endif /* USE_MMAP_FOR_BUFFERS */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4515 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4516 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4517 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4518 /*********************************************************************** |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4519 Buffer-text Allocation |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4520 ***********************************************************************/ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4521 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4522 #ifdef REL_ALLOC |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4523 extern POINTER_TYPE *r_alloc P_ ((POINTER_TYPE **, size_t)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4524 extern POINTER_TYPE *r_re_alloc P_ ((POINTER_TYPE **, size_t)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4525 extern void r_alloc_free P_ ((POINTER_TYPE **ptr)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4526 #endif /* REL_ALLOC */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4527 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4528 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4529 /* Allocate NBYTES bytes for buffer B's text buffer. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4530 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4531 static void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4532 alloc_buffer_text (b, nbytes) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4533 struct buffer *b; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4534 size_t nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4535 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4536 POINTER_TYPE *p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4537 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4538 BLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4539 #if defined USE_MMAP_FOR_BUFFERS |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4540 p = mmap_alloc ((POINTER_TYPE **) &b->text->beg, nbytes); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4541 #elif defined REL_ALLOC |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4542 p = r_alloc ((POINTER_TYPE **) &b->text->beg, nbytes); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4543 #else |
31612
2050f93e8cef
(alloc_buffer_text): Fix xmalloc call.
Dave Love <fx@gnu.org>
parents:
31604
diff
changeset
|
4544 p = xmalloc (nbytes); |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4545 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4546 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4547 if (p == NULL) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4548 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4549 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4550 memory_full (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4551 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4552 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4553 b->text->beg = (unsigned char *) p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4554 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4555 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4556 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4557 /* Enlarge buffer B's text buffer by DELTA bytes. DELTA < 0 means |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4558 shrink it. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4559 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4560 void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4561 enlarge_buffer_text (b, delta) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4562 struct buffer *b; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4563 int delta; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4564 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4565 POINTER_TYPE *p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4566 size_t nbytes = (BUF_Z_BYTE (b) - BUF_BEG_BYTE (b) + BUF_GAP_SIZE (b) + 1 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4567 + delta); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4568 BLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4569 #if defined USE_MMAP_FOR_BUFFERS |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4570 p = mmap_realloc ((POINTER_TYPE **) &b->text->beg, nbytes); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4571 #elif defined REL_ALLOC |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4572 p = r_re_alloc ((POINTER_TYPE **) &b->text->beg, nbytes); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4573 #else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4574 p = xrealloc (b->text->beg, nbytes); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4575 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4576 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4577 if (p == NULL) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4578 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4579 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4580 memory_full (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4581 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4582 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4583 BUF_BEG_ADDR (b) = (unsigned char *) p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4584 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4585 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4586 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4587 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4588 /* Free buffer B's text buffer. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4589 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4590 static void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4591 free_buffer_text (b) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4592 struct buffer *b; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4593 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4594 BLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4595 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4596 #if defined USE_MMAP_FOR_BUFFERS |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4597 mmap_free ((POINTER_TYPE **) &b->text->beg); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4598 #elif defined REL_ALLOC |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4599 r_alloc_free ((POINTER_TYPE **) &b->text->beg); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4600 #else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4601 xfree (b->text->beg); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4602 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4603 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4604 BUF_BEG_ADDR (b) = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4605 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4606 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4607 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4608 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4609 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4610 /*********************************************************************** |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4611 Initialization |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4612 ***********************************************************************/ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4613 |
21514 | 4614 void |
333 | 4615 init_buffer_once () |
4616 { | |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4617 int idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4618 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4619 bzero (buffer_permanent_local_flags, sizeof buffer_permanent_local_flags); |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
4620 |
333 | 4621 /* Make sure all markable slots in buffer_defaults |
4622 are initialized reasonably, so mark_buffer won't choke. */ | |
4623 reset_buffer (&buffer_defaults); | |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
4624 reset_buffer_local_variables (&buffer_defaults, 1); |
333 | 4625 reset_buffer (&buffer_local_symbols); |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
4626 reset_buffer_local_variables (&buffer_local_symbols, 1); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
4627 /* Prevent GC from getting confused. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
4628 buffer_defaults.text = &buffer_defaults.own_text; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
4629 buffer_local_symbols.text = &buffer_local_symbols.own_text; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
4630 BUF_INTERVALS (&buffer_defaults) = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
4631 BUF_INTERVALS (&buffer_local_symbols) = 0; |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
4632 XSETBUFFER (Vbuffer_defaults, &buffer_defaults); |
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
4633 XSETBUFFER (Vbuffer_local_symbols, &buffer_local_symbols); |
333 | 4634 |
4635 /* Set up the default values of various buffer slots. */ | |
4636 /* Must do these before making the first buffer! */ | |
4637 | |
28636
19c81f320db5
(Fmake_indirect_buffer): Escape newline in doc.
Dave Love <fx@gnu.org>
parents:
28625
diff
changeset
|
4638 /* real setup is done in bindings.el */ |
333 | 4639 buffer_defaults.mode_line_format = build_string ("%-"); |
25546 | 4640 buffer_defaults.header_line_format = Qnil; |
333 | 4641 buffer_defaults.abbrev_mode = Qnil; |
4642 buffer_defaults.overwrite_mode = Qnil; | |
4643 buffer_defaults.case_fold_search = Qt; | |
4644 buffer_defaults.auto_fill_function = Qnil; | |
4645 buffer_defaults.selective_display = Qnil; | |
4646 #ifndef old | |
4647 buffer_defaults.selective_display_ellipses = Qt; | |
4648 #endif | |
4649 buffer_defaults.abbrev_table = Qnil; | |
4650 buffer_defaults.display_table = Qnil; | |
4651 buffer_defaults.undo_list = Qnil; | |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
4652 buffer_defaults.mark_active = Qnil; |
11052
35664a2851e7
(reset_buffer): Reset file_format element too.(init_buffer_once): Define file_format flag; reset file_format.
Boris Goldowsky <boris@gnu.org>
parents:
11000
diff
changeset
|
4653 buffer_defaults.file_format = Qnil; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4654 buffer_defaults.overlays_before = Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4655 buffer_defaults.overlays_after = Qnil; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
4656 XSETFASTINT (buffer_defaults.overlay_center, BEG); |
9296
a1a7fc21ded9
(reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9262
diff
changeset
|
4657 |
a1a7fc21ded9
(reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9262
diff
changeset
|
4658 XSETFASTINT (buffer_defaults.tab_width, 8); |
333 | 4659 buffer_defaults.truncate_lines = Qnil; |
4660 buffer_defaults.ctl_arrow = Qt; | |
17022 | 4661 buffer_defaults.direction_reversed = Qnil; |
28322
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
4662 buffer_defaults.cursor_type = Qt; |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
4663 buffer_defaults.extra_line_spacing = Qnil; |
333 | 4664 |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
4665 #ifdef DOS_NT |
7270
0f79f4bd3c62
(init_buffer_once): Initialize buffer_file_type field right.
Richard M. Stallman <rms@gnu.org>
parents:
7062
diff
changeset
|
4666 buffer_defaults.buffer_file_type = Qnil; /* TEXT */ |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
4667 #endif |
17124
fdad8ea24563
(init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents:
17022
diff
changeset
|
4668 buffer_defaults.enable_multibyte_characters = Qt; |
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
4669 buffer_defaults.buffer_file_coding_system = Qnil; |
9296
a1a7fc21ded9
(reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9262
diff
changeset
|
4670 XSETFASTINT (buffer_defaults.fill_column, 70); |
a1a7fc21ded9
(reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9262
diff
changeset
|
4671 XSETFASTINT (buffer_defaults.left_margin, 0); |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
4672 buffer_defaults.cache_long_line_scans = Qnil; |
10751
dea8f022819d
(syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents:
10668
diff
changeset
|
4673 buffer_defaults.file_truename = Qnil; |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
4674 XSETFASTINT (buffer_defaults.display_count, 0); |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4675 buffer_defaults.indicate_empty_lines = Qnil; |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4676 buffer_defaults.scroll_up_aggressively = Qnil; |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4677 buffer_defaults.scroll_down_aggressively = Qnil; |
22150
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
4678 buffer_defaults.display_time = Qnil; |
333 | 4679 |
4680 /* Assign the local-flags to the slots that have default values. | |
4681 The local flag is a bit that is used in the buffer | |
4682 to say that it has its own local value for the slot. | |
4683 The local flag bits are in the local_var_flags slot of the buffer. */ | |
4684 | |
4685 /* Nothing can work if this isn't true */ | |
8818
0996472bb39d
(reset_buffer_local_variables, Fbuffer_local_variables)
Richard M. Stallman <rms@gnu.org>
parents:
8599
diff
changeset
|
4686 if (sizeof (EMACS_INT) != sizeof (Lisp_Object)) abort (); |
333 | 4687 |
4688 /* 0 means not a lisp var, -1 means always local, else mask */ | |
4689 bzero (&buffer_local_flags, sizeof buffer_local_flags); | |
9362
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
4690 XSETINT (buffer_local_flags.filename, -1); |
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
4691 XSETINT (buffer_local_flags.directory, -1); |
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
4692 XSETINT (buffer_local_flags.backed_up, -1); |
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
4693 XSETINT (buffer_local_flags.save_length, -1); |
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
4694 XSETINT (buffer_local_flags.auto_save_file_name, -1); |
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
4695 XSETINT (buffer_local_flags.read_only, -1); |
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
4696 XSETINT (buffer_local_flags.major_mode, -1); |
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
4697 XSETINT (buffer_local_flags.mode_name, -1); |
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
4698 XSETINT (buffer_local_flags.undo_list, -1); |
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
4699 XSETINT (buffer_local_flags.mark_active, -1); |
10561
53f34c870201
(init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
10505
diff
changeset
|
4700 XSETINT (buffer_local_flags.point_before_scroll, -1); |
10751
dea8f022819d
(syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents:
10668
diff
changeset
|
4701 XSETINT (buffer_local_flags.file_truename, -1); |
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
4702 XSETINT (buffer_local_flags.invisibility_spec, -1); |
13262
fe65b6bde340
(reset_buffer): Initialize redisplay_end_trigger slot.
Richard M. Stallman <rms@gnu.org>
parents:
13240
diff
changeset
|
4703 XSETINT (buffer_local_flags.file_format, -1); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
4704 XSETINT (buffer_local_flags.display_count, -1); |
22150
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
4705 XSETINT (buffer_local_flags.display_time, -1); |
20995
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
4706 XSETINT (buffer_local_flags.enable_multibyte_characters, -1); |
9296
a1a7fc21ded9
(reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9262
diff
changeset
|
4707 |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4708 idx = 1; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4709 XSETFASTINT (buffer_local_flags.mode_line_format, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4710 XSETFASTINT (buffer_local_flags.abbrev_mode, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4711 XSETFASTINT (buffer_local_flags.overwrite_mode, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4712 XSETFASTINT (buffer_local_flags.case_fold_search, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4713 XSETFASTINT (buffer_local_flags.auto_fill_function, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4714 XSETFASTINT (buffer_local_flags.selective_display, idx); ++idx; |
333 | 4715 #ifndef old |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4716 XSETFASTINT (buffer_local_flags.selective_display_ellipses, idx); ++idx; |
333 | 4717 #endif |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4718 XSETFASTINT (buffer_local_flags.tab_width, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4719 XSETFASTINT (buffer_local_flags.truncate_lines, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4720 XSETFASTINT (buffer_local_flags.ctl_arrow, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4721 XSETFASTINT (buffer_local_flags.fill_column, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4722 XSETFASTINT (buffer_local_flags.left_margin, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4723 XSETFASTINT (buffer_local_flags.abbrev_table, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4724 XSETFASTINT (buffer_local_flags.display_table, idx); ++idx; |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
4725 #ifdef DOS_NT |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4726 XSETFASTINT (buffer_local_flags.buffer_file_type, idx); |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
4727 /* Make this one a permanent local. */ |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4728 buffer_permanent_local_flags[idx++] = 1; |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
4729 #endif |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4730 XSETFASTINT (buffer_local_flags.syntax_table, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4731 XSETFASTINT (buffer_local_flags.cache_long_line_scans, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4732 XSETFASTINT (buffer_local_flags.category_table, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4733 XSETFASTINT (buffer_local_flags.direction_reversed, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4734 XSETFASTINT (buffer_local_flags.buffer_file_coding_system, idx); |
17124
fdad8ea24563
(init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents:
17022
diff
changeset
|
4735 /* Make this one a permanent local. */ |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4736 buffer_permanent_local_flags[idx++] = 1; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4737 XSETFASTINT (buffer_local_flags.left_margin_width, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4738 XSETFASTINT (buffer_local_flags.right_margin_width, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4739 XSETFASTINT (buffer_local_flags.indicate_empty_lines, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4740 XSETFASTINT (buffer_local_flags.scroll_up_aggressively, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4741 XSETFASTINT (buffer_local_flags.scroll_down_aggressively, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4742 XSETFASTINT (buffer_local_flags.header_line_format, idx); ++idx; |
28332
8abeccb78576
(syms_of_buffer): Add default-cursor-type.
Gerd Moellmann <gerd@gnu.org>
parents:
28322
diff
changeset
|
4743 XSETFASTINT (buffer_local_flags.cursor_type, idx); ++idx; |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
4744 XSETFASTINT (buffer_local_flags.extra_line_spacing, idx); ++idx; |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4745 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4746 /* Need more room? */ |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
4747 if (idx >= MAX_PER_BUFFER_VARS) |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4748 abort (); |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
4749 last_per_buffer_idx = idx; |
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
4750 |
333 | 4751 Vbuffer_alist = Qnil; |
4752 current_buffer = 0; | |
4753 all_buffers = 0; | |
4754 | |
4755 QSFundamental = build_string ("Fundamental"); | |
4756 | |
4757 Qfundamental_mode = intern ("fundamental-mode"); | |
4758 buffer_defaults.major_mode = Qfundamental_mode; | |
4759 | |
4760 Qmode_class = intern ("mode-class"); | |
4761 | |
4762 Qprotected_field = intern ("protected-field"); | |
4763 | |
4764 Qpermanent_local = intern ("permanent-local"); | |
4765 | |
4766 Qkill_buffer_hook = intern ("kill-buffer-hook"); | |
4767 | |
4768 Vprin1_to_string_buffer = Fget_buffer_create (build_string (" prin1")); | |
14396 | 4769 |
333 | 4770 /* super-magic invisible buffer */ |
4771 Vbuffer_alist = Qnil; | |
4772 | |
648 | 4773 Fset_buffer (Fget_buffer_create (build_string ("*scratch*"))); |
23399
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
4774 |
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
4775 inhibit_modification_hooks = 0; |
333 | 4776 } |
4777 | |
21514 | 4778 void |
333 | 4779 init_buffer () |
4780 { | |
31412
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4781 char buf[MAXPATHLEN + 1]; |
1563
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
4782 char *pwd; |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
4783 struct stat dotstat, pwdstat; |
3463
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
4784 Lisp_Object temp; |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
4785 int rc; |
333 | 4786 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4787 #ifdef USE_MMAP_FOR_BUFFERS |
31412
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4788 { |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4789 /* When using the ralloc implementation based on mmap(2), buffer |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4790 text pointers will have been set to null in the dumped Emacs. |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4791 Map new memory. */ |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4792 struct buffer *b; |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4793 |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4794 for (b = all_buffers; b; b = b->next) |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4795 if (b->text->beg == NULL) |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4796 enlarge_buffer_text (b, 0); |
31412
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4797 } |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4798 #endif /* USE_MMAP_FOR_BUFFERS */ |
31412
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4799 |
333 | 4800 Fset_buffer (Fget_buffer_create (build_string ("*scratch*"))); |
21141
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
4801 if (NILP (buffer_defaults.enable_multibyte_characters)) |
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
4802 Fset_buffer_multibyte (Qnil); |
1563
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
4803 |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
4804 /* If PWD is accurate, use it instead of calling getwd. This is faster |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
4805 when PWD is right, and may avoid a fatal error. */ |
22171
e23d16d11ba9
(init_buffer): Support DOS_NT absolute file names.
Richard M. Stallman <rms@gnu.org>
parents:
22150
diff
changeset
|
4806 if ((pwd = getenv ("PWD")) != 0 |
e23d16d11ba9
(init_buffer): Support DOS_NT absolute file names.
Richard M. Stallman <rms@gnu.org>
parents:
22150
diff
changeset
|
4807 && (IS_DIRECTORY_SEP (*pwd) || (*pwd && IS_DEVICE_SEP (pwd[1]))) |
1563
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
4808 && stat (pwd, &pwdstat) == 0 |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
4809 && stat (".", &dotstat) == 0 |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
4810 && dotstat.st_ino == pwdstat.st_ino |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
4811 && dotstat.st_dev == pwdstat.st_dev |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
4812 && strlen (pwd) < MAXPATHLEN) |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
4813 strcpy (buf, pwd); |
19242
a7d44588be35
(init_buffer): Use getcwd instead of getwd, if available.
Richard M. Stallman <rms@gnu.org>
parents:
18921
diff
changeset
|
4814 #ifdef HAVE_GETCWD |
a7d44588be35
(init_buffer): Use getcwd instead of getwd, if available.
Richard M. Stallman <rms@gnu.org>
parents:
18921
diff
changeset
|
4815 else if (getcwd (buf, MAXPATHLEN+1) == 0) |
19581 | 4816 fatal ("`getcwd' failed: %s\n", strerror (errno)); |
19242
a7d44588be35
(init_buffer): Use getcwd instead of getwd, if available.
Richard M. Stallman <rms@gnu.org>
parents:
18921
diff
changeset
|
4817 #else |
1563
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
4818 else if (getwd (buf) == 0) |
9810
c76b3e670eb3
(init_buffer): Fix error message syntax.
Richard M. Stallman <rms@gnu.org>
parents:
9785
diff
changeset
|
4819 fatal ("`getwd' failed: %s\n", buf); |
19242
a7d44588be35
(init_buffer): Use getcwd instead of getwd, if available.
Richard M. Stallman <rms@gnu.org>
parents:
18921
diff
changeset
|
4820 #endif |
333 | 4821 |
4822 #ifndef VMS | |
4823 /* Maybe this should really use some standard subroutine | |
4824 whose definition is filename syntax dependent. */ | |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
4825 rc = strlen (buf); |
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
4826 if (!(IS_DIRECTORY_SEP (buf[rc - 1]))) |
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
4827 { |
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
4828 buf[rc] = DIRECTORY_SEP; |
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
4829 buf[rc + 1] = '\0'; |
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
4830 } |
333 | 4831 #endif /* not VMS */ |
16384
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
4832 |
333 | 4833 current_buffer->directory = build_string (buf); |
3463
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
4834 |
16384
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
4835 /* Add /: to the front of the name |
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
4836 if it would otherwise be treated as magic. */ |
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
4837 temp = Ffind_file_name_handler (current_buffer->directory, Qt); |
20080
52fbf5fad62e
(init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents:
19977
diff
changeset
|
4838 if (! NILP (temp) |
52fbf5fad62e
(init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents:
19977
diff
changeset
|
4839 /* If the default dir is just /, TEMP is non-nil |
52fbf5fad62e
(init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents:
19977
diff
changeset
|
4840 because of the ange-ftp completion handler. |
52fbf5fad62e
(init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents:
19977
diff
changeset
|
4841 However, it is not necessary to turn / into /:/. |
52fbf5fad62e
(init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents:
19977
diff
changeset
|
4842 So avoid doing that. */ |
52fbf5fad62e
(init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents:
19977
diff
changeset
|
4843 && strcmp ("/", XSTRING (current_buffer->directory)->data)) |
16384
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
4844 current_buffer->directory |
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
4845 = concat2 (build_string ("/:"), current_buffer->directory); |
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
4846 |
3463
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
4847 temp = get_minibuffer (0); |
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
4848 XBUFFER (temp)->directory = current_buffer->directory; |
333 | 4849 } |
4850 | |
4851 /* initialize the buffer routines */ | |
21514 | 4852 void |
333 | 4853 syms_of_buffer () |
4854 { | |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4855 staticpro (&last_overlay_modification_hooks); |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4856 last_overlay_modification_hooks |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4857 = Fmake_vector (make_number (10), Qnil); |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4858 |
333 | 4859 staticpro (&Vbuffer_defaults); |
4860 staticpro (&Vbuffer_local_symbols); | |
4861 staticpro (&Qfundamental_mode); | |
4862 staticpro (&Qmode_class); | |
4863 staticpro (&QSFundamental); | |
4864 staticpro (&Vbuffer_alist); | |
4865 staticpro (&Qprotected_field); | |
4866 staticpro (&Qpermanent_local); | |
4867 staticpro (&Qkill_buffer_hook); | |
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
4868 Qoverlayp = intern ("overlayp"); |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
4869 staticpro (&Qoverlayp); |
8839 | 4870 Qevaporate = intern ("evaporate"); |
4871 staticpro (&Qevaporate); | |
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
4872 Qmodification_hooks = intern ("modification-hooks"); |
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
4873 staticpro (&Qmodification_hooks); |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
4874 Qinsert_in_front_hooks = intern ("insert-in-front-hooks"); |
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
4875 staticpro (&Qinsert_in_front_hooks); |
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
4876 Qinsert_behind_hooks = intern ("insert-behind-hooks"); |
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
4877 staticpro (&Qinsert_behind_hooks); |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
4878 Qget_file_buffer = intern ("get-file-buffer"); |
5433 | 4879 staticpro (&Qget_file_buffer); |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
4880 Qpriority = intern ("priority"); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
4881 staticpro (&Qpriority); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
4882 Qwindow = intern ("window"); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
4883 staticpro (&Qwindow); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
4884 Qbefore_string = intern ("before-string"); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
4885 staticpro (&Qbefore_string); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
4886 Qafter_string = intern ("after-string"); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
4887 staticpro (&Qafter_string); |
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
4888 Qfirst_change_hook = intern ("first-change-hook"); |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
4889 staticpro (&Qfirst_change_hook); |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
4890 Qbefore_change_functions = intern ("before-change-functions"); |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
4891 staticpro (&Qbefore_change_functions); |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
4892 Qafter_change_functions = intern ("after-change-functions"); |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
4893 staticpro (&Qafter_change_functions); |
333 | 4894 |
4895 Fput (Qprotected_field, Qerror_conditions, | |
4896 Fcons (Qprotected_field, Fcons (Qerror, Qnil))); | |
4897 Fput (Qprotected_field, Qerror_message, | |
4898 build_string ("Attempt to modify a protected field")); | |
4899 | |
4900 /* All these use DEFVAR_LISP_NOPRO because the slots in | |
4901 buffer_defaults will all be marked via Vbuffer_defaults. */ | |
4902 | |
4903 DEFVAR_LISP_NOPRO ("default-mode-line-format", | |
4904 &buffer_defaults.mode_line_format, | |
4905 "Default value of `mode-line-format' for buffers that don't override it.\n\ | |
4906 This is the same as (default-value 'mode-line-format)."); | |
4907 | |
25546 | 4908 DEFVAR_LISP_NOPRO ("default-header-line-format", |
4909 &buffer_defaults.header_line_format, | |
4910 "Default value of `header-line-format' for buffers that don't override it.\n\ | |
4911 This is the same as (default-value 'header-line-format)."); | |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4912 |
28332
8abeccb78576
(syms_of_buffer): Add default-cursor-type.
Gerd Moellmann <gerd@gnu.org>
parents:
28322
diff
changeset
|
4913 DEFVAR_LISP_NOPRO ("default-cursor-type", &buffer_defaults.cursor_type, |
8abeccb78576
(syms_of_buffer): Add default-cursor-type.
Gerd Moellmann <gerd@gnu.org>
parents:
28322
diff
changeset
|
4914 "Default value of `cursor-type' for buffers that don't override it.\n\ |
8abeccb78576
(syms_of_buffer): Add default-cursor-type.
Gerd Moellmann <gerd@gnu.org>
parents:
28322
diff
changeset
|
4915 This is the same as (default-value 'cursor-type)."); |
8abeccb78576
(syms_of_buffer): Add default-cursor-type.
Gerd Moellmann <gerd@gnu.org>
parents:
28322
diff
changeset
|
4916 |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
4917 DEFVAR_LISP_NOPRO ("default-line-spacing", |
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
4918 &buffer_defaults.extra_line_spacing, |
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
4919 "Default value of `line-spacing' for buffers that don't override it.\n\ |
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
4920 This is the same as (default-value 'line-spacing)."); |
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
4921 |
333 | 4922 DEFVAR_LISP_NOPRO ("default-abbrev-mode", |
4923 &buffer_defaults.abbrev_mode, | |
4924 "Default value of `abbrev-mode' for buffers that do not override it.\n\ | |
4925 This is the same as (default-value 'abbrev-mode)."); | |
4926 | |
4927 DEFVAR_LISP_NOPRO ("default-ctl-arrow", | |
4928 &buffer_defaults.ctl_arrow, | |
4929 "Default value of `ctl-arrow' for buffers that do not override it.\n\ | |
4930 This is the same as (default-value 'ctl-arrow)."); | |
4931 | |
17022 | 4932 DEFVAR_LISP_NOPRO ("default-direction-reversed", |
4933 &buffer_defaults.direction_reversed, | |
4934 "Default value of `direction_reversed' for buffers that do not override it.\n\ | |
4935 This is the same as (default-value 'direction-reversed)."); | |
4936 | |
17124
fdad8ea24563
(init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents:
17022
diff
changeset
|
4937 DEFVAR_LISP_NOPRO ("default-enable-multibyte-characters", |
fdad8ea24563
(init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents:
17022
diff
changeset
|
4938 &buffer_defaults.enable_multibyte_characters, |
24975
e939a57634ba
(syms_of_buffer): Make default-enable-multibyte-characters a user variable.
Dave Love <fx@gnu.org>
parents:
24853
diff
changeset
|
4939 "*Default value of `enable-multibyte-characters' for buffers not overriding it.\n\ |
24404
f401b26570a4
(syms_of_buffer): Doc fix for enable-multibyte-characters.
Richard M. Stallman <rms@gnu.org>
parents:
24240
diff
changeset
|
4940 This is the same as (default-value 'enable-multibyte-characters)."); |
17124
fdad8ea24563
(init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents:
17022
diff
changeset
|
4941 |
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
4942 DEFVAR_LISP_NOPRO ("default-buffer-file-coding-system", |
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
4943 &buffer_defaults.buffer_file_coding_system, |
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
4944 "Default value of `buffer-file-coding-system' for buffers not overriding it.\n\ |
24404
f401b26570a4
(syms_of_buffer): Doc fix for enable-multibyte-characters.
Richard M. Stallman <rms@gnu.org>
parents:
24240
diff
changeset
|
4945 This is the same as (default-value 'buffer-file-coding-system)."); |
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
4946 |
333 | 4947 DEFVAR_LISP_NOPRO ("default-truncate-lines", |
4948 &buffer_defaults.truncate_lines, | |
4949 "Default value of `truncate-lines' for buffers that do not override it.\n\ | |
4950 This is the same as (default-value 'truncate-lines)."); | |
4951 | |
4952 DEFVAR_LISP_NOPRO ("default-fill-column", | |
4953 &buffer_defaults.fill_column, | |
4954 "Default value of `fill-column' for buffers that do not override it.\n\ | |
4955 This is the same as (default-value 'fill-column)."); | |
4956 | |
4957 DEFVAR_LISP_NOPRO ("default-left-margin", | |
4958 &buffer_defaults.left_margin, | |
4959 "Default value of `left-margin' for buffers that do not override it.\n\ | |
4960 This is the same as (default-value 'left-margin)."); | |
4961 | |
4962 DEFVAR_LISP_NOPRO ("default-tab-width", | |
4963 &buffer_defaults.tab_width, | |
4964 "Default value of `tab-width' for buffers that do not override it.\n\ | |
4965 This is the same as (default-value 'tab-width)."); | |
4966 | |
4967 DEFVAR_LISP_NOPRO ("default-case-fold-search", | |
4968 &buffer_defaults.case_fold_search, | |
4969 "Default value of `case-fold-search' for buffers that don't override it.\n\ | |
4970 This is the same as (default-value 'case-fold-search)."); | |
4971 | |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
4972 #ifdef DOS_NT |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
4973 DEFVAR_LISP_NOPRO ("default-buffer-file-type", |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
4974 &buffer_defaults.buffer_file_type, |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
4975 "Default file type for buffers that do not override it.\n\ |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
4976 This is the same as (default-value 'buffer-file-type).\n\ |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
4977 The file type is nil for text, t for binary."); |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
4978 #endif |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
4979 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4980 DEFVAR_LISP_NOPRO ("default-left-margin-width", |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4981 &buffer_defaults.left_margin_width, |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4982 "Default value of `left-margin-width' for buffers that don't override it.\n\ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4983 This is the same as (default-value 'left-margin-width)."); |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4984 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4985 DEFVAR_LISP_NOPRO ("default-right-margin-width", |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4986 &buffer_defaults.right_margin_width, |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4987 "Default value of `right_margin_width' for buffers that don't override it.\n\ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4988 This is the same as (default-value 'right-margin-width)."); |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4989 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4990 DEFVAR_LISP_NOPRO ("default-indicate-empty-lines", |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4991 &buffer_defaults.indicate_empty_lines, |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4992 "Default value of `indicate-empty-lines' for buffers that don't override it.\n\ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4993 This is the same as (default-value 'indicate-empty-lines)."); |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4994 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4995 DEFVAR_LISP_NOPRO ("default-scroll-up-aggressively", |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4996 &buffer_defaults.scroll_up_aggressively, |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4997 "Default value of `scroll-up-aggressively' for buffers that\n\ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4998 don't override it. This is the same as (default-value\n\ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4999 'scroll-up-aggressively)."); |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5000 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5001 DEFVAR_LISP_NOPRO ("default-scroll-down-aggressively", |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5002 &buffer_defaults.scroll_down_aggressively, |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5003 "Default value of `scroll-down-aggressively' for buffers that\n\ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5004 don't override it. This is the same as (default-value\n\ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5005 'scroll-down-aggressively)."); |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5006 |
25546 | 5007 DEFVAR_PER_BUFFER ("header-line-format", |
5008 ¤t_buffer->header_line_format, | |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5009 Qnil, |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5010 "Analogous to `mode-line-format', but for a mode line displayed\n\ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5011 at the top of windows."); |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5012 |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5013 DEFVAR_PER_BUFFER ("mode-line-format", ¤t_buffer->mode_line_format, |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5014 Qnil, 0); |
333 | 5015 |
5016 /* This doc string is too long for cpp; cpp dies if it isn't in a comment. | |
5017 But make-docfile finds it! | |
5018 DEFVAR_PER_BUFFER ("mode-line-format", ¤t_buffer->mode_line_format, | |
1985
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
5019 Qnil, |
333 | 5020 "Template for displaying mode line for current buffer.\n\ |
5021 Each buffer has its own value of this variable.\n\ | |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5022 Value may be nil, a string, a symbol or a list or cons cell.\n\ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5023 A value of nil means don't display a mode line.\n\ |
333 | 5024 For a symbol, its value is used (but it is ignored if t or nil).\n\ |
5025 A string appearing directly as the value of a symbol is processed verbatim\n\ | |
5026 in that the %-constructs below are not recognized.\n\ | |
26357
8455090c3fb2
* buffer.c (syms_of_buffer): Extend documentation of
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
5027 For a list of the form `(:eval FORM)', FORM is evaluated and the result\n\ |
8455090c3fb2
* buffer.c (syms_of_buffer): Extend documentation of
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
5028 is used as a mode line element.\n\ |
333 | 5029 For a list whose car is a symbol, the symbol's value is taken,\n\ |
5030 and if that is non-nil, the cadr of the list is processed recursively.\n\ | |
5031 Otherwise, the caddr of the list (if there is one) is processed.\n\ | |
5032 For a list whose car is a string or list, each element is processed\n\ | |
5033 recursively and the results are effectively concatenated.\n\ | |
5034 For a list whose car is an integer, the cdr of the list is processed\n\ | |
5035 and padded (if the number is positive) or truncated (if negative)\n\ | |
5036 to the width specified by that number.\n\ | |
5037 A string is printed verbatim in the mode line except for %-constructs:\n\ | |
5038 (%-constructs are allowed when the string is the entire mode-line-format\n\ | |
5039 or when it is found in a cons-cell or a list)\n\ | |
5040 %b -- print buffer name. %f -- print visited file name.\n\ | |
19977 | 5041 %F -- print frame name.\n\ |
8125
3941618b4c2b
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8123
diff
changeset
|
5042 %* -- print %, * or hyphen. %+ -- print *, % or hyphen.\n\ |
26555
5dec6111686f
(syms_of_buffer): Add %z, %Z, %m and %& to the doc
Eli Zaretskii <eliz@gnu.org>
parents:
26441
diff
changeset
|
5043 %& is like %*, but ignore read-only-ness.\n\ |
8125
3941618b4c2b
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8123
diff
changeset
|
5044 % means buffer is read-only and * means it is modified.\n\ |
3941618b4c2b
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8123
diff
changeset
|
5045 For a modified read-only buffer, %* gives % and %+ gives *.\n\ |
2578
f694fc6cdd33
(Qmode-line-format): Describe %l in the doc string.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2508
diff
changeset
|
5046 %s -- print process status. %l -- print the current line number.\n\ |
15032
0d32c8a2ae39
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14506
diff
changeset
|
5047 %c -- print the current column number (this makes editing slower).\n\ |
18921
099aeb6bf4ea
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18751
diff
changeset
|
5048 To make the column number update correctly in all cases,\n\ |
099aeb6bf4ea
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18751
diff
changeset
|
5049 `column-number-mode' must be non-nil.\n\ |
5904
7f95b8e1ec44
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5873
diff
changeset
|
5050 %p -- print percent of buffer above top of window, or Top, Bot or All.\n\ |
7295
3f9ea1ad1c65
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7270
diff
changeset
|
5051 %P -- print percent of buffer above bottom of window, perhaps plus Top,\n\ |
5904
7f95b8e1ec44
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5873
diff
changeset
|
5052 or print Bottom or All.\n\ |
26555
5dec6111686f
(syms_of_buffer): Add %z, %Z, %m and %& to the doc
Eli Zaretskii <eliz@gnu.org>
parents:
26441
diff
changeset
|
5053 %m -- print the mode name.\n\ |
333 | 5054 %n -- print Narrow if appropriate.\n\ |
26555
5dec6111686f
(syms_of_buffer): Add %z, %Z, %m and %& to the doc
Eli Zaretskii <eliz@gnu.org>
parents:
26441
diff
changeset
|
5055 %z -- print mnemonics of buffer, terminal, and keyboard coding systems.\n\ |
5dec6111686f
(syms_of_buffer): Add %z, %Z, %m and %& to the doc
Eli Zaretskii <eliz@gnu.org>
parents:
26441
diff
changeset
|
5056 %Z -- like %z, but including the end-of-line format.\n\ |
333 | 5057 %[ -- print one [ for each recursive editing level. %] similar.\n\ |
5058 %% -- print %. %- -- print infinitely many dashes.\n\ | |
5059 Decimal digits after the % specify field width to which to pad."); | |
5060 */ | |
5061 | |
5062 DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode, | |
5063 "*Major mode for new buffers. Defaults to `fundamental-mode'.\n\ | |
5064 nil here means use current buffer's major mode."); | |
5065 | |
5066 DEFVAR_PER_BUFFER ("major-mode", ¤t_buffer->major_mode, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5067 make_number (Lisp_Symbol), |
333 | 5068 "Symbol for current buffer's major mode."); |
5069 | |
5070 DEFVAR_PER_BUFFER ("mode-name", ¤t_buffer->mode_name, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5071 make_number (Lisp_String), |
333 | 5072 "Pretty name of current buffer's major mode (a string)."); |
5073 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5074 DEFVAR_PER_BUFFER ("abbrev-mode", ¤t_buffer->abbrev_mode, Qnil, |
333 | 5075 "Non-nil turns on automatic expansion of abbrevs as they are inserted.\n\ |
5076 Automatically becomes buffer-local when set in any fashion."); | |
5077 | |
5078 DEFVAR_PER_BUFFER ("case-fold-search", ¤t_buffer->case_fold_search, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5079 Qnil, |
24434 | 5080 "*Non-nil if searches and matches should ignore case.\n\ |
333 | 5081 Automatically becomes buffer-local when set in any fashion."); |
5082 | |
5083 DEFVAR_PER_BUFFER ("fill-column", ¤t_buffer->fill_column, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5084 make_number (Lisp_Int), |
333 | 5085 "*Column beyond which automatic line-wrapping should happen.\n\ |
5086 Automatically becomes buffer-local when set in any fashion."); | |
5087 | |
5088 DEFVAR_PER_BUFFER ("left-margin", ¤t_buffer->left_margin, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5089 make_number (Lisp_Int), |
333 | 5090 "*Column for the default indent-line-function to indent to.\n\ |
5091 Linefeed indents to this column in Fundamental mode.\n\ | |
5092 Automatically becomes buffer-local when set in any fashion."); | |
5093 | |
5094 DEFVAR_PER_BUFFER ("tab-width", ¤t_buffer->tab_width, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5095 make_number (Lisp_Int), |
333 | 5096 "*Distance between tab stops (for display of tab characters), in columns.\n\ |
5097 Automatically becomes buffer-local when set in any fashion."); | |
5098 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5099 DEFVAR_PER_BUFFER ("ctl-arrow", ¤t_buffer->ctl_arrow, Qnil, |
333 | 5100 "*Non-nil means display control chars with uparrow.\n\ |
18009
7c256846be75
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17735
diff
changeset
|
5101 A value of nil means use backslash and octal digits.\n\ |
333 | 5102 Automatically becomes buffer-local when set in any fashion.\n\ |
5103 This variable does not apply to characters whose display is specified\n\ | |
5104 in the current display table (if there is one)."); | |
5105 | |
17022 | 5106 DEFVAR_PER_BUFFER ("enable-multibyte-characters", |
20995
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
5107 ¤t_buffer->enable_multibyte_characters, |
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
5108 make_number (-1), |
24853
0fc260dce9cd
(syms_of_buffer): Don't make
Kenichi Handa <handa@m17n.org>
parents:
24767
diff
changeset
|
5109 "Non-nil means the buffer contents are regarded as multi-byte characters.\n\ |
23174
eb56d7e8faa1
(enable-multibyte-characters): Doc fix.
Dave Love <fx@gnu.org>
parents:
22191
diff
changeset
|
5110 Otherwise they are regarded as unibyte. This affects the display,\n\ |
24404
f401b26570a4
(syms_of_buffer): Doc fix for enable-multibyte-characters.
Richard M. Stallman <rms@gnu.org>
parents:
24240
diff
changeset
|
5111 file I/O and the behavior of various editing commands.\n\ |
f401b26570a4
(syms_of_buffer): Doc fix for enable-multibyte-characters.
Richard M. Stallman <rms@gnu.org>
parents:
24240
diff
changeset
|
5112 \n\ |
f401b26570a4
(syms_of_buffer): Doc fix for enable-multibyte-characters.
Richard M. Stallman <rms@gnu.org>
parents:
24240
diff
changeset
|
5113 This variable is buffer-local but you cannot set it directly;\n\ |
f401b26570a4
(syms_of_buffer): Doc fix for enable-multibyte-characters.
Richard M. Stallman <rms@gnu.org>
parents:
24240
diff
changeset
|
5114 use the function `set-buffer-multibyte' to change a buffer's representation.\n\ |
f401b26570a4
(syms_of_buffer): Doc fix for enable-multibyte-characters.
Richard M. Stallman <rms@gnu.org>
parents:
24240
diff
changeset
|
5115 Changing its default value with `setq-default' is supported.\n\ |
f401b26570a4
(syms_of_buffer): Doc fix for enable-multibyte-characters.
Richard M. Stallman <rms@gnu.org>
parents:
24240
diff
changeset
|
5116 See also variable `default-enable-multibyte-characters' and Info node\n\ |
f401b26570a4
(syms_of_buffer): Doc fix for enable-multibyte-characters.
Richard M. Stallman <rms@gnu.org>
parents:
24240
diff
changeset
|
5117 `(elisp)Text Representations'."); |
17022 | 5118 |
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5119 DEFVAR_PER_BUFFER ("buffer-file-coding-system", |
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5120 ¤t_buffer->buffer_file_coding_system, Qnil, |
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5121 "Coding system to be used for encoding the buffer contents on saving.\n\ |
24767
8f4601c1e4e5
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
24604
diff
changeset
|
5122 This variable applies to saving the buffer, and also to `write-region'\n\ |
8f4601c1e4e5
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
24604
diff
changeset
|
5123 and other functions that use `write-region'.\n\ |
8f4601c1e4e5
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
24604
diff
changeset
|
5124 It does not apply to sending output to subprocesses, however.\n\ |
8f4601c1e4e5
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
24604
diff
changeset
|
5125 \n\ |
8f4601c1e4e5
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
24604
diff
changeset
|
5126 If this is nil, the buffer is saved without any code conversion\n\ |
8f4601c1e4e5
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
24604
diff
changeset
|
5127 unless some coding system is specified in `file-coding-system-alist'\n\ |
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5128 for the buffer file.\n\ |
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5129 \n\ |
24767
8f4601c1e4e5
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
24604
diff
changeset
|
5130 The variable `coding-system-for-write', if non-nil, overrides this variable.\n\ |
8f4601c1e4e5
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
24604
diff
changeset
|
5131 \n\ |
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5132 This variable is never applied to a way of decoding\n\ |
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5133 a file while reading it."); |
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5134 |
17022 | 5135 DEFVAR_PER_BUFFER ("direction-reversed", ¤t_buffer->direction_reversed, |
5136 Qnil, | |
5137 "*Non-nil means lines in the buffer are displayed right to left."); | |
5138 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5139 DEFVAR_PER_BUFFER ("truncate-lines", ¤t_buffer->truncate_lines, Qnil, |
333 | 5140 "*Non-nil means do not display continuation lines;\n\ |
5141 give each line of text one screen line.\n\ | |
5142 Automatically becomes buffer-local when set in any fashion.\n\ | |
5143 \n\ | |
5144 Note that this is overridden by the variable\n\ | |
5145 `truncate-partial-width-windows' if that variable is non-nil\n\ | |
764 | 5146 and this buffer is not full-frame width."); |
333 | 5147 |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
5148 #ifdef DOS_NT |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5149 DEFVAR_PER_BUFFER ("buffer-file-type", ¤t_buffer->buffer_file_type, |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5150 Qnil, |
10253
4aa245b5eb83
(syms_of_buffer): Doc fix for buffer-file-type.
Richard M. Stallman <rms@gnu.org>
parents:
10210
diff
changeset
|
5151 "Non-nil if the visited file is a binary file.\n\ |
4aa245b5eb83
(syms_of_buffer): Doc fix for buffer-file-type.
Richard M. Stallman <rms@gnu.org>
parents:
10210
diff
changeset
|
5152 This variable is meaningful on MS-DOG and Windows NT.\n\ |
4aa245b5eb83
(syms_of_buffer): Doc fix for buffer-file-type.
Richard M. Stallman <rms@gnu.org>
parents:
10210
diff
changeset
|
5153 On those systems, it is automatically local in every buffer.\n\ |
10505
4f7f9b9ff513
(syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents:
10443
diff
changeset
|
5154 On other systems, this variable is normally always nil."); |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5155 #endif |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5156 |
333 | 5157 DEFVAR_PER_BUFFER ("default-directory", ¤t_buffer->directory, |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5158 make_number (Lisp_String), |
333 | 5159 "Name of default directory of current buffer. Should end with slash.\n\ |
5160 Each buffer has its own value of this variable."); | |
5161 | |
5162 DEFVAR_PER_BUFFER ("auto-fill-function", ¤t_buffer->auto_fill_function, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5163 Qnil, |
333 | 5164 "Function called (if non-nil) to perform auto-fill.\n\ |
28878 | 5165 It is called after self-inserting any character specified in\n\ |
28819
f35802bc5eaf
(syms_of_buffer) [auto-fill-function]: Doc fix.
Dave Love <fx@gnu.org>
parents:
28688
diff
changeset
|
5166 the `auto-fill-chars' table.\n\ |
333 | 5167 Each buffer has its own value of this variable.\n\ |
15638 | 5168 NOTE: This variable is not a hook;\n\ |
5169 its value may not be a list of functions."); | |
333 | 5170 |
5171 DEFVAR_PER_BUFFER ("buffer-file-name", ¤t_buffer->filename, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5172 make_number (Lisp_String), |
333 | 5173 "Name of file visited in current buffer, or nil if not visiting a file.\n\ |
5174 Each buffer has its own value of this variable."); | |
5175 | |
10751
dea8f022819d
(syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents:
10668
diff
changeset
|
5176 DEFVAR_PER_BUFFER ("buffer-file-truename", ¤t_buffer->file_truename, |
dea8f022819d
(syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents:
10668
diff
changeset
|
5177 make_number (Lisp_String), |
12354
dfcab1d5249d
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
12214
diff
changeset
|
5178 "Abbreviated truename of file visited in current buffer, or nil if none.\n\ |
11823
51194e0d2967
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11693
diff
changeset
|
5179 The truename of a file is calculated by `file-truename'\n\ |
51194e0d2967
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11693
diff
changeset
|
5180 and then abbreviated with `abbreviate-file-name'.\n\ |
10751
dea8f022819d
(syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents:
10668
diff
changeset
|
5181 Each buffer has its own value of this variable."); |
dea8f022819d
(syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents:
10668
diff
changeset
|
5182 |
333 | 5183 DEFVAR_PER_BUFFER ("buffer-auto-save-file-name", |
1041 | 5184 ¤t_buffer->auto_save_file_name, |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5185 make_number (Lisp_String), |
333 | 5186 "Name of file for auto-saving current buffer,\n\ |
5187 or nil if buffer should not be auto-saved.\n\ | |
5188 Each buffer has its own value of this variable."); | |
5189 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5190 DEFVAR_PER_BUFFER ("buffer-read-only", ¤t_buffer->read_only, Qnil, |
333 | 5191 "Non-nil if this buffer is read-only.\n\ |
5192 Each buffer has its own value of this variable."); | |
5193 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5194 DEFVAR_PER_BUFFER ("buffer-backed-up", ¤t_buffer->backed_up, Qnil, |
333 | 5195 "Non-nil if this buffer's file has been backed up.\n\ |
5196 Backing up is done before the first time the file is saved.\n\ | |
5197 Each buffer has its own value of this variable."); | |
5198 | |
5199 DEFVAR_PER_BUFFER ("buffer-saved-size", ¤t_buffer->save_length, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5200 make_number (Lisp_Int), |
333 | 5201 "Length of current buffer when last read in, saved or auto-saved.\n\ |
5202 0 initially.\n\ | |
5203 Each buffer has its own value of this variable."); | |
5204 | |
5205 DEFVAR_PER_BUFFER ("selective-display", ¤t_buffer->selective_display, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5206 Qnil, |
333 | 5207 "Non-nil enables selective display:\n\ |
5208 Integer N as value means display only lines\n\ | |
5209 that start with less than n columns of space.\n\ | |
5210 A value of t means, after a ^M, all the rest of the line is invisible.\n\ | |
5211 Then ^M's in the file are written into files as newlines.\n\n\ | |
5212 Automatically becomes buffer-local when set in any fashion."); | |
5213 | |
5214 #ifndef old | |
5215 DEFVAR_PER_BUFFER ("selective-display-ellipses", | |
5216 ¤t_buffer->selective_display_ellipses, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5217 Qnil, |
333 | 5218 "t means display ... on previous line when a line is invisible.\n\ |
5219 Automatically becomes buffer-local when set in any fashion."); | |
5220 #endif | |
5221 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5222 DEFVAR_PER_BUFFER ("overwrite-mode", ¤t_buffer->overwrite_mode, Qnil, |
333 | 5223 "Non-nil if self-insertion should replace existing text.\n\ |
10611
eafe5efc009b
(syms_of_buffer): overwrite-mode doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10561
diff
changeset
|
5224 The value should be one of `overwrite-mode-textual',\n\ |
eafe5efc009b
(syms_of_buffer): overwrite-mode doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10561
diff
changeset
|
5225 `overwrite-mode-binary', or nil.\n\ |
eafe5efc009b
(syms_of_buffer): overwrite-mode doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10561
diff
changeset
|
5226 If it is `overwrite-mode-textual', self-insertion still\n\ |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2060
diff
changeset
|
5227 inserts at the end of a line, and inserts when point is before a tab,\n\ |
2217 | 5228 until the tab is filled in.\n\ |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2060
diff
changeset
|
5229 If `overwrite-mode-binary', self-insertion replaces newlines and tabs too.\n\ |
333 | 5230 Automatically becomes buffer-local when set in any fashion."); |
5231 | |
4226
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
5232 #if 0 /* The doc string is too long for some compilers, |
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
5233 but make-docfile can find it in this comment. */ |
333 | 5234 DEFVAR_PER_BUFFER ("buffer-display-table", ¤t_buffer->display_table, |
1038
59fa7697bb14
(syms_of_buffer): Made buffer-display-table,
Richard M. Stallman <rms@gnu.org>
parents:
1001
diff
changeset
|
5235 Qnil, |
333 | 5236 "Display table that controls display of the contents of current buffer.\n\ |
5237 Automatically becomes buffer-local when set in any fashion.\n\ | |
13169
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
5238 The display table is a char-table created with `make-display-table'.\n\ |
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
5239 The ordinary char-table elements control how to display each possible text\n\ |
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
5240 character. Each value should be a vector of characters or nil;\n\ |
333 | 5241 nil means display the character in the default fashion.\n\ |
13169
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
5242 There are six extra slots to control the display of\n\ |
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
5243 the end of a truncated screen line (extra-slot 0, a single character);\n\ |
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
5244 the end of a continued line (extra-slot 1, a single character);\n\ |
2645
b0462d46afff
* buffer.c (syms_of_buffer): Doc fix for buffer-display-table.
Jim Blandy <jimb@redhat.com>
parents:
2578
diff
changeset
|
5245 the escape character used to display character codes in octal\n\ |
13169
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
5246 (extra-slot 2, a single character);\n\ |
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
5247 the character used as an arrow for control characters (extra-slot 3,\n\ |
2645
b0462d46afff
* buffer.c (syms_of_buffer): Doc fix for buffer-display-table.
Jim Blandy <jimb@redhat.com>
parents:
2578
diff
changeset
|
5248 a single character);\n\ |
13169
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
5249 the decoration indicating the presence of invisible lines (extra-slot 4,\n\ |
8919
644f69fe736e
Add a new element to display tables controlling side-by-side
Jim Blandy <jimb@redhat.com>
parents:
8873
diff
changeset
|
5250 a vector of characters);\n\ |
644f69fe736e
Add a new element to display tables controlling side-by-side
Jim Blandy <jimb@redhat.com>
parents:
8873
diff
changeset
|
5251 the character used to draw the border between side-by-side windows\n\ |
13169
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
5252 (extra-slot 5, a single character).\n\ |
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
5253 See also the functions `display-table-slot' and `set-display-table-slot'.\n\ |
333 | 5254 If this variable is nil, the value of `standard-display-table' is used.\n\ |
5255 Each window can have its own, overriding display table."); | |
4226
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
5256 #endif |
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
5257 DEFVAR_PER_BUFFER ("buffer-display-table", ¤t_buffer->display_table, |
6348
f5a437637850
(buffer-display-table, buffer-undo-list): Delete docstring of second version
Karl Heuer <kwzh@gnu.org>
parents:
6205
diff
changeset
|
5258 Qnil, 0); |
333 | 5259 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5260 DEFVAR_PER_BUFFER ("left-margin-width", ¤t_buffer->left_margin_width, |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5261 Qnil, |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5262 "*Width of left marginal area for display of a buffer.\n\ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5263 Automatically becomes buffer-local when set in any fashion.\n\ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5264 A value of nil means no marginal area."); |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5265 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5266 DEFVAR_PER_BUFFER ("right-margin-width", ¤t_buffer->right_margin_width, |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5267 Qnil, |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5268 "*Width of right marginal area for display of a buffer.\n\ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5269 Automatically becomes buffer-local when set in any fashion.\n\ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5270 A value of nil means no marginal area."); |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5271 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5272 DEFVAR_PER_BUFFER ("indicate-empty-lines", |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5273 ¤t_buffer->indicate_empty_lines, Qnil, |
26441
53aa5195c94a
(indicate-empty-lines): Doc-fix.
Gerd Moellmann <gerd@gnu.org>
parents:
26372
diff
changeset
|
5274 "*Visually indicate empty lines after the buffer end.\n\ |
53aa5195c94a
(indicate-empty-lines): Doc-fix.
Gerd Moellmann <gerd@gnu.org>
parents:
26372
diff
changeset
|
5275 If non-nil, a bitmap is displayed in the left fringe of a window on\n\ |
53aa5195c94a
(indicate-empty-lines): Doc-fix.
Gerd Moellmann <gerd@gnu.org>
parents:
26372
diff
changeset
|
5276 window-systems.\n\ |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5277 Automatically becomes buffer-local when set in any fashion.\n"); |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5278 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5279 DEFVAR_PER_BUFFER ("scroll-up-aggressively", |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5280 ¤t_buffer->scroll_up_aggressively, Qnil, |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5281 "*If a number, scroll display up aggressively.\n\ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5282 If scrolling a window because point is above the window start, choose\n\ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5283 a new window start so that point ends up that fraction of the window's\n\ |
31128
89c7c0e869af
(syms_of_buffer) <scroll-up-aggressively>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
31102
diff
changeset
|
5284 height from the top of the window.\n\ |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5285 Automatically becomes buffer-local when set in any fashion."); |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5286 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5287 DEFVAR_PER_BUFFER ("scroll-down-aggressively", |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5288 ¤t_buffer->scroll_down_aggressively, Qnil, |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5289 "*If a number, scroll display down aggressively.\n\ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5290 If scrolling a window because point is below the window end, choose\n\ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5291 a new window start so that point ends up that fraction of the window's\n\ |
31128
89c7c0e869af
(syms_of_buffer) <scroll-up-aggressively>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
31102
diff
changeset
|
5292 height from the bottom of the window.\n\ |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5293 Automatically becomes buffer-local when set in any fashion."); |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5294 |
333 | 5295 /*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol, |
5296 "Don't ask."); | |
5297 */ | |
5298 | |
6785
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5299 DEFVAR_LISP ("before-change-functions", &Vbefore_change_functions, |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5300 "List of functions to call before each text change.\n\ |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5301 Two arguments are passed to each function: the positions of\n\ |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5302 the beginning and end of the range of old text to be changed.\n\ |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5303 \(For an insertion, the beginning and end are at the same place.)\n\ |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5304 No information is given about the length of the text after the change.\n\ |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5305 \n\ |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5306 Buffer changes made while executing the `before-change-functions'\n\ |
7434
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
5307 don't call any before-change or after-change functions.\n\ |
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
5308 That's because these variables are temporarily set to nil.\n\ |
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
5309 As a result, a hook function cannot straightforwardly alter the value of\n\ |
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
5310 these variables. See the Emacs Lisp manual for a way of\n\ |
23760
63e98b81cc29
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23399
diff
changeset
|
5311 accomplishing an equivalent result by using other variables.\n\ |
63e98b81cc29
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23399
diff
changeset
|
5312 \n\ |
63e98b81cc29
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23399
diff
changeset
|
5313 If an unhandled error happens in running these functions,\n\ |
63e98b81cc29
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23399
diff
changeset
|
5314 the variable's value remains nil. That prevents the error\n\ |
63e98b81cc29
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23399
diff
changeset
|
5315 from happening repeatedly and making Emacs nonfunctional."); |
6785
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5316 Vbefore_change_functions = Qnil; |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5317 |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5318 DEFVAR_LISP ("after-change-functions", &Vafter_change_functions, |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5319 "List of function to call after each text change.\n\ |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5320 Three arguments are passed to each function: the positions of\n\ |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5321 the beginning and end of the range of changed text,\n\ |
19466
3fce1e7c0fd0
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19242
diff
changeset
|
5322 and the length in bytes of the pre-change text replaced by that range.\n\ |
6785
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5323 \(For an insertion, the pre-change length is zero;\n\ |
19466
3fce1e7c0fd0
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19242
diff
changeset
|
5324 for a deletion, that length is the number of bytes deleted,\n\ |
6785
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5325 and the post-change beginning and end are at the same place.)\n\ |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5326 \n\ |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5327 Buffer changes made while executing the `after-change-functions'\n\ |
7434
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
5328 don't call any before-change or after-change functions.\n\ |
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
5329 That's because these variables are temporarily set to nil.\n\ |
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
5330 As a result, a hook function cannot straightforwardly alter the value of\n\ |
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
5331 these variables. See the Emacs Lisp manual for a way of\n\ |
23760
63e98b81cc29
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23399
diff
changeset
|
5332 accomplishing an equivalent result by using other variables.\n\ |
63e98b81cc29
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23399
diff
changeset
|
5333 \n\ |
63e98b81cc29
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23399
diff
changeset
|
5334 If an unhandled error happens in running these functions,\n\ |
63e98b81cc29
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23399
diff
changeset
|
5335 the variable's value remains nil. That prevents the error\n\ |
63e98b81cc29
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23399
diff
changeset
|
5336 from happening repeatedly and making Emacs nonfunctional."); |
6785
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5337 Vafter_change_functions = Qnil; |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5338 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
5339 DEFVAR_LISP ("first-change-hook", &Vfirst_change_hook, |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
5340 "A list of functions to call before changing a buffer which is unmodified.\n\ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
5341 The functions are run using the `run-hooks' function."); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
5342 Vfirst_change_hook = Qnil; |
333 | 5343 |
4226
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
5344 #if 0 /* The doc string is too long for some compilers, |
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
5345 but make-docfile can find it in this comment. */ |
1041 | 5346 DEFVAR_PER_BUFFER ("buffer-undo-list", ¤t_buffer->undo_list, Qnil, |
333 | 5347 "List of undo entries in current buffer.\n\ |
22150
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5348 This variable is always local in all buffers.\n\ |
333 | 5349 Recent changes come first; older changes follow newer.\n\ |
5350 \n\ | |
12101 | 5351 An entry (BEG . END) represents an insertion which begins at\n\ |
5352 position BEG and ends at position END.\n\ | |
333 | 5353 \n\ |
5354 An entry (TEXT . POSITION) represents the deletion of the string TEXT\n\ | |
5355 from (abs POSITION). If POSITION is positive, point was at the front\n\ | |
5356 of the text being deleted; if negative, point was at the end.\n\ | |
5357 \n\ | |
10365
3a50d7d3ae47
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10314
diff
changeset
|
5358 An entry (t HIGH . LOW) indicates that the buffer previously had\n\ |
3a50d7d3ae47
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10314
diff
changeset
|
5359 \"unmodified\" status. HIGH and LOW are the high and low 16-bit portions\n\ |
3a50d7d3ae47
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10314
diff
changeset
|
5360 of the visited file's modification time, as of that time. If the\n\ |
3a50d7d3ae47
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10314
diff
changeset
|
5361 modification time of the most recent save is different, this entry is\n\ |
333 | 5362 obsolete.\n\ |
5363 \n\ | |
10365
3a50d7d3ae47
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10314
diff
changeset
|
5364 An entry (nil PROPERTY VALUE BEG . END) indicates that a text property\n\ |
3a50d7d3ae47
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10314
diff
changeset
|
5365 was modified between BEG and END. PROPERTY is the property name,\n\ |
3a50d7d3ae47
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10314
diff
changeset
|
5366 and VALUE is the old value.\n\ |
1952
b0ec61f76511
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
1909
diff
changeset
|
5367 \n\ |
14481
9785f1180901
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14396
diff
changeset
|
5368 An entry (MARKER . DISTANCE) indicates that the marker MARKER\n\ |
9785f1180901
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14396
diff
changeset
|
5369 was adjusted in position by the offset DISTANCE (an integer).\n\ |
9785f1180901
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14396
diff
changeset
|
5370 \n\ |
1985
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
5371 An entry of the form POSITION indicates that point was at the buffer\n\ |
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
5372 location given by the integer. Undoing an entry of this form places\n\ |
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
5373 point at POSITION.\n\ |
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
5374 \n\ |
333 | 5375 nil marks undo boundaries. The undo command treats the changes\n\ |
5376 between two undo boundaries as a single step to be undone.\n\ | |
5377 \n\ | |
1985
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
5378 If the value of the variable is t, undo information is not recorded."); |
4226
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
5379 #endif |
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
5380 DEFVAR_PER_BUFFER ("buffer-undo-list", ¤t_buffer->undo_list, Qnil, |
6348
f5a437637850
(buffer-display-table, buffer-undo-list): Delete docstring of second version
Karl Heuer <kwzh@gnu.org>
parents:
6205
diff
changeset
|
5381 0); |
333 | 5382 |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
5383 DEFVAR_PER_BUFFER ("mark-active", ¤t_buffer->mark_active, Qnil, |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
5384 "Non-nil means the mark and region are currently active in this buffer.\n\ |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
5385 Automatically local in all buffers."); |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
5386 |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
5387 DEFVAR_PER_BUFFER ("cache-long-line-scans", ¤t_buffer->cache_long_line_scans, Qnil, |
9419
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5388 "Non-nil means that Emacs should use caches to handle long lines more quickly.\n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5389 This variable is buffer-local, in all buffers.\n\ |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
5390 \n\ |
9419
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5391 Normally, the line-motion functions work by scanning the buffer for\n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5392 newlines. Columnar operations (like move-to-column and\n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5393 compute-motion) also work by scanning the buffer, summing character\n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5394 widths as they go. This works well for ordinary text, but if the\n\ |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
5395 buffer's lines are very long (say, more than 500 characters), these\n\ |
9419
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5396 motion functions will take longer to execute. Emacs may also take\n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5397 longer to update the display.\n\ |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
5398 \n\ |
9419
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5399 If cache-long-line-scans is non-nil, these motion functions cache the\n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5400 results of their scans, and consult the cache to avoid rescanning\n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5401 regions of the buffer until the text is modified. The caches are most\n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5402 beneficial when they prevent the most searching---that is, when the\n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5403 buffer contains long lines and large regions of characters with the\n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5404 same, fixed screen width.\n\ |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
5405 \n\ |
9419
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5406 When cache-long-line-scans is non-nil, processing short lines will\n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5407 become slightly slower (because of the overhead of consulting the\n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5408 cache), and the caches will use memory roughly proportional to the\n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5409 number of newlines and characters whose screen width varies.\n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5410 \n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5411 The caches require no explicit maintenance; their accuracy is\n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5412 maintained internally by the Emacs primitives. Enabling or disabling\n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5413 the cache should not affect the behavior of any of the motion\n\ |
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
5414 functions; it should only affect their performance."); |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
5415 |
10561
53f34c870201
(init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
10505
diff
changeset
|
5416 DEFVAR_PER_BUFFER ("point-before-scroll", ¤t_buffer->point_before_scroll, Qnil, |
22150
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5417 "Value of point before the last series of scroll operations, or nil.\n\ |
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5418 This variable is always local in all buffers."); |
10561
53f34c870201
(init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
10505
diff
changeset
|
5419 |
11052
35664a2851e7
(reset_buffer): Reset file_format element too.(init_buffer_once): Define file_format flag; reset file_format.
Boris Goldowsky <boris@gnu.org>
parents:
11000
diff
changeset
|
5420 DEFVAR_PER_BUFFER ("buffer-file-format", ¤t_buffer->file_format, Qnil, |
35664a2851e7
(reset_buffer): Reset file_format element too.(init_buffer_once): Define file_format flag; reset file_format.
Boris Goldowsky <boris@gnu.org>
parents:
11000
diff
changeset
|
5421 "List of formats to use when saving this buffer.\n\ |
22150
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5422 This variable is always local in all buffers.\n\ |
11052
35664a2851e7
(reset_buffer): Reset file_format element too.(init_buffer_once): Define file_format flag; reset file_format.
Boris Goldowsky <boris@gnu.org>
parents:
11000
diff
changeset
|
5423 Formats are defined by `format-alist'. This variable is\n\ |
35664a2851e7
(reset_buffer): Reset file_format element too.(init_buffer_once): Define file_format flag; reset file_format.
Boris Goldowsky <boris@gnu.org>
parents:
11000
diff
changeset
|
5424 set when a file is visited. Automatically local in all buffers."); |
35664a2851e7
(reset_buffer): Reset file_format element too.(init_buffer_once): Define file_format flag; reset file_format.
Boris Goldowsky <boris@gnu.org>
parents:
11000
diff
changeset
|
5425 |
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
5426 DEFVAR_PER_BUFFER ("buffer-invisibility-spec", |
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
5427 ¤t_buffer->invisibility_spec, Qnil, |
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
5428 "Invisibility spec of this buffer.\n\ |
22150
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5429 This variable is always local in all buffers.\n\ |
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
5430 The default is t, which means that text is invisible\n\ |
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
5431 if it has a non-nil `invisible' property.\n\ |
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
5432 If the value is a list, a text character is invisible if its `invisible'\n\ |
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
5433 property is an element in that list.\n\ |
11112 | 5434 If an element is a cons cell of the form (PROP . ELLIPSIS),\n\ |
5435 then characters with property value PROP are invisible,\n\ | |
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
5436 and they have an ellipsis as well if ELLIPSIS is non-nil."); |
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
5437 |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
5438 DEFVAR_PER_BUFFER ("buffer-display-count", |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
5439 ¤t_buffer->display_count, Qnil, |
22150
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5440 "A number incremented each time this buffer is displayed in a window.\n\ |
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5441 This variable is always local in all buffers.\n\ |
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5442 The function `set-window-buffer increments it."); |
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5443 |
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5444 DEFVAR_PER_BUFFER ("buffer-display-time", |
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5445 ¤t_buffer->display_time, Qnil, |
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5446 "Time stamp updated each time this buffer is displayed in a window.\n\ |
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5447 This variable is always local in all buffers.\n\ |
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5448 The function `set-window-buffer' updates this variable\n\ |
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5449 to the value obtained by calling `current-time'.\n\ |
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5450 If the buffer has never been shown in a window, the value is nil."); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
5451 |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
5452 DEFVAR_LISP ("transient-mark-mode", &Vtransient_mark_mode, |
16665
195f7cf6a9f3
(syms_of_buffer): Doc fix (transient-mark-mode).
Richard M. Stallman <rms@gnu.org>
parents:
16384
diff
changeset
|
5453 "*Non-nil means deactivate the mark when the buffer contents change.\n\ |
195f7cf6a9f3
(syms_of_buffer): Doc fix (transient-mark-mode).
Richard M. Stallman <rms@gnu.org>
parents:
16384
diff
changeset
|
5454 Non-nil also enables highlighting of the region whenever the mark is active.\n\ |
195f7cf6a9f3
(syms_of_buffer): Doc fix (transient-mark-mode).
Richard M. Stallman <rms@gnu.org>
parents:
16384
diff
changeset
|
5455 The variable `highlight-nonselected-windows' controls whether to highlight\n\ |
195f7cf6a9f3
(syms_of_buffer): Doc fix (transient-mark-mode).
Richard M. Stallman <rms@gnu.org>
parents:
16384
diff
changeset
|
5456 all windows or just the selected window."); |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
5457 Vtransient_mark_mode = Qnil; |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
5458 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
5459 DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only, |
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
5460 "*Non-nil means disregard read-only status of buffers or characters.\n\ |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
5461 If the value is t, disregard `buffer-read-only' and all `read-only'\n\ |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
5462 text properties. If the value is a list, disregard `buffer-read-only'\n\ |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
5463 and disregard a `read-only' text property if the property value\n\ |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
5464 is a member of the list."); |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
5465 Vinhibit_read_only = Qnil; |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
5466 |
28322
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
5467 DEFVAR_PER_BUFFER ("cursor-type", ¤t_buffer->cursor_type, Qnil, |
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
5468 "Cursor to use in window displaying this buffer.\n\ |
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
5469 Values are interpreted as follows:\n\ |
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
5470 \n\ |
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
5471 t use the cursor specified for the frame\n\ |
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
5472 nil don't display a cursor\n\ |
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
5473 `bar' display a bar cursor with default width\n\ |
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
5474 (bar . WIDTH) display a bar cursor with width WIDTH\n\ |
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
5475 others display a box cursor."); |
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
5476 |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
5477 DEFVAR_PER_BUFFER ("line-spacing", |
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
5478 ¤t_buffer->extra_line_spacing, Qnil, |
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
5479 "Additional space to put between lines when displaying a buffer.\n\ |
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
5480 The space is measured in pixels, and put below lines on window systems."); |
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
5481 |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
5482 DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions, |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
5483 "List of functions called with no args to query before killing a buffer."); |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
5484 Vkill_buffer_query_functions = Qnil; |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
5485 |
14506
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
5486 defsubr (&Sbuffer_live_p); |
333 | 5487 defsubr (&Sbuffer_list); |
5488 defsubr (&Sget_buffer); | |
5489 defsubr (&Sget_file_buffer); | |
5490 defsubr (&Sget_buffer_create); | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
5491 defsubr (&Smake_indirect_buffer); |
392 | 5492 defsubr (&Sgenerate_new_buffer_name); |
333 | 5493 defsubr (&Sbuffer_name); |
5494 /*defsubr (&Sbuffer_number);*/ | |
5495 defsubr (&Sbuffer_file_name); | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
5496 defsubr (&Sbuffer_base_buffer); |
333 | 5497 defsubr (&Sbuffer_local_variables); |
5498 defsubr (&Sbuffer_modified_p); | |
5499 defsubr (&Sset_buffer_modified_p); | |
5500 defsubr (&Sbuffer_modified_tick); | |
5501 defsubr (&Srename_buffer); | |
5502 defsubr (&Sother_buffer); | |
5503 defsubr (&Sbuffer_disable_undo); | |
5504 defsubr (&Sbuffer_enable_undo); | |
5505 defsubr (&Skill_buffer); | |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
5506 defsubr (&Sset_buffer_major_mode); |
333 | 5507 defsubr (&Sswitch_to_buffer); |
5508 defsubr (&Spop_to_buffer); | |
5509 defsubr (&Scurrent_buffer); | |
5510 defsubr (&Sset_buffer); | |
5511 defsubr (&Sbarf_if_buffer_read_only); | |
5512 defsubr (&Sbury_buffer); | |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
5513 defsubr (&Serase_buffer); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
5514 defsubr (&Sset_buffer_multibyte); |
333 | 5515 defsubr (&Skill_all_local_variables); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5516 |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
5517 defsubr (&Soverlayp); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5518 defsubr (&Smake_overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5519 defsubr (&Sdelete_overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5520 defsubr (&Smove_overlay); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
5521 defsubr (&Soverlay_start); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
5522 defsubr (&Soverlay_end); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
5523 defsubr (&Soverlay_buffer); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
5524 defsubr (&Soverlay_properties); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5525 defsubr (&Soverlays_at); |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
5526 defsubr (&Soverlays_in); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5527 defsubr (&Snext_overlay_change); |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
5528 defsubr (&Sprevious_overlay_change); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5529 defsubr (&Soverlay_recenter); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5530 defsubr (&Soverlay_lists); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5531 defsubr (&Soverlay_get); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5532 defsubr (&Soverlay_put); |
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
5533 defsubr (&Srestore_buffer_modified_p); |
333 | 5534 } |
5535 | |
21514 | 5536 void |
333 | 5537 keys_of_buffer () |
5538 { | |
5539 initial_define_key (control_x_map, 'b', "switch-to-buffer"); | |
5540 initial_define_key (control_x_map, 'k', "kill-buffer"); | |
5570
2c5f3537a1cc
(syms_of_buffer): Don't do (put 'erase-buffer 'disabled t) here.
Roland McGrath <roland@gnu.org>
parents:
5502
diff
changeset
|
5541 |
2c5f3537a1cc
(syms_of_buffer): Don't do (put 'erase-buffer 'disabled t) here.
Roland McGrath <roland@gnu.org>
parents:
5502
diff
changeset
|
5542 /* This must not be in syms_of_buffer, because Qdisabled is not |
2c5f3537a1cc
(syms_of_buffer): Don't do (put 'erase-buffer 'disabled t) here.
Roland McGrath <roland@gnu.org>
parents:
5502
diff
changeset
|
5543 initialized when that function gets called. */ |
2c5f3537a1cc
(syms_of_buffer): Don't do (put 'erase-buffer 'disabled t) here.
Roland McGrath <roland@gnu.org>
parents:
5502
diff
changeset
|
5544 Fput (intern ("erase-buffer"), Qdisabled, Qt); |
333 | 5545 } |