Mercurial > emacs
annotate src/buffer.c @ 42009:929c3e3a6ca4
*** empty log message ***
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Thu, 13 Dec 2001 10:02:26 +0000 |
parents | 095a45698793 |
children | 11a505aa1322 |
rev | line source |
---|---|
333 | 1 /* Buffer manipulation primitives for GNU Emacs. |
36584
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2 Copyright (C) 1985,86,87,88,89,93,94,95,97,98, 1999, 2000, 2001 |
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 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
42 |
333 | 43 #include "lisp.h" |
1308
2660a7053836
* buffer.c: #include intervals.h.
Joseph Arceneaux <jla@gnu.org>
parents:
1291
diff
changeset
|
44 #include "intervals.h" |
333 | 45 #include "window.h" |
46 #include "commands.h" | |
47 #include "buffer.h" | |
17022 | 48 #include "charset.h" |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
49 #include "region-cache.h" |
333 | 50 #include "indent.h" |
2480 | 51 #include "blockinput.h" |
31102
6a0caa788013
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30911
diff
changeset
|
52 #include "keyboard.h" |
39748
42b7a798ff79
Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39581
diff
changeset
|
53 #include "keymap.h" |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
54 #include "frame.h" |
333 | 55 |
56 struct buffer *current_buffer; /* the current buffer */ | |
57 | |
58 /* First buffer in chain of all buffers (in reverse order of creation). | |
59 Threaded through ->next. */ | |
60 | |
61 struct buffer *all_buffers; | |
62 | |
63 /* This structure holds the default values of the buffer-local variables | |
64 defined with DEFVAR_PER_BUFFER, that have special slots in each buffer. | |
65 The default value occupies the same slot in this structure | |
66 as an individual buffer's value occupies in that buffer. | |
67 Setting the default value also goes through the alist of buffers | |
68 and stores into each buffer that does not say it has a local value. */ | |
69 | |
70 struct buffer buffer_defaults; | |
71 | |
72 /* A Lisp_Object pointer to the above, used for staticpro */ | |
73 | |
74 static Lisp_Object Vbuffer_defaults; | |
75 | |
76 /* This structure marks which slots in a buffer have corresponding | |
77 default values in buffer_defaults. | |
78 Each such slot has a nonzero value in this structure. | |
79 The value has only one nonzero bit. | |
80 | |
81 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
|
82 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
|
83 is turned on in the buffer's local_flags array. |
333 | 84 |
85 If a slot in this structure is -1, then even though there may | |
86 be a DEFVAR_PER_BUFFER for the slot, there is no default value for it; | |
87 and the corresponding slot in buffer_defaults is not used. | |
88 | |
89 If a slot is -2, then there is no DEFVAR_PER_BUFFER for it, | |
90 but there is a default value which is copied into each buffer. | |
91 | |
92 If a slot in this structure is negative, then even though there may | |
93 be a DEFVAR_PER_BUFFER for the slot, there is no default value for it; | |
94 and the corresponding slot in buffer_defaults is not used. | |
95 | |
96 If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is | |
97 zero, that is a bug */ | |
98 | |
99 struct buffer buffer_local_flags; | |
100 | |
101 /* This structure holds the names of symbols whose values may be | |
102 buffer-local. It is indexed and accessed in the same way as the above. */ | |
103 | |
104 struct buffer buffer_local_symbols; | |
105 /* A Lisp_Object pointer to the above, used for staticpro */ | |
106 static Lisp_Object Vbuffer_local_symbols; | |
107 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
108 /* 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
|
109 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
|
110 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
|
111 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
|
112 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
|
113 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
|
114 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
|
115 |
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
116 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
|
117 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
|
118 |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
119 /* 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
|
120 are permanent locals. */ |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
121 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
|
122 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
123 /* Number of per-buffer variables used. */ |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
124 |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
125 int last_per_buffer_idx; |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
126 |
333 | 127 Lisp_Object Fset_buffer (); |
392 | 128 void set_buffer_internal (); |
11889
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
129 void set_buffer_internal_1 (); |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
130 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
|
131 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
|
132 static void reset_buffer_local_variables (); |
333 | 133 |
134 /* Alist of all buffer names vs the buffers. */ | |
135 /* This used to be a variable, but is no longer, | |
136 to prevent lossage due to user rplac'ing this alist or its elements. */ | |
137 Lisp_Object Vbuffer_alist; | |
138 | |
139 /* 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
|
140 Lisp_Object Vbefore_change_functions; |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
141 Lisp_Object Vafter_change_functions; |
333 | 142 |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
143 Lisp_Object Vtransient_mark_mode; |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
144 |
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
145 /* 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
|
146 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
|
147 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
|
148 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
|
149 |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
150 /* 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
|
151 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
|
152 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
|
153 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
154 /* 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
|
155 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
|
156 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
157 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
|
158 Lisp_Object Qbefore_change_functions; |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
159 Lisp_Object Qafter_change_functions; |
333 | 160 |
23399
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
161 /* If nonzero, all modification hooks are suppressed. */ |
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
162 int inhibit_modification_hooks; |
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
163 |
333 | 164 Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; |
165 | |
166 Lisp_Object Qprotected_field; | |
167 | |
168 Lisp_Object QSFundamental; /* A string "Fundamental" */ | |
169 | |
170 Lisp_Object Qkill_buffer_hook; | |
171 | |
5433 | 172 Lisp_Object Qget_file_buffer; |
173 | |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
174 Lisp_Object Qoverlayp; |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
175 |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
176 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
|
177 |
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
178 Lisp_Object Qmodification_hooks; |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
179 Lisp_Object Qinsert_in_front_hooks; |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
180 Lisp_Object Qinsert_behind_hooks; |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
181 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
182 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
|
183 static void free_buffer_text P_ ((struct buffer *b)); |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
184 static Lisp_Object copy_overlays P_ ((struct buffer *, Lisp_Object)); |
39333
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
185 static void modify_overlay P_ ((struct buffer *, int, int)); |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
186 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
187 |
333 | 188 /* For debugging; temporary. See set_buffer_internal. */ |
189 /* Lisp_Object Qlisp_mode, Vcheck_symbol; */ | |
190 | |
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
191 void |
333 | 192 nsberror (spec) |
193 Lisp_Object spec; | |
194 { | |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
195 if (STRINGP (spec)) |
333 | 196 error ("No buffer named %s", XSTRING (spec)->data); |
197 error ("Invalid buffer argument"); | |
198 } | |
199 | |
14506
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
200 DEFUN ("buffer-live-p", Fbuffer_live_p, Sbuffer_live_p, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
201 doc: /* Return non-nil if OBJECT is a buffer which has not been killed. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
202 Value is nil if OBJECT is not a buffer or if it has been killed. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
203 (object) |
14506
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
204 Lisp_Object object; |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
205 { |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
206 return ((BUFFERP (object) && ! NILP (XBUFFER (object)->name)) |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
207 ? Qt : Qnil); |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
208 } |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
209 |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
210 DEFUN ("buffer-list", Fbuffer_list, Sbuffer_list, 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
211 doc: /* Return a list of all existing live buffers. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
212 If the optional arg FRAME is a frame, we return that frame's buffer list. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
213 (frame) |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
214 Lisp_Object frame; |
333 | 215 { |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
216 Lisp_Object framelist, general; |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
217 general = Fmapcar (Qcdr, Vbuffer_alist); |
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 if (FRAMEP (frame)) |
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 Lisp_Object tail; |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
222 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
223 CHECK_FRAME (frame); |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
224 |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
225 framelist = Fcopy_sequence (XFRAME (frame)->buffer_list); |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
226 |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
227 /* 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
|
228 tail = framelist; |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
229 while (! NILP (tail)) |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
230 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
231 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
|
232 tail = XCDR (tail); |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
233 } |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
234 return nconc2 (framelist, general); |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
235 } |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
236 |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
237 return general; |
333 | 238 } |
239 | |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
240 /* 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
|
241 (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
|
242 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
|
243 |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
244 static Lisp_Object |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
245 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
|
246 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
|
247 Lisp_Object list; |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
248 { |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
249 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
|
250 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
|
251 { |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
252 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
|
253 elt = Fcar (tail); |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
254 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
|
255 if (!NILP (tem)) |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
256 return elt; |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
257 } |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
258 return Qnil; |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
259 } |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
260 |
333 | 261 DEFUN ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
262 doc: /* Return the buffer named NAME (a string). |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
263 If there is no live buffer named NAME, return nil. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
264 NAME may also be a buffer; if so, the value is that buffer. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
265 (name) |
333 | 266 register Lisp_Object name; |
267 { | |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
268 if (BUFFERP (name)) |
333 | 269 return name; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
270 CHECK_STRING (name); |
333 | 271 |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
272 return Fcdr (assoc_ignore_text_properties (name, Vbuffer_alist)); |
333 | 273 } |
274 | |
275 DEFUN ("get-file-buffer", Fget_file_buffer, Sget_file_buffer, 1, 1, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
276 doc: /* Return the buffer visiting file FILENAME (a string). |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
277 The buffer's `buffer-file-name' must match exactly the expansion of FILENAME. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
278 If there is no such live buffer, return nil. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
279 See also `find-buffer-visiting'. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
280 (filename) |
333 | 281 register Lisp_Object filename; |
282 { | |
283 register Lisp_Object tail, buf, tem; | |
5433 | 284 Lisp_Object handler; |
285 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
286 CHECK_STRING (filename); |
333 | 287 filename = Fexpand_file_name (filename, Qnil); |
288 | |
5433 | 289 /* If the file name has special constructs in it, |
290 call the corresponding file handler. */ | |
7028
6915bf781a38
Pass operation to Ffind_file_name_handler.
Karl Heuer <kwzh@gnu.org>
parents:
6785
diff
changeset
|
291 handler = Ffind_file_name_handler (filename, Qget_file_buffer); |
5433 | 292 if (!NILP (handler)) |
293 return call2 (handler, Qget_file_buffer, filename); | |
294 | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
295 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
333 | 296 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
297 buf = Fcdr (XCAR (tail)); |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
298 if (!BUFFERP (buf)) continue; |
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
299 if (!STRINGP (XBUFFER (buf)->filename)) continue; |
333 | 300 tem = Fstring_equal (XBUFFER (buf)->filename, filename); |
485 | 301 if (!NILP (tem)) |
333 | 302 return buf; |
303 } | |
304 return Qnil; | |
305 } | |
306 | |
12810
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
307 Lisp_Object |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
308 get_truename_buffer (filename) |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
309 register Lisp_Object filename; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
310 { |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
311 register Lisp_Object tail, buf, tem; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
312 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
313 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
|
314 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
315 buf = Fcdr (XCAR (tail)); |
12810
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
316 if (!BUFFERP (buf)) continue; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
317 if (!STRINGP (XBUFFER (buf)->file_truename)) continue; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
318 tem = Fstring_equal (XBUFFER (buf)->file_truename, filename); |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
319 if (!NILP (tem)) |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
320 return buf; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
321 } |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
322 return Qnil; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
323 } |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
324 |
333 | 325 /* Incremented for each buffer created, to assign the buffer number. */ |
326 int buffer_count; | |
327 | |
328 DEFUN ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
329 doc: /* Return the buffer named NAME, or create such a buffer and return it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
330 A new buffer is created if there is no live buffer named NAME. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
331 If NAME starts with a space, the new buffer does not keep undo information. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
332 If NAME is a buffer instead of a string, then it is the value returned. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
333 The value is never nil. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
334 (name) |
333 | 335 register Lisp_Object name; |
336 { | |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
337 register Lisp_Object buf; |
333 | 338 register struct buffer *b; |
339 | |
340 buf = Fget_buffer (name); | |
485 | 341 if (!NILP (buf)) |
333 | 342 return buf; |
343 | |
6697
28e36f59e856
(Fget_buffer_create): Disallow empty string.
Karl Heuer <kwzh@gnu.org>
parents:
6675
diff
changeset
|
344 if (XSTRING (name)->size == 0) |
28e36f59e856
(Fget_buffer_create): Disallow empty string.
Karl Heuer <kwzh@gnu.org>
parents:
6675
diff
changeset
|
345 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
|
346 |
27739
e272d652619a
(Fget_buffer_create, Fmake_indirect_buffer): Use
Gerd Moellmann <gerd@gnu.org>
parents:
27480
diff
changeset
|
347 b = (struct buffer *) allocate_buffer (); |
333 | 348 |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
349 b->size = sizeof (struct buffer) / sizeof (EMACS_INT); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
350 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
351 /* 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
|
352 b->text = &b->own_text; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
353 b->base_buffer = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
354 |
333 | 355 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
|
356 BLOCK_INPUT; |
17022 | 357 /* We allocate extra 1-byte at the tail and keep it always '\0' for |
358 anchoring a search. */ | |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
359 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
|
360 UNBLOCK_INPUT; |
333 | 361 if (! BUF_BEG_ADDR (b)) |
10668
acbd9fab366a
(Fget_buffer_create): Call buffer_memory_full.
Richard M. Stallman <rms@gnu.org>
parents:
10611
diff
changeset
|
362 buffer_memory_full (); |
333 | 363 |
364 BUF_PT (b) = 1; | |
365 BUF_GPT (b) = 1; | |
366 BUF_BEGV (b) = 1; | |
367 BUF_ZV (b) = 1; | |
368 BUF_Z (b) = 1; | |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
369 BUF_PT_BYTE (b) = 1; |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
370 BUF_GPT_BYTE (b) = 1; |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
371 BUF_BEGV_BYTE (b) = 1; |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
372 BUF_ZV_BYTE (b) = 1; |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
373 BUF_Z_BYTE (b) = 1; |
333 | 374 BUF_MODIFF (b) = 1; |
16213
3b8851bebc76
(Fget_buffer_create): Initialize BUF_OVERLAY_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents:
16193
diff
changeset
|
375 BUF_OVERLAY_MODIFF (b) = 1; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
376 BUF_SAVE_MODIFF (b) = 1; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
377 BUF_INTERVALS (b) = 0; |
25368
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
378 BUF_UNCHANGED_MODIFIED (b) = 1; |
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
379 BUF_OVERLAY_UNCHANGED_MODIFIED (b) = 1; |
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
380 BUF_END_UNCHANGED (b) = 0; |
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
381 BUF_BEG_UNCHANGED (b) = 0; |
17022 | 382 *(BUF_GPT_ADDR (b)) = *(BUF_Z_ADDR (b)) = 0; /* Put an anchor '\0'. */ |
333 | 383 |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
384 b->newline_cache = 0; |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
385 b->width_run_cache = 0; |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
386 b->width_table = Qnil; |
25368
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
387 b->prevent_redisplay_optimizations_p = 1; |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
388 |
333 | 389 /* Put this on the chain of all buffers including killed ones. */ |
390 b->next = all_buffers; | |
391 all_buffers = b; | |
392 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
393 /* An ordinary buffer normally doesn't need markers |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
394 to handle BEGV and ZV. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
395 b->pt_marker = Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
396 b->begv_marker = Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
397 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
|
398 |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
399 name = Fcopy_sequence (name); |
30911
c1de0fc3a34b
(Fget_buffer_create, Fmake_indirect_buffer): Avoid
Dave Love <fx@gnu.org>
parents:
30695
diff
changeset
|
400 XSTRING (name)->intervals = NULL_INTERVAL; |
333 | 401 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
|
402 |
333 | 403 if (XSTRING (name)->data[0] != ' ') |
404 b->undo_list = Qnil; | |
405 else | |
406 b->undo_list = Qt; | |
407 | |
408 reset_buffer (b); | |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
409 reset_buffer_local_variables (b, 1); |
333 | 410 |
411 /* 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
|
412 XSETBUFFER (buf, b); |
333 | 413 Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil)); |
414 | |
415 b->mark = Fmake_marker (); | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
416 BUF_MARKERS (b) = Qnil; |
333 | 417 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
|
418 return buf; |
333 | 419 } |
420 | |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
421 |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
422 /* Return a list of overlays which is a copy of the overlay list |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
423 LIST, but for buffer B. */ |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
424 |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
425 static Lisp_Object |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
426 copy_overlays (b, list) |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
427 struct buffer *b; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
428 Lisp_Object list; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
429 { |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
430 Lisp_Object result, buffer; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
431 |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
432 XSETBUFFER (buffer, b); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
433 |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
434 for (result = Qnil; CONSP (list); list = XCDR (list)) |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
435 { |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
436 Lisp_Object overlay, start, end, old_overlay; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
437 int charpos; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
438 |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
439 old_overlay = XCAR (list); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
440 charpos = marker_position (OVERLAY_START (old_overlay)); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
441 start = Fmake_marker (); |
37950
f01f454ea6bf
(copy_overlays): Make ENABLE_CHECKING happy.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37752
diff
changeset
|
442 Fset_marker (start, make_number (charpos), buffer); |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
443 XMARKER (start)->insertion_type |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
444 = XMARKER (OVERLAY_START (old_overlay))->insertion_type; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
445 |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
446 charpos = marker_position (OVERLAY_END (old_overlay)); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
447 end = Fmake_marker (); |
37950
f01f454ea6bf
(copy_overlays): Make ENABLE_CHECKING happy.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37752
diff
changeset
|
448 Fset_marker (end, make_number (charpos), buffer); |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
449 XMARKER (end)->insertion_type |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
450 = XMARKER (OVERLAY_END (old_overlay))->insertion_type; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
451 |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
452 overlay = allocate_misc (); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
453 XMISCTYPE (overlay) = Lisp_Misc_Overlay; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
454 OVERLAY_START (overlay) = start; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
455 OVERLAY_END (overlay) = end; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
456 OVERLAY_PLIST (overlay) = Fcopy_sequence (OVERLAY_PLIST (old_overlay)); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
457 |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
458 result = Fcons (overlay, result); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
459 } |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
460 |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
461 return Fnreverse (result); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
462 } |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
463 |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
464 |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
465 /* Clone per-buffer values of buffer FROM. |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
466 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
467 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
|
468 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
|
469 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
|
470 copied. */ |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
471 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
472 static void |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
473 clone_per_buffer_values (from, to) |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
474 struct buffer *from, *to; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
475 { |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
476 Lisp_Object to_buffer; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
477 int offset; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
478 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
479 XSETBUFFER (to_buffer, to); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
480 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
481 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
|
482 offset < sizeof *to; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
483 offset += sizeof (Lisp_Object)) |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
484 { |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
485 Lisp_Object obj; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
486 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
487 obj = PER_BUFFER_VALUE (from, offset); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
488 if (MARKERP (obj)) |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
489 { |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
490 struct Lisp_Marker *m = XMARKER (obj); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
491 obj = Fmake_marker (); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
492 XMARKER (obj)->insertion_type = m->insertion_type; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
493 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
|
494 } |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
495 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
496 PER_BUFFER_VALUE (to, offset) = obj; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
497 } |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
498 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
499 bcopy (from->local_flags, to->local_flags, sizeof to->local_flags); |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
500 |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
501 to->overlays_before = copy_overlays (to, from->overlays_before); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
502 to->overlays_after = copy_overlays (to, from->overlays_after); |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
503 } |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
504 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
505 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
506 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
|
507 2, 3, |
11838
92a61e91ec05
(Fmake_indirect_buffer): Fix interactive spec.
Karl Heuer <kwzh@gnu.org>
parents:
11823
diff
changeset
|
508 "bMake indirect buffer (to buffer): \nBName of indirect buffer: ", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
509 doc: /* Create and return an indirect buffer for buffer BASE-BUFFER, named NAME. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
510 BASE-BUFFER should be an existing buffer (or buffer name). |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
511 NAME should be a string which is not the name of an existing buffer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
512 Optional argument CLONE non-nil means preserve BASE-BUFFER's state, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
513 such as major and minor modes, in the indirect buffer. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
514 CLONE nil means the indirect buffer's state is reset to default values. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
515 (base_buffer, name, clone) |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
516 Lisp_Object base_buffer, name, clone; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
517 { |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
518 Lisp_Object buf; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
519 struct buffer *b; |
10314
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 buf = Fget_buffer (name); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
522 if (!NILP (buf)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
523 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
|
524 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
525 base_buffer = Fget_buffer (base_buffer); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
526 if (NILP (base_buffer)) |
33791
435668e914b1
(Fmake_indirect_buffer): Don't treat nil as a
Gerd Moellmann <gerd@gnu.org>
parents:
33698
diff
changeset
|
527 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
|
528 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
529 if (XSTRING (name)->size == 0) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
530 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
|
531 |
27739
e272d652619a
(Fget_buffer_create, Fmake_indirect_buffer): Use
Gerd Moellmann <gerd@gnu.org>
parents:
27480
diff
changeset
|
532 b = (struct buffer *) allocate_buffer (); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
533 b->size = sizeof (struct buffer) / sizeof (EMACS_INT); |
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 (XBUFFER (base_buffer)->base_buffer) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
536 b->base_buffer = XBUFFER (base_buffer)->base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
537 else |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
538 b->base_buffer = XBUFFER (base_buffer); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
539 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
540 /* Use the base buffer's text object. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
541 b->text = b->base_buffer->text; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
542 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
543 BUF_BEGV (b) = BUF_BEGV (b->base_buffer); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
544 BUF_ZV (b) = BUF_ZV (b->base_buffer); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
545 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
|
546 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
|
547 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
|
548 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
|
549 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
550 b->newline_cache = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
551 b->width_run_cache = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
552 b->width_table = Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
553 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
554 /* 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
|
555 b->next = all_buffers; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
556 all_buffers = b; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
557 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
558 name = Fcopy_sequence (name); |
30911
c1de0fc3a34b
(Fget_buffer_create, Fmake_indirect_buffer): Avoid
Dave Love <fx@gnu.org>
parents:
30695
diff
changeset
|
559 XSTRING (name)->intervals = NULL_INTERVAL; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
560 b->name = name; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
561 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
562 reset_buffer (b); |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
563 reset_buffer_local_variables (b, 1); |
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 /* 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
|
566 XSETBUFFER (buf, b); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
567 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
|
568 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
569 b->mark = Fmake_marker (); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
570 b->name = name; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
571 |
24604
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
572 /* 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
|
573 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
|
574 |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
575 /* 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
|
576 if (NILP (b->base_buffer->pt_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
577 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
578 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
|
579 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
|
580 BUF_PT (b->base_buffer), |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
581 BUF_PT_BYTE (b->base_buffer)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
582 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
583 if (NILP (b->base_buffer->begv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
584 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
585 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
|
586 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
|
587 BUF_BEGV (b->base_buffer), |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
588 BUF_BEGV_BYTE (b->base_buffer)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
589 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
590 if (NILP (b->base_buffer->zv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
591 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
592 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
|
593 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
|
594 BUF_ZV (b->base_buffer), |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
595 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
|
596 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
|
597 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
598 |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
599 if (NILP (clone)) |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
600 { |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
601 /* Give the indirect buffer markers for its narrowing. */ |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
602 b->pt_marker = Fmake_marker (); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
603 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
|
604 b->begv_marker = Fmake_marker (); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
605 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
|
606 b->zv_marker = Fmake_marker (); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
607 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
|
608 XMARKER (b->zv_marker)->insertion_type = 1; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
609 } |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
610 else |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
611 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
|
612 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
613 return buf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
614 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
615 |
8873
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
616 /* 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
|
617 and local variables. */ |
333 | 618 |
619 void | |
620 reset_buffer (b) | |
621 register struct buffer *b; | |
622 { | |
623 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
|
624 b->file_truename = Qnil; |
333 | 625 b->directory = (current_buffer) ? current_buffer->directory : Qnil; |
626 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
|
627 XSETFASTINT (b->save_length, 0); |
333 | 628 b->last_window_start = 1; |
17566
7ed40081342f
(reset_buffer): Initialize clip_changed field.
Richard M. Stallman <rms@gnu.org>
parents:
17238
diff
changeset
|
629 /* 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
|
630 b->clip_changed = 0; |
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
631 b->prevent_redisplay_optimizations_p = 1; |
333 | 632 b->backed_up = Qnil; |
633 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
|
634 b->auto_save_failure_time = -1; |
333 | 635 b->auto_save_file_name = Qnil; |
636 b->read_only = Qnil; | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
637 b->overlays_before = Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
638 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
|
639 XSETFASTINT (b->overlay_center, 1); |
3242
f873e6b9af52
(reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents:
3226
diff
changeset
|
640 b->mark_active = Qnil; |
10561
53f34c870201
(init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
10505
diff
changeset
|
641 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
|
642 b->file_format = Qnil; |
16067
5c9f298c9875
(reset_buffer): Initialize last_selected_window slot.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
643 b->last_selected_window = Qnil; |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
644 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
|
645 b->display_time = Qnil; |
20995
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
646 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
|
647 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
|
648 b->extra_line_spacing = buffer_defaults.extra_line_spacing; |
333 | 649 } |
650 | |
8873
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
651 /* 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
|
652 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
|
653 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
|
654 Instead, use Fkill_all_local_variables. |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
655 |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
656 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
|
657 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
|
658 we preserve those. */ |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
659 |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
660 static void |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
661 reset_buffer_local_variables (b, permanent_too) |
333 | 662 register struct buffer *b; |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
663 int permanent_too; |
333 | 664 { |
665 register int offset; | |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
666 int i; |
333 | 667 |
668 /* Reset the major mode to Fundamental, together with all the | |
669 things that depend on the major mode. | |
670 default-major-mode is handled at a higher level. | |
671 We ignore it here. */ | |
672 b->major_mode = Qfundamental_mode; | |
673 b->keymap = Qnil; | |
674 b->abbrev_table = Vfundamental_mode_abbrev_table; | |
675 b->mode_name = QSFundamental; | |
676 b->minor_modes = Qnil; | |
13270
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
677 |
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
678 /* 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
|
679 fix up its insides first. */ |
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
680 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
|
681 && 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
|
682 && 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
|
683 Fset_standard_case_table (Vascii_downcase_table); |
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
684 |
333 | 685 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
|
686 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
|
687 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
|
688 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
|
689 b->invisibility_spec = Qt; |
15786
f2d0e8928d57
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15776
diff
changeset
|
690 #ifndef DOS_NT |
f2d0e8928d57
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15776
diff
changeset
|
691 b->buffer_file_type = Qnil; |
f2d0e8928d57
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15776
diff
changeset
|
692 #endif |
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
693 |
333 | 694 #if 0 |
695 b->sort_table = XSTRING (Vascii_sort_table); | |
696 b->folding_sort_table = XSTRING (Vascii_folding_sort_table); | |
697 #endif /* 0 */ | |
698 | |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
699 /* Reset all (or most) per-buffer variables to their defaults. */ |
333 | 700 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
|
701 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
|
702 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
|
703 SET_PER_BUFFER_VALUE_P (b, i, 0); |
333 | 704 |
705 /* For each slot that has a default value, | |
706 copy that into the slot. */ | |
707 | |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
708 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
|
709 offset < sizeof *b; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
710 offset += sizeof (Lisp_Object)) |
9362
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
711 { |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
712 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
|
713 if ((idx > 0 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
714 && (permanent_too |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
715 || buffer_permanent_local_flags[idx] == 0)) |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
716 /* Is -2 used anywhere? */ |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
717 || idx == -2) |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
718 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
|
719 } |
333 | 720 } |
721 | |
392 | 722 /* We split this away from generate-new-buffer, because rename-buffer |
723 and set-visited-file-name ought to be able to use this to really | |
724 rename the buffer properly. */ | |
725 | |
726 DEFUN ("generate-new-buffer-name", Fgenerate_new_buffer_name, Sgenerate_new_buffer_name, | |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
727 1, 2, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
728 doc: /* Return a string that is the name of no existing buffer based on NAME. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
729 If there is no live buffer named NAME, then return NAME. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
730 Otherwise modify name by appending `<NUMBER>', incrementing NUMBER |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
731 until an unused name is found, and then return that name. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
732 Optional second argument IGNORE specifies a name that is okay to use |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
733 \(if it is in the sequence to be tried) |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
734 even if a buffer with that name exists. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
735 (name, ignore) |
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
736 register Lisp_Object name, ignore; |
333 | 737 { |
738 register Lisp_Object gentemp, tem; | |
739 int count; | |
740 char number[10]; | |
741 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
742 CHECK_STRING (name); |
333 | 743 |
744 tem = Fget_buffer (name); | |
485 | 745 if (NILP (tem)) |
392 | 746 return name; |
333 | 747 |
748 count = 1; | |
749 while (1) | |
750 { | |
751 sprintf (number, "<%d>", ++count); | |
752 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
|
753 tem = Fstring_equal (gentemp, ignore); |
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
754 if (!NILP (tem)) |
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
755 return gentemp; |
333 | 756 tem = Fget_buffer (gentemp); |
485 | 757 if (NILP (tem)) |
392 | 758 return gentemp; |
333 | 759 } |
760 } | |
761 | |
762 | |
763 DEFUN ("buffer-name", Fbuffer_name, Sbuffer_name, 0, 1, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
764 doc: /* Return the name of BUFFER, as a string. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
765 With no argument or nil as argument, return the name of the current buffer. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
766 (buffer) |
333 | 767 register Lisp_Object buffer; |
768 { | |
485 | 769 if (NILP (buffer)) |
333 | 770 return current_buffer->name; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
771 CHECK_BUFFER (buffer); |
333 | 772 return XBUFFER (buffer)->name; |
773 } | |
774 | |
775 DEFUN ("buffer-file-name", Fbuffer_file_name, Sbuffer_file_name, 0, 1, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
776 doc: /* Return name of file BUFFER is visiting, or nil if none. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
777 No argument or nil as argument means use the current buffer. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
778 (buffer) |
333 | 779 register Lisp_Object buffer; |
780 { | |
485 | 781 if (NILP (buffer)) |
333 | 782 return current_buffer->filename; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
783 CHECK_BUFFER (buffer); |
333 | 784 return XBUFFER (buffer)->filename; |
785 } | |
786 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
787 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
|
788 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
789 doc: /* Return the base buffer of indirect buffer BUFFER. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
790 If BUFFER is not indirect, return nil. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
791 (buffer) |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
792 register Lisp_Object buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
793 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
794 struct buffer *base; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
795 Lisp_Object base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
796 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
797 if (NILP (buffer)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
798 base = current_buffer->base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
799 else |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
800 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
801 CHECK_BUFFER (buffer); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
802 base = XBUFFER (buffer)->base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
803 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
804 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
805 if (! base) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
806 return Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
807 XSETBUFFER (base_buffer, base); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
808 return base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
809 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
810 |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
811 DEFUN ("buffer-local-value", Fbuffer_local_value, |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
812 Sbuffer_local_value, 2, 2, 0, |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
813 doc: /* Return the value of VARIABLE in BUFFER. |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
814 If VARIABLE does not have a buffer-local binding in BUFFER, the value |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
815 is the default binding of variable. */) |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
816 (symbol, buffer) |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
817 register Lisp_Object symbol; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
818 register Lisp_Object buffer; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
819 { |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
820 register struct buffer *buf; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
821 register Lisp_Object result; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
822 |
40735
d3065bec433f
(Fbuffer_local_value): Remove extra args from CHECK_SYMBOL and CHECK_BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
40725
diff
changeset
|
823 CHECK_SYMBOL (symbol); |
d3065bec433f
(Fbuffer_local_value): Remove extra args from CHECK_SYMBOL and CHECK_BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
40725
diff
changeset
|
824 CHECK_BUFFER (buffer); |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
825 buf = XBUFFER (buffer); |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
826 |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
827 /* Look in local_var_list */ |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
828 result = Fassoc (symbol, buf->local_var_alist); |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
829 if (NILP (result)) |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
830 { |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
831 int offset, idx; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
832 int found = 0; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
833 |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
834 /* Look in special slots */ |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
835 for (offset = PER_BUFFER_VAR_OFFSET (name); |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
836 offset < sizeof (struct buffer); |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
837 /* sizeof EMACS_INT == sizeof Lisp_Object */ |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
838 offset += (sizeof (EMACS_INT))) |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
839 { |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
840 idx = PER_BUFFER_IDX (offset); |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
841 if ((idx == -1 || PER_BUFFER_VALUE_P (buf, idx)) |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
842 && SYMBOLP (PER_BUFFER_SYMBOL (offset)) |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
843 && EQ (PER_BUFFER_SYMBOL (offset), symbol)) |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
844 { |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
845 result = PER_BUFFER_VALUE (buf, offset); |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
846 found = 1; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
847 break; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
848 } |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
849 } |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
850 |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
851 if (!found) |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
852 result = Fdefault_value (symbol); |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
853 } |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
854 else |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
855 result = XCDR (result); |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
856 |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
857 if (EQ (result, Qunbound)) |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
858 return Fsignal (Qvoid_variable, Fcons (symbol, Qnil)); |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
859 |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
860 return result; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
861 } |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
862 |
333 | 863 DEFUN ("buffer-local-variables", Fbuffer_local_variables, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
864 Sbuffer_local_variables, 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
865 doc: /* Return an alist of variables that are buffer-local in BUFFER. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
866 Most elements look like (SYMBOL . VALUE), describing one variable. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
867 For a symbol that is locally unbound, just the symbol appears in the value. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
868 Note that storing new VALUEs in these elements doesn't change the variables. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
869 No argument or nil as argument means use current buffer as BUFFER. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
870 (buffer) |
333 | 871 register Lisp_Object buffer; |
872 { | |
873 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
|
874 register Lisp_Object result; |
333 | 875 |
485 | 876 if (NILP (buffer)) |
333 | 877 buf = current_buffer; |
878 else | |
879 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
880 CHECK_BUFFER (buffer); |
333 | 881 buf = XBUFFER (buffer); |
882 } | |
883 | |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
884 result = Qnil; |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
885 |
333 | 886 { |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
887 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
|
888 for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail)) |
333 | 889 { |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
890 Lisp_Object val, elt; |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
891 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
892 elt = XCAR (tail); |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
893 |
10505
4f7f9b9ff513
(syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents:
10443
diff
changeset
|
894 /* 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
|
895 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
|
896 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
|
897 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
|
898 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
|
899 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
|
900 /* 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
|
901 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
|
902 val = XCDR (elt); |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
903 |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
904 /* 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
|
905 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
|
906 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
|
907 /* 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
|
908 else |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
909 result = Fcons (Fcons (XCAR (elt), val), result); |
333 | 910 } |
911 } | |
912 | |
913 /* Add on all the variables stored in special slots. */ | |
914 { | |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
915 int offset, idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
916 |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
917 for (offset = PER_BUFFER_VAR_OFFSET (name); |
333 | 918 offset < sizeof (struct buffer); |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
919 /* sizeof EMACS_INT == sizeof Lisp_Object */ |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
920 offset += (sizeof (EMACS_INT))) |
333 | 921 { |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
922 idx = PER_BUFFER_IDX (offset); |
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
923 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
|
924 && SYMBOLP (PER_BUFFER_SYMBOL (offset))) |
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
925 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
|
926 PER_BUFFER_VALUE (buf, offset)), |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
927 result); |
333 | 928 } |
929 } | |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
930 |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
931 return result; |
333 | 932 } |
933 | |
934 | |
935 DEFUN ("buffer-modified-p", Fbuffer_modified_p, Sbuffer_modified_p, | |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
936 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
937 doc: /* Return t if BUFFER was modified since its file was last read or saved. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
938 No argument or nil as argument means use current buffer as BUFFER. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
939 (buffer) |
333 | 940 register Lisp_Object buffer; |
941 { | |
942 register struct buffer *buf; | |
485 | 943 if (NILP (buffer)) |
333 | 944 buf = current_buffer; |
945 else | |
946 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
947 CHECK_BUFFER (buffer); |
333 | 948 buf = XBUFFER (buffer); |
949 } | |
950 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
951 return BUF_SAVE_MODIFF (buf) < BUF_MODIFF (buf) ? Qt : Qnil; |
333 | 952 } |
953 | |
954 DEFUN ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p, | |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
955 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
956 doc: /* Mark current buffer as modified or unmodified according to FLAG. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
957 A non-nil FLAG means mark the buffer modified. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
958 (flag) |
333 | 959 register Lisp_Object flag; |
960 { | |
961 register int already; | |
962 register Lisp_Object fn; | |
28207
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
963 Lisp_Object buffer, window; |
333 | 964 |
965 #ifdef CLASH_DETECTION | |
966 /* If buffer becoming modified, lock the file. | |
967 If buffer becoming unmodified, unlock the file. */ | |
968 | |
11659
f9b6e65774e7
(Fset_buffer_modified_p): Use the truename for locking.
Richard M. Stallman <rms@gnu.org>
parents:
11473
diff
changeset
|
969 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
|
970 /* 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
|
971 if (!NILP (fn) && ! NILP (current_buffer->filename)) |
333 | 972 { |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
973 already = SAVE_MODIFF < MODIFF; |
485 | 974 if (!already && !NILP (flag)) |
333 | 975 lock_file (fn); |
485 | 976 else if (already && NILP (flag)) |
333 | 977 unlock_file (fn); |
978 } | |
979 #endif /* CLASH_DETECTION */ | |
980 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
981 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
|
982 |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
983 /* 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
|
984 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
|
985 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
|
986 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
|
987 (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
|
988 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
|
989 update_modes_lines unconditionally. |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
990 |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
991 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
|
992 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
|
993 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
|
994 XSETBUFFER (buffer, current_buffer); |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
995 window = Fget_buffer_window (buffer, Qt); |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
996 if (WINDOWP (window)) |
35339
e5e6579e8308
(Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents:
34488
diff
changeset
|
997 { |
e5e6579e8308
(Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents:
34488
diff
changeset
|
998 ++update_mode_lines; |
e5e6579e8308
(Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents:
34488
diff
changeset
|
999 current_buffer->prevent_redisplay_optimizations_p = 1; |
e5e6579e8308
(Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents:
34488
diff
changeset
|
1000 } |
28207
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1001 |
333 | 1002 return flag; |
1003 } | |
1004 | |
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1005 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
|
1006 Srestore_buffer_modified_p, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1007 doc: /* Like `set-buffer-modified-p', with a differences concerning redisplay. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1008 It is not ensured that mode lines will be updated to show the modified |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1009 state of the current buffer. Use with care. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1010 (flag) |
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1011 Lisp_Object flag; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1012 { |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1013 #ifdef CLASH_DETECTION |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1014 Lisp_Object fn; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1015 |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1016 /* If buffer becoming modified, lock the file. |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1017 If buffer becoming unmodified, unlock the file. */ |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1018 |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1019 fn = current_buffer->file_truename; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1020 /* 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
|
1021 if (!NILP (fn) && ! NILP (current_buffer->filename)) |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1022 { |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1023 int already = SAVE_MODIFF < MODIFF; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1024 if (!already && !NILP (flag)) |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1025 lock_file (fn); |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1026 else if (already && NILP (flag)) |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1027 unlock_file (fn); |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1028 } |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1029 #endif /* CLASH_DETECTION */ |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1030 |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1031 SAVE_MODIFF = NILP (flag) ? MODIFF : 0; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1032 return flag; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1033 } |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1034 |
333 | 1035 DEFUN ("buffer-modified-tick", Fbuffer_modified_tick, Sbuffer_modified_tick, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
1036 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1037 doc: /* Return BUFFER's tick counter, incremented for each change in text. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1038 Each buffer has a tick counter which is incremented each time the text in |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1039 that buffer is changed. It wraps around occasionally. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1040 No argument or nil as argument means use current buffer as BUFFER. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1041 (buffer) |
333 | 1042 register Lisp_Object buffer; |
1043 { | |
1044 register struct buffer *buf; | |
485 | 1045 if (NILP (buffer)) |
333 | 1046 buf = current_buffer; |
1047 else | |
1048 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
1049 CHECK_BUFFER (buffer); |
333 | 1050 buf = XBUFFER (buffer); |
1051 } | |
1052 | |
1053 return make_number (BUF_MODIFF (buf)); | |
1054 } | |
1055 | |
392 | 1056 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
|
1057 "sRename buffer (to new name): \nP", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1058 doc: /* Change current buffer's name to NEWNAME (a string). |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1059 If second arg UNIQUE is nil or omitted, it is an error if a |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1060 buffer named NEWNAME already exists. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1061 If UNIQUE is non-nil, come up with a new name using |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1062 `generate-new-buffer-name'. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1063 Interactively, you can set UNIQUE with a prefix argument. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1064 We return the name we actually gave the buffer. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1065 This does not change the name of the visited file (if any). */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1066 (newname, unique) |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1067 register Lisp_Object newname, unique; |
333 | 1068 { |
1069 register Lisp_Object tem, buf; | |
1070 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
1071 CHECK_STRING (newname); |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1072 |
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1073 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
|
1074 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
|
1075 |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1076 tem = Fget_buffer (newname); |
485 | 1077 if (!NILP (tem)) |
392 | 1078 { |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
1079 /* 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
|
1080 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
|
1081 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
|
1082 (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
|
1083 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
|
1084 return current_buffer->name; |
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
1085 if (!NILP (unique)) |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1086 newname = Fgenerate_new_buffer_name (newname, current_buffer->name); |
392 | 1087 else |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1088 error ("Buffer name `%s' is in use", XSTRING (newname)->data); |
392 | 1089 } |
333 | 1090 |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1091 current_buffer->name = newname; |
1707
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
1092 |
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
1093 /* 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
|
1094 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
|
1095 update_mode_lines++; |
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
1096 |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
1097 XSETBUFFER (buf, current_buffer); |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1098 Fsetcar (Frassq (buf, Vbuffer_alist), newname); |
8599
cf3233d70e94
(Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents:
8550
diff
changeset
|
1099 if (NILP (current_buffer->filename) |
cf3233d70e94
(Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents:
8550
diff
changeset
|
1100 && !NILP (current_buffer->auto_save_file_name)) |
333 | 1101 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
|
1102 /* 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
|
1103 return current_buffer->name; |
333 | 1104 } |
1105 | |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1106 DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 3, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1107 doc: /* Return most recently selected buffer other than BUFFER. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1108 Buffers not visible in windows are preferred to visible buffers, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1109 unless optional second argument VISIBLE-OK is non-nil. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1110 If the optional third argument FRAME is non-nil, use that frame's |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1111 buffer list instead of the selected frame's buffer list. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1112 If no other buffer exists, the buffer `*scratch*' is returned. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1113 If BUFFER is omitted or nil, some interesting buffer is returned. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1114 (buffer, visible_ok, frame) |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1115 register Lisp_Object buffer, visible_ok, frame; |
333 | 1116 { |
14226
ad275aca6fc5
(Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1117 Lisp_Object Fset_buffer_major_mode (); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1118 register Lisp_Object tail, buf, notsogood, tem, pred, add_ons; |
333 | 1119 notsogood = Qnil; |
1120 | |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1121 if (NILP (frame)) |
25664
832aeb9c3996
(Fother_buffer): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25653
diff
changeset
|
1122 frame = selected_frame; |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1123 |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1124 tail = Vbuffer_alist; |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1125 pred = frame_buffer_predicate (frame); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1126 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1127 /* 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
|
1128 before other buffers. */ |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1129 |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1130 tem = frame_buffer_list (frame); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1131 add_ons = Qnil; |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1132 while (CONSP (tem)) |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1133 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1134 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
|
1135 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
|
1136 tem = XCDR (tem); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1137 } |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1138 tail = nconc2 (Fnreverse (add_ons), tail); |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1139 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1140 for (; !NILP (tail); tail = Fcdr (tail)) |
333 | 1141 { |
1142 buf = Fcdr (Fcar (tail)); | |
1143 if (EQ (buf, buffer)) | |
1144 continue; | |
1145 if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ') | |
1146 continue; | |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1147 /* 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
|
1148 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
|
1149 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
|
1150 { |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1151 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
|
1152 if (NILP (tem)) |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1153 continue; |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1154 } |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1155 |
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
1156 if (NILP (visible_ok)) |
31395
d0f522cf422b
(Fother_buffer): Consider buffers as invisible when
Gerd Moellmann <gerd@gnu.org>
parents:
31128
diff
changeset
|
1157 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
|
1158 else |
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
1159 tem = Qnil; |
485 | 1160 if (NILP (tem)) |
333 | 1161 return buf; |
485 | 1162 if (NILP (notsogood)) |
333 | 1163 notsogood = buf; |
1164 } | |
485 | 1165 if (!NILP (notsogood)) |
333 | 1166 return notsogood; |
27480
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1167 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
|
1168 if (NILP (buf)) |
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1169 { |
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1170 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
|
1171 Fset_buffer_major_mode (buf); |
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1172 } |
14226
ad275aca6fc5
(Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1173 return buf; |
333 | 1174 } |
1175 | |
12110
d7d7f15f3a92
(Fbuffer_disable_undo): Make this function interactive.
Karl Heuer <kwzh@gnu.org>
parents:
12101
diff
changeset
|
1176 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
|
1177 0, 1, "", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1178 doc: /* Make BUFFER stop keeping undo information. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1179 No argument or nil as argument means do this for the current buffer. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1180 (buffer) |
648 | 1181 register Lisp_Object buffer; |
333 | 1182 { |
648 | 1183 Lisp_Object real_buffer; |
1184 | |
1185 if (NILP (buffer)) | |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
1186 XSETBUFFER (real_buffer, current_buffer); |
648 | 1187 else |
1188 { | |
1189 real_buffer = Fget_buffer (buffer); | |
1190 if (NILP (real_buffer)) | |
1191 nsberror (buffer); | |
1192 } | |
1193 | |
1194 XBUFFER (real_buffer)->undo_list = Qt; | |
1195 | |
333 | 1196 return Qnil; |
1197 } | |
1198 | |
1199 DEFUN ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo, | |
1200 0, 1, "", | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1201 doc: /* Start keeping undo information for buffer BUFFER. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1202 No argument or nil as argument means do this for the current buffer. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1203 (buffer) |
648 | 1204 register Lisp_Object buffer; |
333 | 1205 { |
648 | 1206 Lisp_Object real_buffer; |
333 | 1207 |
648 | 1208 if (NILP (buffer)) |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
1209 XSETBUFFER (real_buffer, current_buffer); |
333 | 1210 else |
1211 { | |
648 | 1212 real_buffer = Fget_buffer (buffer); |
1213 if (NILP (real_buffer)) | |
1214 nsberror (buffer); | |
333 | 1215 } |
1216 | |
648 | 1217 if (EQ (XBUFFER (real_buffer)->undo_list, Qt)) |
1218 XBUFFER (real_buffer)->undo_list = Qnil; | |
333 | 1219 |
1220 return Qnil; | |
1221 } | |
1222 | |
1223 /* | |
1224 DEFVAR_LISP ("kill-buffer-hook", no_cell, "\ | |
1225 Hook to be run (by `run-hooks', which see) when a buffer is killed.\n\ | |
1226 The buffer being killed will be current while the hook is running.\n\ | |
1227 See `kill-buffer'." | |
1228 */ | |
1229 DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 1, 1, "bKill buffer: ", | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1230 doc: /* Kill the buffer BUFFER. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1231 The argument may be a buffer or may be the name of a buffer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1232 An argument of nil means kill the current buffer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1233 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1234 Value is t if the buffer is actually killed, nil if user says no. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1235 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1236 The value of `kill-buffer-hook' (which may be local to that buffer), |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1237 if not void, is a list of functions to be called, with no arguments, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1238 before the buffer is actually killed. The buffer to be killed is current |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1239 when the hook functions are called. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1240 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1241 Any processes that have this buffer as the `process-buffer' are killed |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1242 with SIGHUP. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1243 (buffer) |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1244 Lisp_Object buffer; |
333 | 1245 { |
1246 Lisp_Object buf; | |
1247 register struct buffer *b; | |
1248 register Lisp_Object tem; | |
1249 register struct Lisp_Marker *m; | |
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
1250 struct gcpro gcpro1; |
333 | 1251 |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1252 if (NILP (buffer)) |
333 | 1253 buf = Fcurrent_buffer (); |
1254 else | |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1255 buf = Fget_buffer (buffer); |
485 | 1256 if (NILP (buf)) |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1257 nsberror (buffer); |
333 | 1258 |
1259 b = XBUFFER (buf); | |
1260 | |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1261 /* Avoid trouble for buffer already dead. */ |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1262 if (NILP (b->name)) |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1263 return Qnil; |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1264 |
333 | 1265 /* Query if the buffer is still modified. */ |
485 | 1266 if (INTERACTIVE && !NILP (b->filename) |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1267 && BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) |
333 | 1268 { |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1269 GCPRO1 (buf); |
333 | 1270 tem = do_yes_or_no_p (format1 ("Buffer %s modified; kill anyway? ", |
1271 XSTRING (b->name)->data)); | |
1272 UNGCPRO; | |
485 | 1273 if (NILP (tem)) |
333 | 1274 return Qnil; |
1275 } | |
1276 | |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1277 /* Run hooks with the buffer to be killed the current buffer. */ |
333 | 1278 { |
1279 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
|
1280 Lisp_Object list; |
333 | 1281 |
1282 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
1283 set_buffer_internal (b); | |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1284 |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1285 /* 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
|
1286 don't kill the buffer. */ |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1287 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
|
1288 { |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1289 tem = call0 (Fcar (list)); |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1290 if (NILP (tem)) |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1291 return unbind_to (count, Qnil); |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1292 } |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1293 |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1294 /* Then run the hooks. */ |
41524
095a45698793
(Fkill_buffer): Use Frun_hooks, not Vrun_hooks.
Richard M. Stallman <rms@gnu.org>
parents:
41027
diff
changeset
|
1295 Frun_hooks (1, &Qkill_buffer_hook); |
333 | 1296 unbind_to (count, Qnil); |
1297 } | |
1298 | |
1299 /* We have no more questions to ask. Verify that it is valid | |
1300 to kill the buffer. This must be done after the questions | |
1301 since anything can happen within do_yes_or_no_p. */ | |
1302 | |
1303 /* Don't kill the minibuffer now current. */ | |
1304 if (EQ (buf, XWINDOW (minibuf_window)->buffer)) | |
1305 return Qnil; | |
1306 | |
485 | 1307 if (NILP (b->name)) |
333 | 1308 return Qnil; |
1309 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1310 /* 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
|
1311 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
|
1312 ask questions or their hooks get errors. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1313 if (! b->base_buffer) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1314 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1315 struct buffer *other; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1316 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1317 GCPRO1 (buf); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1318 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1319 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
|
1320 /* all_buffers contains dead buffers too; |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1321 don't re-kill them. */ |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1322 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
|
1323 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1324 Lisp_Object buf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1325 XSETBUFFER (buf, other); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1326 Fkill_buffer (buf); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1327 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1328 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1329 UNGCPRO; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1330 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1331 |
333 | 1332 /* Make this buffer not be current. |
1333 In the process, notice if this is the sole visible buffer | |
1334 and give up if so. */ | |
1335 if (b == current_buffer) | |
1336 { | |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1337 tem = Fother_buffer (buf, Qnil, Qnil); |
333 | 1338 Fset_buffer (tem); |
1339 if (b == current_buffer) | |
1340 return Qnil; | |
1341 } | |
1342 | |
33698
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1343 /* 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
|
1344 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
|
1345 XSETBUFFER (tem, current_buffer); |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1346 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
|
1347 { |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1348 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
|
1349 if (EQ (buf, tem)) |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1350 return Qnil; |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1351 } |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1352 |
333 | 1353 /* Now there is no question: we can kill the buffer. */ |
1354 | |
1355 #ifdef CLASH_DETECTION | |
1356 /* Unlock this buffer's file, if it is locked. */ | |
1357 unlock_buffer (b); | |
1358 #endif /* CLASH_DETECTION */ | |
1359 | |
1360 kill_buffer_processes (buf); | |
1361 | |
1362 tem = Vinhibit_quit; | |
1363 Vinhibit_quit = Qt; | |
13922
5636ed4243ec
(Fkill_buffer): Delete buffer from Vbuffer_alist after replacing it.
Erik Naggum <erik@naggum.no>
parents:
13917
diff
changeset
|
1364 replace_buffer_in_all_windows (buf); |
333 | 1365 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
|
1366 frames_discard_buffer (buf); |
333 | 1367 Vinhibit_quit = tem; |
1368 | |
40760
aa9b081b3a0d
(Fkill_buffer): Don't delete auto save file if buffer is modified.
Richard M. Stallman <rms@gnu.org>
parents:
40735
diff
changeset
|
1369 /* Delete any auto-save file, if we saved it in this session. |
aa9b081b3a0d
(Fkill_buffer): Don't delete auto save file if buffer is modified.
Richard M. Stallman <rms@gnu.org>
parents:
40735
diff
changeset
|
1370 But not if the buffer is modified. */ |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1371 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
|
1372 && b->auto_save_modified != 0 |
40760
aa9b081b3a0d
(Fkill_buffer): Don't delete auto save file if buffer is modified.
Richard M. Stallman <rms@gnu.org>
parents:
40735
diff
changeset
|
1373 && BUF_SAVE_MODIFF (b) < b->auto_save_modified |
aa9b081b3a0d
(Fkill_buffer): Don't delete auto save file if buffer is modified.
Richard M. Stallman <rms@gnu.org>
parents:
40735
diff
changeset
|
1374 && BUF_SAVE_MODIFF (b) < BUF_MODIFF (b)) |
333 | 1375 { |
1376 Lisp_Object tem; | |
1377 tem = Fsymbol_value (intern ("delete-auto-save-files")); | |
485 | 1378 if (! NILP (tem)) |
10082
8d3a71736423
(Fkill_buffer): Use internal_delete_file.
Richard M. Stallman <rms@gnu.org>
parents:
9950
diff
changeset
|
1379 internal_delete_file (b->auto_save_file_name); |
333 | 1380 } |
1381 | |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1382 if (b->base_buffer) |
333 | 1383 { |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1384 /* 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
|
1385 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
|
1386 or its other indirect buffers. */ |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1387 for (tem = BUF_MARKERS (b); !NILP (tem); ) |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1388 { |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1389 Lisp_Object next; |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1390 m = XMARKER (tem); |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1391 next = m->chain; |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1392 if (m->buffer == b) |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1393 unchain_marker (tem); |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1394 tem = next; |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1395 } |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1396 } |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1397 else |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1398 { |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1399 /* 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
|
1400 and leave them pointing nowhere. */ |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1401 for (tem = BUF_MARKERS (b); !NILP (tem); ) |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1402 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1403 m = XMARKER (tem); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1404 m->buffer = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1405 tem = m->chain; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1406 m->chain = Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1407 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1408 BUF_MARKERS (b) = Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1409 BUF_INTERVALS (b) = NULL_INTERVAL; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1410 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1411 /* Perhaps we should explicitly free the interval tree here... */ |
333 | 1412 } |
1291
7c32612174c3
* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents:
1281
diff
changeset
|
1413 |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1414 /* 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
|
1415 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
|
1416 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
|
1417 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
|
1418 swap_out_buffer_local_variables (b); |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
1419 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
|
1420 |
333 | 1421 b->name = Qnil; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1422 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
1423 BLOCK_INPUT; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1424 if (! b->base_buffer) |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
1425 free_buffer_text (b); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1426 |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1427 if (b->newline_cache) |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1428 { |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1429 free_region_cache (b->newline_cache); |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1430 b->newline_cache = 0; |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1431 } |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1432 if (b->width_run_cache) |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1433 { |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1434 free_region_cache (b->width_run_cache); |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1435 b->width_run_cache = 0; |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1436 } |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1437 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
|
1438 UNBLOCK_INPUT; |
333 | 1439 b->undo_list = Qnil; |
1440 | |
1441 return Qt; | |
1442 } | |
1443 | |
550 | 1444 /* Move the assoc for buffer BUF to the front of buffer-alist. Since |
1445 we do this each time BUF is selected visibly, the more recently | |
1446 selected buffers are always closer to the front of the list. This | |
1447 means that other_buffer is more likely to choose a relevant buffer. */ | |
333 | 1448 |
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
1449 void |
333 | 1450 record_buffer (buf) |
1451 Lisp_Object buf; | |
1452 { | |
1453 register Lisp_Object link, prev; | |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1454 Lisp_Object frame; |
25664
832aeb9c3996
(Fother_buffer): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25653
diff
changeset
|
1455 frame = selected_frame; |
333 | 1456 |
1457 prev = Qnil; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1458 for (link = Vbuffer_alist; CONSP (link); link = XCDR (link)) |
333 | 1459 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1460 if (EQ (XCDR (XCAR (link)), buf)) |
333 | 1461 break; |
1462 prev = link; | |
1463 } | |
1464 | |
550 | 1465 /* Effectively do Vbuffer_alist = Fdelq (link, Vbuffer_alist); |
1466 we cannot use Fdelq itself here because it allows quitting. */ | |
333 | 1467 |
485 | 1468 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
|
1469 Vbuffer_alist = XCDR (Vbuffer_alist); |
333 | 1470 else |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
1471 XSETCDR (prev, XCDR (XCDR (prev))); |
333 | 1472 |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
1473 XSETCDR (link, Vbuffer_alist); |
333 | 1474 Vbuffer_alist = link; |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1475 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1476 /* 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
|
1477 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1478 prev = Qnil; |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1479 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
|
1480 link = XCDR (link)) |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1481 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1482 if (EQ (XCAR (link), buf)) |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1483 break; |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1484 prev = link; |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1485 } |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1486 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1487 /* Effectively do delq. */ |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1488 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1489 if (CONSP (link)) |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1490 { |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1491 if (NILP (prev)) |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1492 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
|
1493 XCDR (frame_buffer_list (frame))); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1494 else |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
1495 XSETCDR (prev, XCDR (XCDR (prev))); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1496 |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
1497 XSETCDR (link, frame_buffer_list (frame)); |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1498 set_frame_buffer_list (frame, link); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1499 } |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1500 else |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1501 set_frame_buffer_list (frame, Fcons (buf, frame_buffer_list (frame))); |
333 | 1502 } |
1503 | |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1504 DEFUN ("set-buffer-major-mode", Fset_buffer_major_mode, Sset_buffer_major_mode, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1505 doc: /* Set an appropriate major mode for BUFFER. |
40605 | 1506 For the *scratch* buffer, use `initial-major-mode', otherwise choose a mode |
39974
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1507 according to `default-major-mode'. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1508 Use this function before selecting the buffer, since it may need to inspect |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1509 the current buffer's major mode. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1510 (buffer) |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1511 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
|
1512 { |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1513 int count; |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1514 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
|
1515 |
39974
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1516 if (STRINGP (XBUFFER (buffer)->name) |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1517 && strcmp (XSTRING (XBUFFER (buffer)->name)->data, "*scratch*") == 0) |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1518 function = find_symbol_value (intern ("initial-major-mode")); |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1519 else |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1520 { |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1521 function = buffer_defaults.major_mode; |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1522 if (NILP (function) |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1523 && NILP (Fget (current_buffer->major_mode, Qmode_class))) |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1524 function = current_buffer->major_mode; |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1525 } |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1526 |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1527 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
|
1528 return Qnil; |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1529 |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1530 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
|
1531 |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1532 /* 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
|
1533 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
|
1534 |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1535 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
|
1536 |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1537 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
|
1538 call0 (function); |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1539 |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1540 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
|
1541 } |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1542 |
25181
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1543 /* 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
|
1544 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
|
1545 |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1546 char * |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1547 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
|
1548 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
|
1549 { |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1550 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
|
1551 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
|
1552 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
|
1553 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
|
1554 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
|
1555 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
|
1556 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
|
1557 } |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1558 |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1559 /* 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
|
1560 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
|
1561 |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1562 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
|
1563 switch_to_buffer_1 (buffer, norecord) |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1564 Lisp_Object buffer, norecord; |
333 | 1565 { |
1566 register Lisp_Object buf; | |
1567 | |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1568 if (NILP (buffer)) |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1569 buf = Fother_buffer (Fcurrent_buffer (), Qnil, Qnil); |
333 | 1570 else |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1571 { |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1572 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
|
1573 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
|
1574 { |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1575 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
|
1576 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
|
1577 } |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1578 } |
333 | 1579 Fset_buffer (buf); |
485 | 1580 if (NILP (norecord)) |
333 | 1581 record_buffer (buf); |
1582 | |
1583 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
|
1584 ? 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
|
1585 : selected_window, |
333 | 1586 buf); |
1587 | |
16840
299b0e0f0a93
Fix typo editing previous change.
Richard M. Stallman <rms@gnu.org>
parents:
16830
diff
changeset
|
1588 return buf; |
333 | 1589 } |
1590 | |
25181
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1591 DEFUN ("switch-to-buffer", Fswitch_to_buffer, Sswitch_to_buffer, 1, 2, "BSwitch to buffer: ", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1592 doc: /* Select buffer BUFFER in the current window. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1593 BUFFER may be a buffer or a buffer name. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1594 Optional second arg NORECORD non-nil means |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1595 do not put this buffer at the front of the list of recently selected ones. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1596 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1597 WARNING: This is NOT the way to work on another buffer temporarily |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1598 within a Lisp program! Use `set-buffer' instead. That avoids messing with |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1599 the window-buffer correspondences. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1600 (buffer, norecord) |
25181
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1601 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
|
1602 { |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1603 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
|
1604 |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1605 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
|
1606 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
|
1607 |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1608 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
|
1609 } |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1610 |
16840
299b0e0f0a93
Fix typo editing previous change.
Richard M. Stallman <rms@gnu.org>
parents:
16830
diff
changeset
|
1611 DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1612 doc: /* Select buffer BUFFER in some window, preferably a different one. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1613 If BUFFER is nil, then some other buffer is chosen. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1614 If `pop-up-windows' is non-nil, windows can be split to do this. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1615 If optional second arg OTHER-WINDOW is non-nil, insist on finding another |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1616 window even if BUFFER is already visible in the selected window. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1617 This uses the function `display-buffer' as a subroutine; see the documentation |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1618 of `display-buffer' for additional customization information. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1619 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1620 Optional third arg NORECORD non-nil means |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1621 do not put this buffer at the front of the list of recently selected ones. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1622 (buffer, other_window, norecord) |
16830
4792e73d511f
(Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents:
16665
diff
changeset
|
1623 Lisp_Object buffer, other_window, norecord; |
333 | 1624 { |
1625 register Lisp_Object buf; | |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1626 if (NILP (buffer)) |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1627 buf = Fother_buffer (Fcurrent_buffer (), Qnil, Qnil); |
333 | 1628 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
|
1629 { |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1630 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
|
1631 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
|
1632 { |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1633 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
|
1634 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
|
1635 } |
3aea65d9eb68
(Fpop_to_buffer): Call Fset_buffer_major_mode if we create a buffer.
Richard M. Stallman <rms@gnu.org>
parents:
10751
diff
changeset
|
1636 } |
333 | 1637 Fset_buffer (buf); |
16830
4792e73d511f
(Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents:
16665
diff
changeset
|
1638 if (NILP (norecord)) |
39802
efbac46c874c
(Fbury_buffer): Don't try to remove the buffer from the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
1639 /* This seems bogus since Fselect_window will call record_buffer anyway. */ |
16830
4792e73d511f
(Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents:
16665
diff
changeset
|
1640 record_buffer (buf); |
20853
58bb74217a10
(Fpop_to_buffer): Pass new arg to Fdisplay_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
20706
diff
changeset
|
1641 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
|
1642 return buf; |
333 | 1643 } |
1644 | |
1645 DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1646 doc: /* Return the current buffer as a Lisp object. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1647 () |
333 | 1648 { |
1649 register Lisp_Object buf; | |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
1650 XSETBUFFER (buf, current_buffer); |
333 | 1651 return buf; |
1652 } | |
1653 | |
25491
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1654 /* Set the current buffer to B. |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1655 |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1656 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
|
1657 global unchanged information in beg_unchanged and end_unchanged. |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1658 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
|
1659 information on a buffer-basis. Every action affecting other |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1660 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
|
1661 time, and that increments windows_or_buffers_changed. */ |
333 | 1662 |
1663 void | |
1664 set_buffer_internal (b) | |
1665 register struct buffer *b; | |
1666 { | |
25368
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
1667 if (current_buffer != b) |
25491
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1668 set_buffer_internal_1 (b); |
11889
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1669 } |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1670 |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1671 /* 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
|
1672 This is used by redisplay. */ |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1673 |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1674 void |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1675 set_buffer_internal_1 (b) |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1676 register struct buffer *b; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1677 { |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1678 register struct buffer *old_buf; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1679 register Lisp_Object tail, valcontents; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1680 Lisp_Object tem; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1681 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
1682 #ifdef USE_MMAP_FOR_BUFFERS |
31416
9b8c5bea5e8d
(set_buffer_internal_1) [REL_ALLOC_MMAP]: If
Gerd Moellmann <gerd@gnu.org>
parents:
31412
diff
changeset
|
1683 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
|
1684 enlarge_buffer_text (b, 0); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
1685 #endif /* USE_MMAP_FOR_BUFFERS */ |
31416
9b8c5bea5e8d
(set_buffer_internal_1) [REL_ALLOC_MMAP]: If
Gerd Moellmann <gerd@gnu.org>
parents:
31412
diff
changeset
|
1686 |
11889
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1687 if (current_buffer == b) |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1688 return; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1689 |
333 | 1690 old_buf = current_buffer; |
1691 current_buffer = b; | |
1692 last_known_column_point = -1; /* invalidate indentation cache */ | |
1693 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1694 if (old_buf) |
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 /* 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
|
1697 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
|
1698 if (old_buf->base_buffer) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1699 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
|
1700 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1701 /* 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
|
1702 when it is not current, update them now. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1703 if (! NILP (old_buf->pt_marker)) |
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 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1706 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1707 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
|
1708 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
|
1709 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1710 if (! NILP (old_buf->begv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1711 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1712 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1713 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1714 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
|
1715 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
|
1716 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1717 if (! NILP (old_buf->zv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1718 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1719 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1720 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1721 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
|
1722 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
|
1723 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1724 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1725 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1726 /* 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
|
1727 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
|
1728 if (b->base_buffer) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1729 b->undo_list = b->base_buffer->undo_list; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1730 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1731 /* 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
|
1732 when it is not current, fetch them now. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1733 if (! NILP (b->pt_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1734 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1735 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
|
1736 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
|
1737 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1738 if (! NILP (b->begv_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1739 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1740 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
|
1741 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
|
1742 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1743 if (! NILP (b->zv_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1744 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1745 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
|
1746 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
|
1747 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1748 |
333 | 1749 /* Look down buffer's list of local Lisp variables |
1750 to find and update any that forward into C variables. */ | |
1751 | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1752 for (tail = b->local_var_alist; !NILP (tail); tail = XCDR (tail)) |
333 | 1753 { |
39581
6d9fa06012a6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
39337
diff
changeset
|
1754 valcontents = SYMBOL_VALUE (XCAR (XCAR (tail))); |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1755 if ((BUFFER_LOCAL_VALUEP (valcontents) |
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1756 || 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
|
1757 && (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
|
1758 (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem)))) |
333 | 1759 /* Just reference the variable |
1760 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
|
1761 Fsymbol_value (XCAR (XCAR (tail))); |
333 | 1762 } |
1763 | |
1764 /* Do the same with any others that were local to the previous buffer */ | |
1765 | |
1766 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
|
1767 for (tail = old_buf->local_var_alist; !NILP (tail); tail = XCDR (tail)) |
333 | 1768 { |
39581
6d9fa06012a6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
39337
diff
changeset
|
1769 valcontents = SYMBOL_VALUE (XCAR (XCAR (tail))); |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1770 if ((BUFFER_LOCAL_VALUEP (valcontents) |
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1771 || 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
|
1772 && (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
|
1773 (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem)))) |
333 | 1774 /* Just reference the variable |
1775 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
|
1776 Fsymbol_value (XCAR (XCAR (tail))); |
333 | 1777 } |
1778 } | |
1779 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1780 /* 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
|
1781 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
|
1782 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1783 void |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1784 set_buffer_temp (b) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1785 struct buffer *b; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1786 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1787 register struct buffer *old_buf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1788 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1789 if (current_buffer == b) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1790 return; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1791 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1792 old_buf = current_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1793 current_buffer = b; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1794 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1795 if (old_buf) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1796 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1797 /* 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
|
1798 when it is not current, update them now. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1799 if (! NILP (old_buf->pt_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1800 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1801 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1802 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1803 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
|
1804 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
|
1805 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1806 if (! NILP (old_buf->begv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1807 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1808 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1809 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1810 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
|
1811 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
|
1812 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1813 if (! NILP (old_buf->zv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1814 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1815 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1816 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1817 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
|
1818 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
|
1819 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1820 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1821 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1822 /* 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
|
1823 when it is not current, fetch them now. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1824 if (! NILP (b->pt_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1825 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1826 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
|
1827 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
|
1828 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1829 if (! NILP (b->begv_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1830 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1831 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
|
1832 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
|
1833 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1834 if (! NILP (b->zv_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1835 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1836 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
|
1837 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
|
1838 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1839 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1840 |
333 | 1841 DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1842 doc: /* Make the buffer BUFFER current for editing operations. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1843 BUFFER may be a buffer or the name of an existing buffer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1844 See also `save-excursion' when you want to make a buffer current temporarily. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1845 This function does not display the buffer, so its effect ends |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1846 when the current command terminates. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1847 Use `switch-to-buffer' or `pop-to-buffer' to switch buffers permanently. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1848 (buffer) |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1849 register Lisp_Object buffer; |
333 | 1850 { |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1851 register Lisp_Object buf; |
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1852 buf = Fget_buffer (buffer); |
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1853 if (NILP (buf)) |
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1854 nsberror (buffer); |
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1855 if (NILP (XBUFFER (buf)->name)) |
333 | 1856 error ("Selecting deleted buffer"); |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1857 set_buffer_internal (XBUFFER (buf)); |
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1858 return buf; |
333 | 1859 } |
20698
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1860 |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1861 /* 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
|
1862 |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1863 Lisp_Object |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1864 set_buffer_if_live (buffer) |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1865 Lisp_Object buffer; |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1866 { |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1867 if (! NILP (XBUFFER (buffer)->name)) |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1868 Fset_buffer (buffer); |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1869 return Qnil; |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1870 } |
333 | 1871 |
1872 DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only, | |
1873 Sbarf_if_buffer_read_only, 0, 0, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1874 doc: /* Signal a `buffer-read-only' error if the current buffer is read-only. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1875 () |
333 | 1876 { |
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
1877 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
|
1878 && NILP (Vinhibit_read_only)) |
333 | 1879 Fsignal (Qbuffer_read_only, (Fcons (Fcurrent_buffer (), Qnil))); |
1880 return Qnil; | |
1881 } | |
1882 | |
1883 DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "", | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1884 doc: /* Put BUFFER at the end of the list of all buffers. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1885 There it is the least likely candidate for `other-buffer' to return; |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1886 thus, the least likely buffer for \\[switch-to-buffer] to select by default. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1887 If BUFFER is nil or omitted, bury the current buffer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1888 Also, if BUFFER is nil or omitted, remove the current buffer from the |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1889 selected window if it is displayed there. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1890 (buffer) |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1891 register Lisp_Object buffer; |
333 | 1892 { |
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1893 /* 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
|
1894 if (NILP (buffer)) |
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1895 { |
39802
efbac46c874c
(Fbury_buffer): Don't try to remove the buffer from the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
1896 Lisp_Object tem; |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1897 XSETBUFFER (buffer, current_buffer); |
18485
d6e8b92585e9
(Fbury_buffer): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18455
diff
changeset
|
1898 |
39802
efbac46c874c
(Fbury_buffer): Don't try to remove the buffer from the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
1899 tem = Fwindow_buffer (selected_window); |
18485
d6e8b92585e9
(Fbury_buffer): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18455
diff
changeset
|
1900 /* If we're burying the current buffer, unshow it. */ |
39802
efbac46c874c
(Fbury_buffer): Don't try to remove the buffer from the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
1901 if (EQ (buffer, tem)) |
40840
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
1902 { |
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
1903 if (NILP (Fwindow_dedicated_p (selected_window))) |
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
1904 Fswitch_to_buffer (Fother_buffer (buffer, Qnil, Qnil), Qnil); |
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
1905 else if (NILP (XWINDOW (selected_window)->parent)) |
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
1906 Ficonify_frame (Fwindow_frame (selected_window)); |
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
1907 else |
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
1908 Fdelete_window (selected_window); |
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
1909 } |
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1910 } |
333 | 1911 else |
1912 { | |
1913 Lisp_Object buf1; | |
1914 | |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1915 buf1 = Fget_buffer (buffer); |
485 | 1916 if (NILP (buf1)) |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1917 nsberror (buffer); |
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1918 buffer = buf1; |
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1919 } |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1920 |
28991
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1921 /* 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
|
1922 buffer is killed. */ |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1923 if (!NILP (XBUFFER (buffer)->name)) |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1924 { |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1925 Lisp_Object aelt, link; |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1926 |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1927 aelt = Frassq (buffer, Vbuffer_alist); |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1928 link = Fmemq (aelt, Vbuffer_alist); |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1929 Vbuffer_alist = Fdelq (aelt, Vbuffer_alist); |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
1930 XSETCDR (link, Qnil); |
28991
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1931 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
|
1932 |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1933 frames_bury_buffer (buffer); |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
1934 } |
17234
bda734eef575
(Fbury_buffer): Call frames_bury_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
17220
diff
changeset
|
1935 |
333 | 1936 return Qnil; |
1937 } | |
1938 | |
1953
714df59790af
(Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents:
1952
diff
changeset
|
1939 DEFUN ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, "*", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1940 doc: /* Delete the entire contents of the current buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1941 Any narrowing restriction in effect (see `narrow-to-region') is removed, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1942 so the buffer is truly empty after this. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1943 () |
333 | 1944 { |
1945 Fwiden (); | |
26056
9c4556ef15de
(Fget_buffer_create, Fmake_indirect_buffer, Fkill_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
25744
diff
changeset
|
1946 |
9c4556ef15de
(Fget_buffer_create, Fmake_indirect_buffer, Fkill_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
25744
diff
changeset
|
1947 del_range (BEG, Z); |
25626
acfb741e6e24
(Ferase_buffer): Don't erase the minibuffer prompt.
Richard M. Stallman <rms@gnu.org>
parents:
25546
diff
changeset
|
1948 |
333 | 1949 current_buffer->last_window_start = 1; |
1950 /* Prevent warnings, or suspension of auto saving, that would happen | |
1951 if future size is less than past size. Use of erase-buffer | |
1952 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
|
1953 XSETFASTINT (current_buffer->save_length, 0); |
333 | 1954 return Qnil; |
1955 } | |
1956 | |
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
1957 void |
333 | 1958 validate_region (b, e) |
1959 register Lisp_Object *b, *e; | |
1960 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
1961 CHECK_NUMBER_COERCE_MARKER (*b); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
1962 CHECK_NUMBER_COERCE_MARKER (*e); |
333 | 1963 |
1964 if (XINT (*b) > XINT (*e)) | |
1965 { | |
9335
8cf58b38d244
(validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents:
9296
diff
changeset
|
1966 Lisp_Object tem; |
8cf58b38d244
(validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents:
9296
diff
changeset
|
1967 tem = *b; *b = *e; *e = tem; |
333 | 1968 } |
1969 | |
1970 if (!(BEGV <= XINT (*b) && XINT (*b) <= XINT (*e) | |
1971 && XINT (*e) <= ZV)) | |
1972 args_out_of_range (*b, *e); | |
1973 } | |
1974 | |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1975 /* 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
|
1976 and return the adjusted position. */ |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1977 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1978 static int |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1979 advance_to_char_boundary (byte_pos) |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1980 int byte_pos; |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1981 { |
21085
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1982 int c; |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1983 |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1984 if (byte_pos == BEG) |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1985 /* 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
|
1986 return 1; |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1987 |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
1988 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
|
1989 if (! CHAR_HEAD_P (c)) |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
1990 { |
25508 | 1991 /* 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
|
1992 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
|
1993 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
|
1994 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1995 do |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1996 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1997 byte_pos--; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
1998 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
|
1999 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2000 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
|
2001 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
|
2002 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
|
2003 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
|
2004 /* 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
|
2005 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
|
2006 not, BYTE_POS was unchanged. */ |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2007 } |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2008 |
20935
2fc5eb0799fe
(advance_to_char_boundary): Make the behaviour
Kenichi Handa <handa@m17n.org>
parents:
20868
diff
changeset
|
2009 return byte_pos; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2010 } |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2011 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2012 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
|
2013 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2014 doc: /* Set the multibyte flag of the current buffer to FLAG. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2015 If FLAG is t, this makes the buffer a multibyte buffer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2016 If FLAG is nil, this makes the buffer a single-byte buffer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2017 The buffer contents remain unchanged as a sequence of bytes |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2018 but the contents viewed as characters do change. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2019 (flag) |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2020 Lisp_Object flag; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2021 { |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2022 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
|
2023 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
|
2024 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
|
2025 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
|
2026 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
|
2027 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
|
2028 |
24240
6ea9058180ec
(Fset_buffer_multibyte): Error if buffer is multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
23760
diff
changeset
|
2029 if (current_buffer->base_buffer) |
6ea9058180ec
(Fset_buffer_multibyte): Error if buffer is multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
23760
diff
changeset
|
2030 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
|
2031 |
21506
a44f9f59c656
(Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
2032 /* Do nothing if nothing actually changes. */ |
a44f9f59c656
(Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
2033 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
|
2034 return flag; |
a44f9f59c656
(Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
2035 |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2036 /* 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
|
2037 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
|
2038 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
|
2039 current_buffer->undo_list = Qt; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2040 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2041 /* 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
|
2042 clear_charpos_cache (current_buffer); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2043 |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2044 if (narrowed) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2045 Fwiden (); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2046 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2047 if (NILP (flag)) |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2048 { |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2049 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
|
2050 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
|
2051 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2052 /* 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
|
2053 to calculate the old correspondences. */ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2054 set_intervals_multibyte (0); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2055 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2056 current_buffer->enable_multibyte_characters = Qnil; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2057 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2058 Z = Z_BYTE; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2059 BEGV = BEGV_BYTE; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2060 ZV = ZV_BYTE; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2061 GPT = GPT_BYTE; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2062 TEMP_SET_PT_BOTH (PT_BYTE, PT_BYTE); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2063 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2064 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
|
2065 while (! NILP (tail)) |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2066 { |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2067 XMARKER (tail)->charpos = XMARKER (tail)->bytepos; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2068 tail = XMARKER (tail)->chain; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2069 } |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2070 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2071 /* 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
|
2072 pos = BEG; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2073 stop = GPT; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2074 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
|
2075 while (1) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2076 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2077 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
|
2078 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2079 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
|
2080 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2081 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
|
2082 break; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2083 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
|
2084 stop = Z; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2085 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2086 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
|
2087 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
|
2088 else |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2089 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2090 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
|
2091 /* 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
|
2092 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
|
2093 code. */ |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2094 bytes--; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2095 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
|
2096 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
|
2097 *p++ = c; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2098 pos++; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2099 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
|
2100 begv -= bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2101 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
|
2102 zv -= bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2103 stop = Z; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2104 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2105 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2106 if (narrowed) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2107 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
|
2108 } |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2109 else |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2110 { |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2111 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
|
2112 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
|
2113 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
|
2114 |
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2115 /* 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
|
2116 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
|
2117 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
|
2118 |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2119 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
|
2120 && ! 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
|
2121 { |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2122 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
|
2123 |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2124 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
|
2125 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
|
2126 { |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2127 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
|
2128 |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2129 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
|
2130 } |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2131 } |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2132 |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2133 /* 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
|
2134 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
|
2135 pos = BEG; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2136 stop = GPT; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2137 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
|
2138 while (1) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2139 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2140 int bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2141 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2142 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
|
2143 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2144 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
|
2145 break; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2146 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
|
2147 stop = Z; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2148 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2149 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2150 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
|
2151 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
|
2152 else |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2153 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2154 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
|
2155 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2156 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
|
2157 *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
|
2158 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
|
2159 bytes--; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2160 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
|
2161 /* 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
|
2162 pos = GPT; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2163 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
|
2164 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
|
2165 begv += bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2166 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
|
2167 zv += bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2168 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
|
2169 pt += bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2170 stop = Z; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2171 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2172 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2173 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2174 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
|
2175 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
|
2176 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2177 if (narrowed) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2178 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
|
2179 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2180 /* 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
|
2181 set_intervals_multibyte needs it too. */ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2182 current_buffer->enable_multibyte_characters = Qt; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2183 |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2184 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
|
2185 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
|
2186 |
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2187 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
|
2188 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2189 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
|
2190 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
|
2191 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
|
2192 else |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2193 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
|
2194 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2195 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
|
2196 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
|
2197 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
|
2198 else |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2199 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
|
2200 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2201 { |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2202 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
|
2203 int pt; |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2204 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2205 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
|
2206 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
|
2207 else |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2208 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
|
2209 TEMP_SET_PT_BOTH (pt, pt_byte); |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2210 } |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2211 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2212 tail = markers = BUF_MARKERS (current_buffer); |
22021 | 2213 |
2214 /* This prevents BYTE_TO_CHAR (that is, buf_bytepos_to_charpos) from | |
2215 getting confused by the markers that have not yet been updated. | |
2216 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
|
2217 BUF_MARKERS (current_buffer) = Qnil; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2218 |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
2219 while (! NILP (tail)) |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2220 { |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2221 XMARKER (tail)->bytepos |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2222 = advance_to_char_boundary (XMARKER (tail)->bytepos); |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2223 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
|
2224 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2225 tail = XMARKER (tail)->chain; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2226 } |
22023
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2227 |
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2228 /* 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
|
2229 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
|
2230 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
|
2231 abort (); |
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2232 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2233 BUF_MARKERS (current_buffer) = markers; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2234 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2235 /* 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
|
2236 between chars and bytes. */ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2237 set_intervals_multibyte (1); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2238 } |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2239 |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2240 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
|
2241 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
|
2242 |
26970
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2243 /* 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
|
2244 showing that buffer must be updated thoroughly. */ |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2245 current_buffer->prevent_redisplay_optimizations_p = 1; |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2246 ++windows_or_buffers_changed; |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2247 |
24604
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
2248 /* 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
|
2249 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
|
2250 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
|
2251 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
|
2252 { |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2253 other->enable_multibyte_characters |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2254 = current_buffer->enable_multibyte_characters; |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2255 other->prevent_redisplay_optimizations_p = 1; |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2256 } |
24604
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
2257 |
29456
1aa0c1122f75
(Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents:
29380
diff
changeset
|
2258 /* 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
|
2259 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
|
2260 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
|
2261 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2262 return flag; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2263 } |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2264 |
333 | 2265 DEFUN ("kill-all-local-variables", Fkill_all_local_variables, Skill_all_local_variables, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
2266 0, 0, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2267 doc: /* Switch to Fundamental mode by killing current buffer's local variables. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2268 Most local variable bindings are eliminated so that the default values |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2269 become effective once more. Also, the syntax table is set from |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2270 `standard-syntax-table', the local keymap is set to nil, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2271 and the abbrev table from `fundamental-mode-abbrev-table'. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2272 This function also forces redisplay of the mode line. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2273 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2274 Every function to select a new major mode starts by |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2275 calling this function. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2276 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2277 As a special exception, local variables whose names have |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2278 a non-nil `permanent-local' property are not eliminated by this function. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2279 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2280 The first thing this function does is run |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2281 the normal hook `change-major-mode-hook'. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2282 () |
333 | 2283 { |
2284 register Lisp_Object alist, sym, tem; | |
2285 Lisp_Object oalist; | |
5873
fa8b769ef564
(Fkill_all_local_variables): Run change-major-mode-hook.
Karl Heuer <kwzh@gnu.org>
parents:
5857
diff
changeset
|
2286 |
6205
88e41d7d1e27
(Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents:
6169
diff
changeset
|
2287 if (!NILP (Vrun_hooks)) |
88e41d7d1e27
(Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents:
6169
diff
changeset
|
2288 call1 (Vrun_hooks, intern ("change-major-mode-hook")); |
333 | 2289 oalist = current_buffer->local_var_alist; |
2290 | |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2291 /* 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
|
2292 remain swapped in, in their symbols. */ |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2293 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2294 swap_out_buffer_local_variables (current_buffer); |
333 | 2295 |
2296 /* Actually eliminate all local bindings of this buffer. */ | |
2297 | |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
2298 reset_buffer_local_variables (current_buffer, 0); |
333 | 2299 |
2300 /* Redisplay mode lines; we are changing major mode. */ | |
2301 | |
2302 update_mode_lines++; | |
2303 | |
2304 /* Any which are supposed to be permanent, | |
2305 make local again, with the same values they had. */ | |
2306 | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2307 for (alist = oalist; !NILP (alist); alist = XCDR (alist)) |
333 | 2308 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2309 sym = XCAR (XCAR (alist)); |
333 | 2310 tem = Fget (sym, Qpermanent_local); |
485 | 2311 if (! NILP (tem)) |
392 | 2312 { |
2313 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
|
2314 Fset (sym, XCDR (XCAR (alist))); |
392 | 2315 } |
333 | 2316 } |
2317 | |
2318 /* Force mode-line redisplay. Useful here because all major mode | |
2319 commands call this function. */ | |
2320 update_mode_lines++; | |
2321 | |
2322 return Qnil; | |
2323 } | |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2324 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2325 /* 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
|
2326 for their current values. */ |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2327 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2328 static void |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2329 swap_out_buffer_local_variables (b) |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2330 struct buffer *b; |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2331 { |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2332 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
|
2333 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2334 XSETBUFFER (buffer, b); |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2335 oalist = b->local_var_alist; |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2336 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2337 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
|
2338 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2339 sym = XCAR (XCAR (alist)); |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2340 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2341 /* Need not do anything if some other buffer's binding is now encached. */ |
39581
6d9fa06012a6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
39337
diff
changeset
|
2342 tem = XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->buffer; |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
2343 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
|
2344 { |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2345 /* 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
|
2346 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
|
2347 |
39581
6d9fa06012a6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
39337
diff
changeset
|
2348 tem = XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->cdr; |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2349 /* 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
|
2350 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
|
2351 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
|
2352 later in Fkill_all_local_variables, we don't lose the value. */ |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
2353 XSETCDR (XCAR (tem), |
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
2354 do_symval_forwarding (XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->realvalue)); |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2355 /* Switch to the symbol's default-value alist entry. */ |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
2356 XSETCAR (tem, tem); |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2357 /* Mark it as current for buffer B. */ |
39581
6d9fa06012a6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
39337
diff
changeset
|
2358 XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->buffer = buffer; |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2359 /* 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
|
2360 store_symval_forwarding (sym, |
39581
6d9fa06012a6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
39337
diff
changeset
|
2361 XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->realvalue, |
36818
c2640df9b55b
(swap_out_buffer_local_variables): Call
Gerd Moellmann <gerd@gnu.org>
parents:
36626
diff
changeset
|
2362 XCDR (tem), NULL); |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2363 } |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2364 } |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2365 } |
333 | 2366 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2367 /* 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
|
2368 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
|
2369 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
|
2370 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
|
2371 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
|
2372 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
|
2373 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
|
2374 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
|
2375 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
|
2376 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2377 *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
|
2378 when this function is called. |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2379 |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2380 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
|
2381 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
|
2382 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
|
2383 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
|
2384 |
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2385 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
|
2386 *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
|
2387 default (BEGV or ZV). */ |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2388 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2389 int |
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2390 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
|
2391 int pos; |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2392 int extend; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2393 Lisp_Object **vec_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2394 int *len_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2395 int *next_ptr; |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2396 int *prev_ptr; |
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2397 int change_req; |
333 | 2398 { |
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
2399 Lisp_Object tail, overlay, start, end; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2400 int idx = 0; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2401 int len = *len_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2402 Lisp_Object *vec = *vec_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2403 int next = ZV; |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2404 int prev = BEGV; |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2405 int inhibit_storing = 0; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2406 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2407 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
|
2408 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
|
2409 tail = XCDR (tail)) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2410 { |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2411 int startpos, endpos; |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2412 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2413 overlay = XCAR (tail); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2414 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2415 start = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2416 end = OVERLAY_END (overlay); |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2417 endpos = OVERLAY_POSITION (end); |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2418 if (endpos < pos) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2419 { |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2420 if (prev < endpos) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2421 prev = endpos; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2422 break; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2423 } |
25184
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2424 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
|
2425 /* 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
|
2426 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
|
2427 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
|
2428 prev = startpos; |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2429 if (endpos == pos) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2430 continue; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2431 if (startpos <= pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2432 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2433 if (idx == len) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2434 { |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2435 /* The supplied vector is full. |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2436 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
|
2437 if (extend) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2438 { |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2439 /* 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
|
2440 len *= 2; |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2441 if (len == 0) |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2442 len = 4; |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2443 *len_ptr = len; |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2444 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
|
2445 *vec_ptr = vec; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2446 } |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2447 else |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2448 inhibit_storing = 1; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2449 } |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2450 |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2451 if (!inhibit_storing) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2452 vec[idx] = overlay; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2453 /* 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
|
2454 idx++; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2455 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2456 else if (startpos < next) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2457 next = startpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2458 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2459 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2460 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
|
2461 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
|
2462 tail = XCDR (tail)) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2463 { |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2464 int startpos, endpos; |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2465 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2466 overlay = XCAR (tail); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2467 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2468 start = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2469 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2470 startpos = OVERLAY_POSITION (start); |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2471 if (pos < startpos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2472 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2473 if (startpos < next) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2474 next = startpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2475 break; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2476 } |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2477 endpos = OVERLAY_POSITION (end); |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2478 if (pos < endpos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2479 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2480 if (idx == len) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2481 { |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2482 if (extend) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2483 { |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2484 *len_ptr = len *= 2; |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2485 if (len == 0) |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2486 len = *len_ptr = 4; |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2487 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
|
2488 *vec_ptr = vec; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2489 } |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2490 else |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2491 inhibit_storing = 1; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2492 } |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2493 |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2494 if (!inhibit_storing) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2495 vec[idx] = overlay; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2496 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
|
2497 |
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2498 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
|
2499 prev = startpos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2500 } |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2501 else if (endpos < pos && endpos > prev) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2502 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
|
2503 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
|
2504 && (!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
|
2505 prev = startpos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2506 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2507 |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2508 if (next_ptr) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2509 *next_ptr = next; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2510 if (prev_ptr) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2511 *prev_ptr = prev; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2512 return idx; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2513 } |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2514 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2515 /* 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
|
2516 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
|
2517 |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2518 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
|
2519 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
|
2520 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
|
2521 or ZV if there are no more overlays. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2522 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
|
2523 or BEGV if there are no previous overlays. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2524 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
|
2525 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2526 *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
|
2527 when this function is called. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2528 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2529 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
|
2530 If EXTEND is zero, we never extend the vector, |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2531 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
|
2532 But we still return the total number of overlays. */ |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2533 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2534 int |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2535 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
|
2536 int beg, end; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2537 int extend; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2538 Lisp_Object **vec_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2539 int *len_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2540 int *next_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2541 int *prev_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2542 { |
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
2543 Lisp_Object tail, overlay, ostart, oend; |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2544 int idx = 0; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2545 int len = *len_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2546 Lisp_Object *vec = *vec_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2547 int next = ZV; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2548 int prev = BEGV; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2549 int inhibit_storing = 0; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2550 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2551 for (tail = current_buffer->overlays_before; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2552 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
|
2553 tail = XCDR (tail)) |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2554 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2555 int startpos, endpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2556 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2557 overlay = XCAR (tail); |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2558 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2559 ostart = OVERLAY_START (overlay); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2560 oend = OVERLAY_END (overlay); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2561 endpos = OVERLAY_POSITION (oend); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2562 if (endpos < beg) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2563 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2564 if (prev < endpos) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2565 prev = endpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2566 break; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2567 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2568 startpos = OVERLAY_POSITION (ostart); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2569 /* 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
|
2570 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
|
2571 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
|
2572 || (startpos == endpos && beg == endpos)) |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2573 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2574 if (idx == len) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2575 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2576 /* The supplied vector is full. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2577 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
|
2578 if (extend) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2579 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2580 *len_ptr = len *= 2; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2581 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2582 *vec_ptr = vec; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2583 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2584 else |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2585 inhibit_storing = 1; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2586 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2587 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2588 if (!inhibit_storing) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2589 vec[idx] = overlay; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2590 /* 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
|
2591 idx++; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2592 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2593 else if (startpos < next) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2594 next = startpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2595 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2596 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2597 for (tail = current_buffer->overlays_after; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2598 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
|
2599 tail = XCDR (tail)) |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2600 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2601 int startpos, endpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2602 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2603 overlay = XCAR (tail); |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2604 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2605 ostart = OVERLAY_START (overlay); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2606 oend = OVERLAY_END (overlay); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2607 startpos = OVERLAY_POSITION (ostart); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2608 if (end < startpos) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2609 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2610 if (startpos < next) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2611 next = startpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2612 break; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2613 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2614 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
|
2615 /* 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
|
2616 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
|
2617 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
|
2618 || (startpos == endpos && beg == endpos)) |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2619 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2620 if (idx == len) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2621 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2622 if (extend) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2623 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2624 *len_ptr = len *= 2; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2625 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2626 *vec_ptr = vec; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2627 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2628 else |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2629 inhibit_storing = 1; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2630 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2631 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2632 if (!inhibit_storing) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2633 vec[idx] = overlay; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2634 idx++; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2635 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2636 else if (endpos < beg && endpos > prev) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2637 prev = endpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2638 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2639 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2640 if (next_ptr) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2641 *next_ptr = next; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2642 if (prev_ptr) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2643 *prev_ptr = prev; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2644 return idx; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2645 } |
36584
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2646 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2647 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2648 /* Return non-zero if there exists an overlay with a non-nil |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2649 `mouse-face' property overlapping OVERLAY. */ |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2650 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2651 int |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2652 mouse_face_overlay_overlaps (overlay) |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2653 Lisp_Object overlay; |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2654 { |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2655 int start = OVERLAY_POSITION (OVERLAY_START (overlay)); |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2656 int end = OVERLAY_POSITION (OVERLAY_END (overlay)); |
37463
7db9a70334b7
(mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents:
37011
diff
changeset
|
2657 int n, i, size; |
36584
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2658 Lisp_Object *v, tem; |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2659 |
37463
7db9a70334b7
(mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents:
37011
diff
changeset
|
2660 size = 10; |
7db9a70334b7
(mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents:
37011
diff
changeset
|
2661 v = (Lisp_Object *) alloca (size * sizeof *v); |
7db9a70334b7
(mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents:
37011
diff
changeset
|
2662 n = overlays_in (start, end, 0, &v, &size, NULL, NULL); |
7db9a70334b7
(mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents:
37011
diff
changeset
|
2663 if (n > size) |
36584
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2664 { |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2665 v = (Lisp_Object *) alloca (n * sizeof *v); |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2666 overlays_in (start, end, 0, &v, &n, NULL, NULL); |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2667 } |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2668 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2669 for (i = 0; i < n; ++i) |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2670 if (!EQ (v[i], overlay) |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2671 && (tem = Foverlay_get (overlay, Qmouse_face), |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2672 !NILP (tem))) |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2673 break; |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2674 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2675 return i < n; |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2676 } |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2677 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2678 |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2679 |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2680 /* 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
|
2681 int |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2682 overlay_touches_p (pos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2683 int pos; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2684 { |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2685 Lisp_Object tail, overlay; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2686 |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2687 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
|
2688 tail = XCDR (tail)) |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2689 { |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2690 int endpos; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2691 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2692 overlay = XCAR (tail); |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2693 if (!GC_OVERLAYP (overlay)) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2694 abort (); |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2695 |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2696 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2697 if (endpos < pos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2698 break; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2699 if (endpos == pos || OVERLAY_POSITION (OVERLAY_START (overlay)) == pos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2700 return 1; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2701 } |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2702 |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2703 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
|
2704 tail = XCDR (tail)) |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2705 { |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2706 int startpos; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2707 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2708 overlay = XCAR (tail); |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2709 if (!GC_OVERLAYP (overlay)) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2710 abort (); |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2711 |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2712 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2713 if (pos < startpos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2714 break; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2715 if (startpos == pos || OVERLAY_POSITION (OVERLAY_END (overlay)) == pos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2716 return 1; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2717 } |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2718 return 0; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2719 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2720 |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2721 struct sortvec |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2722 { |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2723 Lisp_Object overlay; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2724 int beg, end; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2725 int priority; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2726 }; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2727 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2728 static int |
21514 | 2729 compare_overlays (v1, v2) |
2730 const void *v1, *v2; | |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2731 { |
21514 | 2732 const struct sortvec *s1 = (const struct sortvec *) v1; |
2733 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
|
2734 if (s1->priority != s2->priority) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2735 return s1->priority - s2->priority; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2736 if (s1->beg != s2->beg) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2737 return s1->beg - s2->beg; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2738 if (s1->end != s2->end) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2739 return s2->end - s1->end; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2740 return 0; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2741 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2742 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2743 /* 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
|
2744 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
|
2745 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
|
2746 int |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2747 sort_overlays (overlay_vec, noverlays, w) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2748 Lisp_Object *overlay_vec; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2749 int noverlays; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2750 struct window *w; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2751 { |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2752 int i, j; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2753 struct sortvec *sortvec; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2754 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
|
2755 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2756 /* 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
|
2757 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2758 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
|
2759 { |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2760 Lisp_Object tem; |
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
2761 Lisp_Object overlay; |
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
2762 |
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
2763 overlay = overlay_vec[i]; |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2764 if (OVERLAY_VALID (overlay) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2765 && OVERLAY_POSITION (OVERLAY_START (overlay)) > 0 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2766 && OVERLAY_POSITION (OVERLAY_END (overlay)) > 0) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2767 { |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2768 /* 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
|
2769 overlays that are limited to some other window. */ |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2770 if (w) |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2771 { |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2772 Lisp_Object window; |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2773 |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2774 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
|
2775 if (WINDOWP (window) && XWINDOW (window) != w) |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2776 continue; |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2777 } |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2778 |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2779 /* 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
|
2780 sortvec[j].overlay = overlay; |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2781 sortvec[j].beg = OVERLAY_POSITION (OVERLAY_START (overlay)); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2782 sortvec[j].end = OVERLAY_POSITION (OVERLAY_END (overlay)); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2783 tem = Foverlay_get (overlay, Qpriority); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2784 if (INTEGERP (tem)) |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2785 sortvec[j].priority = XINT (tem); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2786 else |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2787 sortvec[j].priority = 0; |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2788 j++; |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2789 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2790 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2791 noverlays = j; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2792 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2793 /* 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
|
2794 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2795 if (noverlays > 1) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2796 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
|
2797 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2798 for (i = 0; i < noverlays; i++) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2799 overlay_vec[i] = sortvec[i].overlay; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2800 return (noverlays); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2801 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2802 |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2803 struct sortstr |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2804 { |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2805 Lisp_Object string, string2; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2806 int size; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2807 int priority; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2808 }; |
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 struct sortstrlist |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2811 { |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2812 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
|
2813 int size; /* Allocated length of that array. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2814 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
|
2815 int bytes; /* Total length of the strings in buf. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2816 }; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2817 |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2818 /* Buffers for storing information about the overlays touching a given |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2819 position. These could be automatic variables in overlay_strings, but |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2820 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
|
2821 allocating and freeing it. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2822 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
|
2823 static unsigned char *overlay_str_buf; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2824 |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2825 /* Allocated length of overlay_str_buf. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2826 static int overlay_str_len; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2827 |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2828 /* A comparison function suitable for passing to qsort. */ |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2829 static int |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2830 cmp_for_strings (as1, as2) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2831 char *as1, *as2; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2832 { |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2833 struct sortstr *s1 = (struct sortstr *)as1; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2834 struct sortstr *s2 = (struct sortstr *)as2; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2835 if (s1->size != s2->size) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2836 return s2->size - s1->size; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2837 if (s1->priority != s2->priority) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2838 return s1->priority - s2->priority; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2839 return 0; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2840 } |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2841 |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2842 static void |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2843 record_overlay_string (ssl, str, str2, pri, size) |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2844 struct sortstrlist *ssl; |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2845 Lisp_Object str, str2, pri; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2846 int size; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2847 { |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2848 int nbytes; |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2849 |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2850 if (ssl->used == ssl->size) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2851 { |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2852 if (ssl->buf) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2853 ssl->size *= 2; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2854 else |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2855 ssl->size = 5; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2856 ssl->buf = ((struct sortstr *) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2857 xrealloc (ssl->buf, ssl->size * sizeof (struct sortstr))); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2858 } |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2859 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
|
2860 ssl->buf[ssl->used].string2 = str2; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2861 ssl->buf[ssl->used].size = size; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2862 ssl->buf[ssl->used].priority = (INTEGERP (pri) ? XINT (pri) : 0); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2863 ssl->used++; |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2864 |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2865 if (NILP (current_buffer->enable_multibyte_characters)) |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2866 nbytes = XSTRING (str)->size; |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2867 else if (! STRING_MULTIBYTE (str)) |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2868 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
|
2869 STRING_BYTES (XSTRING (str))); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2870 else |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21141
diff
changeset
|
2871 nbytes = STRING_BYTES (XSTRING (str)); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2872 |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2873 ssl->bytes += nbytes; |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2874 |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2875 if (STRINGP (str2)) |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2876 { |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2877 if (NILP (current_buffer->enable_multibyte_characters)) |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2878 nbytes = XSTRING (str2)->size; |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2879 else if (! STRING_MULTIBYTE (str2)) |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2880 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
|
2881 STRING_BYTES (XSTRING (str2))); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2882 else |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
21141
diff
changeset
|
2883 nbytes = STRING_BYTES (XSTRING (str2)); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2884 |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2885 ssl->bytes += nbytes; |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2886 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2887 } |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2888 |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2889 /* 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
|
2890 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
|
2891 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
|
2892 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
|
2893 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
|
2894 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
|
2895 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
|
2896 |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2897 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
|
2898 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
|
2899 subsequent calls. */ |
16243
b311d8755530
(overlay_strings): Declare pstr using unsigned char.
Richard M. Stallman <rms@gnu.org>
parents:
16213
diff
changeset
|
2900 |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2901 int |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2902 overlay_strings (pos, w, pstr) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2903 int pos; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2904 struct window *w; |
16243
b311d8755530
(overlay_strings): Declare pstr using unsigned char.
Richard M. Stallman <rms@gnu.org>
parents:
16213
diff
changeset
|
2905 unsigned char **pstr; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2906 { |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2907 Lisp_Object ov, overlay, window, str; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2908 int startpos, endpos; |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2909 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
|
2910 |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2911 overlay_heads.used = overlay_heads.bytes = 0; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2912 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
|
2913 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
|
2914 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2915 overlay = XCAR (ov); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2916 if (!OVERLAYP (overlay)) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2917 abort (); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2918 |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2919 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2920 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2921 if (endpos < pos) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2922 break; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2923 if (endpos != pos && startpos != pos) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2924 continue; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2925 window = Foverlay_get (overlay, Qwindow); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2926 if (WINDOWP (window) && XWINDOW (window) != w) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2927 continue; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2928 if (startpos == pos |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2929 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2930 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
|
2931 (startpos == endpos |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2932 ? 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
|
2933 : Qnil), |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2934 Foverlay_get (overlay, Qpriority), |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2935 endpos - startpos); |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2936 else if (endpos == pos |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2937 && (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
|
2938 record_overlay_string (&overlay_tails, str, Qnil, |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2939 Foverlay_get (overlay, Qpriority), |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2940 endpos - startpos); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2941 } |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2942 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
|
2943 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2944 overlay = XCAR (ov); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2945 if (!OVERLAYP (overlay)) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2946 abort (); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2947 |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2948 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2949 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2950 if (startpos > pos) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2951 break; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2952 if (endpos != pos && startpos != pos) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2953 continue; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2954 window = Foverlay_get (overlay, Qwindow); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2955 if (WINDOWP (window) && XWINDOW (window) != w) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2956 continue; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2957 if (startpos == pos |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2958 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2959 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
|
2960 (startpos == endpos |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2961 ? 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
|
2962 : Qnil), |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2963 Foverlay_get (overlay, Qpriority), |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2964 endpos - startpos); |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2965 else if (endpos == pos |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2966 && (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
|
2967 record_overlay_string (&overlay_tails, str, Qnil, |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2968 Foverlay_get (overlay, Qpriority), |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2969 endpos - startpos); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2970 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2971 if (overlay_tails.used > 1) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2972 qsort (overlay_tails.buf, overlay_tails.used, sizeof (struct sortstr), |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2973 cmp_for_strings); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2974 if (overlay_heads.used > 1) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2975 qsort (overlay_heads.buf, overlay_heads.used, sizeof (struct sortstr), |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2976 cmp_for_strings); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2977 if (overlay_heads.bytes || overlay_tails.bytes) |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2978 { |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2979 Lisp_Object tem; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2980 int i; |
18603
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
2981 unsigned char *p; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2982 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
|
2983 |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2984 if (total > overlay_str_len) |
18603
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
2985 { |
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
2986 overlay_str_len = total; |
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
2987 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
|
2988 total); |
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
2989 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2990 p = overlay_str_buf; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2991 for (i = overlay_tails.used; --i >= 0;) |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2992 { |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2993 int nbytes; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2994 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
|
2995 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
|
2996 STRING_BYTES (XSTRING (tem)), |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2997 STRING_MULTIBYTE (tem), multibyte); |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
2998 p += nbytes; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2999 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3000 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
|
3001 { |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3002 int nbytes; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3003 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
|
3004 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
|
3005 STRING_BYTES (XSTRING (tem)), |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3006 STRING_MULTIBYTE (tem), multibyte); |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3007 p += nbytes; |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3008 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
|
3009 if (STRINGP (tem)) |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3010 { |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3011 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
|
3012 STRING_BYTES (XSTRING (tem)), |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3013 STRING_MULTIBYTE (tem), multibyte); |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3014 p += nbytes; |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3015 } |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3016 } |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3017 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
|
3018 abort (); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3019 if (pstr) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3020 *pstr = overlay_str_buf; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3021 return total; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3022 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3023 return 0; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3024 } |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3025 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3026 /* Shift overlays in BUF's overlay lists, to center the lists at POS. */ |
333 | 3027 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3028 void |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3029 recenter_overlay_lists (buf, pos) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3030 struct buffer *buf; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3031 int pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3032 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3033 Lisp_Object overlay, tail, next, prev, beg, end; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3034 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3035 /* 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
|
3036 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3037 /* 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
|
3038 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
|
3039 with some future change. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3040 prev = Qnil; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3041 for (tail = buf->overlays_before; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3042 CONSP (tail); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3043 prev = tail, tail = next) |
333 | 3044 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3045 next = XCDR (tail); |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3046 overlay = XCAR (tail); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3047 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3048 /* 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
|
3049 if (!OVERLAY_VALID (overlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3050 #if 1 |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3051 abort (); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3052 #else |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3053 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3054 /* 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
|
3055 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
|
3056 XCDR (prev) = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3057 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3058 buf->overlays_before = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3059 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3060 continue; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3061 } |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3062 #endif |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3063 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3064 beg = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3065 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3066 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3067 if (OVERLAY_POSITION (end) > pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3068 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3069 /* OVERLAY needs to be moved. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3070 int where = OVERLAY_POSITION (beg); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3071 Lisp_Object other, other_prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3072 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3073 /* 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
|
3074 if (!NILP (prev)) |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
3075 XSETCDR (prev, next); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3076 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3077 buf->overlays_before = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3078 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3079 /* 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
|
3080 other_prev = Qnil; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3081 for (other = buf->overlays_after; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3082 CONSP (other); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3083 other_prev = other, other = XCDR (other)) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3084 { |
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
3085 Lisp_Object otherbeg, otheroverlay; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3086 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3087 otheroverlay = XCAR (other); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3088 if (! OVERLAY_VALID (otheroverlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3089 abort (); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3090 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3091 otherbeg = OVERLAY_START (otheroverlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3092 if (OVERLAY_POSITION (otherbeg) >= where) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3093 break; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3094 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3095 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3096 /* Add TAIL to overlays_after before OTHER. */ |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
3097 XSETCDR (tail, other); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3098 if (!NILP (other_prev)) |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
3099 XSETCDR (other_prev, tail); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3100 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3101 buf->overlays_after = tail; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3102 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3103 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3104 else |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3105 /* 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
|
3106 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
|
3107 so stop now. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3108 break; |
333 | 3109 } |
3110 | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3111 /* 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
|
3112 prev = Qnil; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3113 for (tail = buf->overlays_after; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3114 CONSP (tail); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3115 prev = tail, tail = next) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3116 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3117 next = XCDR (tail); |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3118 overlay = XCAR (tail); |
333 | 3119 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3120 /* 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
|
3121 if (!OVERLAY_VALID (overlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3122 #if 1 |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3123 abort (); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3124 #else |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3125 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3126 /* 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
|
3127 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
|
3128 XCDR (prev) = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3129 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3130 buf->overlays_after = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3131 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3132 continue; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3133 } |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3134 #endif |
333 | 3135 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3136 beg = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3137 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3138 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3139 /* Stop looking, when we know that nothing further |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3140 can possibly end before POS. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3141 if (OVERLAY_POSITION (beg) > pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3142 break; |
333 | 3143 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3144 if (OVERLAY_POSITION (end) <= pos) |
333 | 3145 { |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3146 /* OVERLAY needs to be moved. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3147 int where = OVERLAY_POSITION (end); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3148 Lisp_Object other, other_prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3149 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3150 /* 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
|
3151 if (!NILP (prev)) |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
3152 XSETCDR (prev, next); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3153 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3154 buf->overlays_after = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3155 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3156 /* 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
|
3157 other_prev = Qnil; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3158 for (other = buf->overlays_before; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3159 CONSP (other); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3160 other_prev = other, other = XCDR (other)) |
333 | 3161 { |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3162 Lisp_Object otherend, otheroverlay; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3163 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3164 otheroverlay = XCAR (other); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3165 if (! OVERLAY_VALID (otheroverlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3166 abort (); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3167 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3168 otherend = OVERLAY_END (otheroverlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3169 if (OVERLAY_POSITION (otherend) <= where) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3170 break; |
333 | 3171 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3172 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3173 /* Add TAIL to overlays_before before OTHER. */ |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
3174 XSETCDR (tail, other); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3175 if (!NILP (other_prev)) |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
3176 XSETCDR (other_prev, tail); |
333 | 3177 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3178 buf->overlays_before = tail; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3179 tail = prev; |
333 | 3180 } |
3181 } | |
3182 | |
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
|
3183 XSETFASTINT (buf->overlay_center, pos); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3184 } |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3185 |
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3186 void |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3187 adjust_overlays_for_insert (pos, length) |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3188 int pos; |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3189 int length; |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3190 { |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3191 /* 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
|
3192 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
|
3193 if (XFASTINT (current_buffer->overlay_center) >= pos) |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3194 XSETFASTINT (current_buffer->overlay_center, |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3195 XFASTINT (current_buffer->overlay_center) + length); |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3196 } |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3197 |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3198 void |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3199 adjust_overlays_for_delete (pos, length) |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3200 int pos; |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3201 int length; |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3202 { |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3203 if (XFASTINT (current_buffer->overlay_center) < pos) |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3204 /* 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
|
3205 after-lists are still consistent. */ |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3206 ; |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3207 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
|
3208 /* 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
|
3209 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
|
3210 given the new value. */ |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3211 XSETFASTINT (current_buffer->overlay_center, |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3212 XFASTINT (current_buffer->overlay_center) - length); |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3213 else |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3214 /* 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
|
3215 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
|
3216 and also update the center point. */ |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3217 recenter_overlay_lists (current_buffer, pos); |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3218 } |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3219 |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3220 /* 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
|
3221 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
|
3222 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
|
3223 list and reinserted in its proper place. |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3224 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
|
3225 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
|
3226 better to do in this situation? */ |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3227 void |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3228 fix_overlays_in_range (start, end) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3229 register int start, end; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3230 { |
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
3231 Lisp_Object overlay; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3232 Lisp_Object before_list, after_list; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3233 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
|
3234 int startpos, endpos; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3235 |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3236 /* 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
|
3237 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
|
3238 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
|
3239 *pbefore (resp. *pafter) points to, is still uninitialized. |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3240 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
|
3241 it may look strange. */ |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3242 for (ptail = ¤t_buffer->overlays_before; CONSP (*ptail);) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3243 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3244 overlay = XCAR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3245 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3246 if (endpos < start) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3247 break; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3248 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3249 if (endpos < end |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3250 || (startpos >= start && startpos < end)) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3251 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3252 /* If the overlay is backwards, fix that now. */ |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3253 if (startpos > endpos) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3254 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3255 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
|
3256 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
|
3257 Qnil); |
c8135c48a66d
(set_buffer_internal_1): Convert Fset_marker argument to Lisp_Integer.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
3258 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
|
3259 Qnil); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3260 tem = startpos; startpos = endpos; endpos = tem; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3261 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3262 /* 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
|
3263 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
|
3264 if (endpos < XINT (current_buffer->overlay_center)) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3265 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3266 *pafter = *ptail; |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3267 pafter = &XCDR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3268 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3269 else |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3270 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3271 *pbefore = *ptail; |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3272 pbefore = &XCDR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3273 } |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3274 *ptail = XCDR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3275 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3276 else |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3277 ptail = &XCDR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3278 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3279 for (ptail = ¤t_buffer->overlays_after; CONSP (*ptail);) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3280 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3281 overlay = XCAR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3282 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3283 if (startpos >= end) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3284 break; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3285 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3286 if (startpos >= start |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3287 || (endpos >= start && endpos < end)) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3288 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3289 if (startpos > endpos) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3290 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3291 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
|
3292 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
|
3293 Qnil); |
c8135c48a66d
(set_buffer_internal_1): Convert Fset_marker argument to Lisp_Integer.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
3294 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
|
3295 Qnil); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3296 tem = startpos; startpos = endpos; endpos = tem; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3297 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3298 if (endpos < XINT (current_buffer->overlay_center)) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3299 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3300 *pafter = *ptail; |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3301 pafter = &XCDR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3302 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3303 else |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3304 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3305 *pbefore = *ptail; |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3306 pbefore = &XCDR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3307 } |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3308 *ptail = XCDR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3309 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3310 else |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3311 ptail = &XCDR (*ptail); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3312 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3313 |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3314 /* 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
|
3315 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
|
3316 *pbefore = current_buffer->overlays_before; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3317 current_buffer->overlays_before = before_list; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3318 recenter_overlay_lists (current_buffer, |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3319 XINT (current_buffer->overlay_center)); |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3320 |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3321 *pafter = current_buffer->overlays_after; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3322 current_buffer->overlays_after = after_list; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3323 recenter_overlay_lists (current_buffer, |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3324 XINT (current_buffer->overlay_center)); |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3325 } |
17022 | 3326 |
3327 /* We have two types of overlay: the one whose ending marker is | |
3328 after-insertion-marker (this is the usual case) and the one whose | |
3329 ending marker is before-insertion-marker. When `overlays_before' | |
3330 contains overlays of the latter type and the former type in this | |
3331 order and both overlays end at inserting position, inserting a text | |
3332 increases only the ending marker of the latter type, which results | |
3333 in incorrect ordering of `overlays_before'. | |
3334 | |
3335 This function fixes ordering of overlays in the slot | |
3336 `overlays_before' of the buffer *BP. Before the insertion, `point' | |
3337 was at PREV, and now is at POS. */ | |
3338 | |
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
3339 void |
17022 | 3340 fix_overlays_before (bp, prev, pos) |
3341 struct buffer *bp; | |
3342 int prev, pos; | |
3343 { | |
3344 Lisp_Object *tailp = &bp->overlays_before; | |
3345 Lisp_Object *right_place; | |
3346 int end; | |
3347 | |
3348 /* After the insertion, the several overlays may be in incorrect | |
3349 order. The possibility is that, in the list `overlays_before', | |
3350 an overlay which ends at POS appears after an overlay which ends | |
3351 at PREV. Since POS is greater than PREV, we must fix the | |
3352 ordering of these overlays, by moving overlays ends at POS before | |
3353 the overlays ends at PREV. */ | |
3354 | |
3355 /* At first, find a place where disordered overlays should be linked | |
3356 in. It is where an overlay which end before POS exists. (i.e. an | |
3357 overlay whose ending marker is after-insertion-marker if disorder | |
3358 exists). */ | |
3359 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
|
3360 && ((end = OVERLAY_POSITION (OVERLAY_END (XCAR (*tailp)))) |
17022 | 3361 >= pos)) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3362 tailp = &XCDR (*tailp); |
17022 | 3363 |
3364 /* If we don't find such an overlay, | |
3365 or the found one ends before PREV, | |
3366 or the found one is the last one in the list, | |
3367 we don't have to fix anything. */ | |
3368 if (NILP (*tailp) | |
3369 || end < prev | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3370 || NILP (XCDR (*tailp))) |
17022 | 3371 return; |
3372 | |
3373 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
|
3374 tailp = &XCDR (*tailp); |
17022 | 3375 |
3376 /* Now, end position of overlays in the list *TAILP should be before | |
3377 or equal to PREV. In the loop, an overlay which ends at POS is | |
3378 moved ahead to the place pointed by RIGHT_PLACE. If we found an | |
3379 overlay which ends before PREV, the remaining overlays are in | |
3380 correct order. */ | |
3381 while (!NILP (*tailp)) | |
3382 { | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3383 end = OVERLAY_POSITION (OVERLAY_END (XCAR (*tailp))); |
17022 | 3384 |
3385 if (end == pos) | |
3386 { /* This overlay is disordered. */ | |
3387 Lisp_Object found = *tailp; | |
3388 | |
3389 /* 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
|
3390 *tailp = XCDR (found); |
17022 | 3391 /* 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
|
3392 XCDR (found) = *right_place; |
17022 | 3393 /* Link it into the right place. */ |
3394 *right_place = found; | |
3395 } | |
3396 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
|
3397 tailp = &XCDR (*tailp); |
17022 | 3398 else /* No more disordered overlay. */ |
3399 break; | |
3400 } | |
3401 } | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3402 |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3403 DEFUN ("overlayp", Foverlayp, Soverlayp, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3404 doc: /* Return t if OBJECT is an overlay. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3405 (object) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3406 Lisp_Object object; |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3407 { |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3408 return (OVERLAYP (object) ? Qt : Qnil); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3409 } |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3410 |
13446
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3411 DEFUN ("make-overlay", Fmake_overlay, Smake_overlay, 2, 5, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3412 doc: /* Create a new overlay with range BEG to END in BUFFER. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3413 If omitted, BUFFER defaults to the current buffer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3414 BEG and END may be integers or markers. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3415 The fourth arg FRONT-ADVANCE, if non-nil, makes the |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3416 front delimiter advance when text is inserted there. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3417 The fifth arg REAR-ADVANCE, if non-nil, makes the |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3418 rear delimiter advance when text is inserted there. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3419 (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
|
3420 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
|
3421 Lisp_Object front_advance, rear_advance; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3422 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3423 Lisp_Object overlay; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3424 struct buffer *b; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3425 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3426 if (NILP (buffer)) |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
3427 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
|
3428 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3429 CHECK_BUFFER (buffer); |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3430 if (MARKERP (beg) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3431 && ! 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
|
3432 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
|
3433 if (MARKERP (end) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3434 && ! 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
|
3435 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
|
3436 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3437 CHECK_NUMBER_COERCE_MARKER (beg); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3438 CHECK_NUMBER_COERCE_MARKER (end); |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3439 |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3440 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
|
3441 { |
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3442 Lisp_Object temp; |
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3443 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
|
3444 } |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3445 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3446 b = XBUFFER (buffer); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3447 |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3448 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
|
3449 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
|
3450 |
13446
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3451 if (!NILP (front_advance)) |
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3452 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
|
3453 if (!NILP (rear_advance)) |
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3454 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
|
3455 |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3456 overlay = allocate_misc (); |
11244
f3b11dc9014e
(Fmake_overlay): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11214
diff
changeset
|
3457 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
|
3458 XOVERLAY (overlay)->start = beg; |
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3459 XOVERLAY (overlay)->end = end; |
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3460 XOVERLAY (overlay)->plist = Qnil; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3461 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3462 /* Put the new overlay on the wrong list. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3463 end = OVERLAY_END (overlay); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3464 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
|
3465 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
|
3466 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3467 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
|
3468 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3469 /* 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
|
3470 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
|
3471 |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3472 /* 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
|
3473 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
|
3474 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3475 return overlay; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3476 } |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3477 |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3478 /* 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
|
3479 |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3480 static void |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3481 modify_overlay (buf, start, end) |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3482 struct buffer *buf; |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3483 int start, end; |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3484 { |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3485 if (start > end) |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3486 { |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3487 int temp = start; |
39333
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3488 start = end; |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3489 end = temp; |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3490 } |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3491 |
27012
520f982f3a9a
(modify_overlay): Always compute unchanged info.
Gerd Moellmann <gerd@gnu.org>
parents:
26970
diff
changeset
|
3492 BUF_COMPUTE_UNCHANGED (buf, start, end); |
520f982f3a9a
(modify_overlay): Always compute unchanged info.
Gerd Moellmann <gerd@gnu.org>
parents:
26970
diff
changeset
|
3493 |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3494 /* 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
|
3495 we must do other windows. */ |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3496 if (buf != XBUFFER (XWINDOW (selected_window)->buffer)) |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3497 windows_or_buffers_changed = 1; |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3498 /* 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
|
3499 else if (buffer_shared > 1) |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3500 windows_or_buffers_changed = 1; |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3501 |
19801
7482ad23e430
(modify_overlay): Update overlay_modiff of proper buffer.
Richard M. Stallman <rms@gnu.org>
parents:
19581
diff
changeset
|
3502 ++BUF_OVERLAY_MODIFF (buf); |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3503 } |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3504 |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3505 |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3506 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
|
3507 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3508 DEFUN ("move-overlay", Fmove_overlay, Smove_overlay, 3, 4, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3509 doc: /* Set the endpoints of OVERLAY to BEG and END in BUFFER. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3510 If BUFFER is omitted, leave OVERLAY in the same buffer it inhabits now. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3511 If BUFFER is omitted, and OVERLAY is in no buffer, put it in the current |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3512 buffer. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3513 (overlay, beg, end, buffer) |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3514 Lisp_Object overlay, beg, end, buffer; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3515 { |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3516 struct buffer *b, *ob; |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3517 Lisp_Object obuffer; |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3518 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
|
3519 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3520 CHECK_OVERLAY (overlay); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3521 if (NILP (buffer)) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3522 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
|
3523 if (NILP (buffer)) |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
3524 XSETBUFFER (buffer, current_buffer); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3525 CHECK_BUFFER (buffer); |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3526 |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3527 if (MARKERP (beg) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3528 && ! 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
|
3529 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
|
3530 if (MARKERP (end) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3531 && ! 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
|
3532 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
|
3533 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3534 CHECK_NUMBER_COERCE_MARKER (beg); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3535 CHECK_NUMBER_COERCE_MARKER (end); |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3536 |
8839 | 3537 if (XINT (beg) == XINT (end) && ! NILP (Foverlay_get (overlay, Qevaporate))) |
3538 return Fdelete_overlay (overlay); | |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3539 |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3540 if (XINT (beg) > XINT (end)) |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3541 { |
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3542 Lisp_Object temp; |
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3543 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
|
3544 } |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3545 |
8839 | 3546 specbind (Qinhibit_quit, Qt); |
3547 | |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3548 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
|
3549 b = XBUFFER (buffer); |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
3550 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
|
3551 |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3552 /* 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
|
3553 if (!EQ (buffer, obuffer)) |
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3554 { |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3555 /* Redisplay where the overlay was. */ |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3556 if (!NILP (obuffer)) |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3557 { |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3558 int o_beg; |
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3559 int o_end; |
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3560 |
18105
bc690c1e1950
(Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents:
18009
diff
changeset
|
3561 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
|
3562 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
|
3563 |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3564 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
|
3565 } |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3566 |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3567 /* 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
|
3568 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
|
3569 } |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3570 else |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3571 /* 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
|
3572 { |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3573 int o_beg, o_end; |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3574 |
18105
bc690c1e1950
(Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents:
18009
diff
changeset
|
3575 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
|
3576 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
|
3577 |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3578 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
|
3579 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
|
3580 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
|
3581 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
|
3582 else |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3583 { |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3584 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
|
3585 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
|
3586 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
|
3587 } |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3588 } |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3589 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3590 if (!NILP (obuffer)) |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3591 { |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3592 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
|
3593 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
|
3594 } |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3595 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3596 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
|
3597 Fset_marker (OVERLAY_END (overlay), end, buffer); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3598 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3599 /* Put the overlay on the wrong list. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3600 end = OVERLAY_END (overlay); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3601 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
|
3602 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
|
3603 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3604 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
|
3605 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3606 /* 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
|
3607 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
|
3608 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3609 return unbind_to (count, overlay); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3610 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3611 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3612 DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3613 doc: /* Delete the overlay OVERLAY from its buffer. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3614 (overlay) |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3615 Lisp_Object overlay; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3616 { |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3617 Lisp_Object buffer; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3618 struct buffer *b; |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3619 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
|
3620 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3621 CHECK_OVERLAY (overlay); |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3622 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3623 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
|
3624 if (NILP (buffer)) |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3625 return Qnil; |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3626 |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3627 b = XBUFFER (buffer); |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3628 specbind (Qinhibit_quit, Qt); |
39333
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3629 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3630 b->overlays_before = Fdelq (overlay, b->overlays_before); |
39333
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3631 b->overlays_after = Fdelq (overlay, b->overlays_after); |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3632 modify_overlay (b, |
21898 | 3633 marker_position (OVERLAY_START (overlay)), |
3634 marker_position (OVERLAY_END (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
|
3635 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
|
3636 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
|
3637 |
39337 | 3638 /* When deleting an overlay with before or after strings, turn off |
39333
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3639 display optimizations for the affected buffer, on the basis that |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3640 these strings may contain newlines. This is easier to do than to |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3641 check for that situation during redisplay. */ |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3642 if (!windows_or_buffers_changed |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3643 && (!NILP (Foverlay_get (overlay, Qbefore_string)) |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3644 || !NILP (Foverlay_get (overlay, Qafter_string)))) |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3645 b->prevent_redisplay_optimizations_p = 1; |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3646 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3647 return unbind_to (count, Qnil); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3648 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3649 |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3650 /* Overlay dissection functions. */ |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3651 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3652 DEFUN ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3653 doc: /* Return the position at which OVERLAY starts. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3654 (overlay) |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3655 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3656 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3657 CHECK_OVERLAY (overlay); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3658 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3659 return (Fmarker_position (OVERLAY_START (overlay))); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3660 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3661 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3662 DEFUN ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3663 doc: /* Return the position at which OVERLAY ends. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3664 (overlay) |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3665 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3666 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3667 CHECK_OVERLAY (overlay); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3668 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3669 return (Fmarker_position (OVERLAY_END (overlay))); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3670 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3671 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3672 DEFUN ("overlay-buffer", Foverlay_buffer, Soverlay_buffer, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3673 doc: /* Return the buffer OVERLAY belongs to. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3674 (overlay) |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3675 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3676 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3677 CHECK_OVERLAY (overlay); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3678 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3679 return Fmarker_buffer (OVERLAY_START (overlay)); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3680 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3681 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3682 DEFUN ("overlay-properties", Foverlay_properties, Soverlay_properties, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3683 doc: /* Return a list of the properties on OVERLAY. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3684 This is a copy of OVERLAY's plist; modifying its conses has no effect on |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3685 OVERLAY. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3686 (overlay) |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3687 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3688 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3689 CHECK_OVERLAY (overlay); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3690 |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3691 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
|
3692 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3693 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3694 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3695 DEFUN ("overlays-at", Foverlays_at, Soverlays_at, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3696 doc: /* Return a list of the overlays that contain position POS. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3697 (pos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3698 Lisp_Object pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3699 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3700 int noverlays; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3701 Lisp_Object *overlay_vec; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3702 int len; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3703 Lisp_Object result; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3704 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3705 CHECK_NUMBER_COERCE_MARKER (pos); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3706 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3707 len = 10; |
30911
c1de0fc3a34b
(Fget_buffer_create, Fmake_indirect_buffer): Avoid
Dave Love <fx@gnu.org>
parents:
30695
diff
changeset
|
3708 /* 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
|
3709 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
|
3710 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3711 /* 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
|
3712 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
|
3713 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
|
3714 (int *) 0, (int *) 0, 0); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3715 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3716 /* Make a list of them all. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3717 result = Flist (noverlays, overlay_vec); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3718 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
3719 xfree (overlay_vec); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3720 return result; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3721 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3722 |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3723 DEFUN ("overlays-in", Foverlays_in, Soverlays_in, 2, 2, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3724 doc: /* Return a list of the overlays that overlap the region BEG ... END. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3725 Overlap means that at least one character is contained within the overlay |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3726 and also contained within the specified region. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3727 Empty overlays are included in the result if they are located at BEG |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3728 or between BEG and END. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3729 (beg, end) |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3730 Lisp_Object beg, end; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3731 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3732 int noverlays; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3733 Lisp_Object *overlay_vec; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3734 int len; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3735 Lisp_Object result; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3736 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3737 CHECK_NUMBER_COERCE_MARKER (beg); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3738 CHECK_NUMBER_COERCE_MARKER (end); |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3739 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3740 len = 10; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3741 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object)); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3742 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3743 /* 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
|
3744 Store the length in len. */ |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3745 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
|
3746 (int *) 0, (int *) 0); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3747 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3748 /* Make a list of them all. */ |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3749 result = Flist (noverlays, overlay_vec); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3750 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3751 xfree (overlay_vec); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3752 return result; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3753 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3754 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3755 DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
3756 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3757 doc: /* Return the next position after POS where an overlay starts or ends. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3758 If there are no more overlay boundaries after POS, return (point-max). */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3759 (pos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3760 Lisp_Object pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3761 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3762 int noverlays; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3763 int endpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3764 Lisp_Object *overlay_vec; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3765 int len; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3766 int i; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3767 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3768 CHECK_NUMBER_COERCE_MARKER (pos); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3769 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3770 len = 10; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3771 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
|
3772 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3773 /* 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
|
3774 Store the length in len. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3775 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
|
3776 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
|
3777 &endpos, (int *) 0, 1); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3778 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3779 /* If any of these overlays ends before endpos, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3780 use its ending point instead. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3781 for (i = 0; i < noverlays; i++) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3782 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3783 Lisp_Object oend; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3784 int oendpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3785 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3786 oend = OVERLAY_END (overlay_vec[i]); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3787 oendpos = OVERLAY_POSITION (oend); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3788 if (oendpos < endpos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3789 endpos = oendpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3790 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3791 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
3792 xfree (overlay_vec); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3793 return make_number (endpos); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3794 } |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3795 |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3796 DEFUN ("previous-overlay-change", Fprevious_overlay_change, |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3797 Sprevious_overlay_change, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3798 doc: /* Return the previous position before POS where an overlay starts or ends. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3799 If there are no more overlay boundaries before POS, return (point-min). */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3800 (pos) |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3801 Lisp_Object pos; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3802 { |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3803 int noverlays; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3804 int prevpos; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3805 Lisp_Object *overlay_vec; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3806 int len; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3807 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3808 CHECK_NUMBER_COERCE_MARKER (pos); |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3809 |
12214
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
3810 /* 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
|
3811 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
|
3812 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
|
3813 return pos; |
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
3814 |
30360
92f92a541686
(Fprevious_overlay_change): Avoid memory leak.
Gerd Moellmann <gerd@gnu.org>
parents:
29456
diff
changeset
|
3815 len = 10; |
92f92a541686
(Fprevious_overlay_change): Avoid memory leak.
Gerd Moellmann <gerd@gnu.org>
parents:
29456
diff
changeset
|
3816 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
|
3817 |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3818 /* 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
|
3819 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
|
3820 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
|
3821 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
|
3822 (int *) 0, &prevpos, 1); |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3823 |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3824 xfree (overlay_vec); |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3825 return make_number (prevpos); |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
3826 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3827 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3828 /* These functions are for debugging overlays. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3829 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3830 DEFUN ("overlay-lists", Foverlay_lists, Soverlay_lists, 0, 0, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3831 doc: /* Return a pair of lists giving all the overlays of the current buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3832 The car has all the overlays before the overlay center; |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3833 the cdr has all the overlays after the overlay center. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3834 Recentering overlays moves overlays between these lists. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3835 The lists you get are copies, so that changing them has no effect. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3836 However, the overlays you get are the real objects that the buffer uses. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3837 () |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3838 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3839 Lisp_Object before, after; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3840 before = current_buffer->overlays_before; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3841 if (CONSP (before)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3842 before = Fcopy_sequence (before); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3843 after = current_buffer->overlays_after; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3844 if (CONSP (after)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3845 after = Fcopy_sequence (after); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3846 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3847 return Fcons (before, after); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3848 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3849 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3850 DEFUN ("overlay-recenter", Foverlay_recenter, Soverlay_recenter, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3851 doc: /* Recenter the overlays of the current buffer around position POS. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3852 (pos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3853 Lisp_Object pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3854 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3855 CHECK_NUMBER_COERCE_MARKER (pos); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3856 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3857 recenter_overlay_lists (current_buffer, XINT (pos)); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3858 return Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3859 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3860 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3861 DEFUN ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3862 doc: /* Get the property of overlay OVERLAY with property name PROP. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3863 (overlay, prop) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3864 Lisp_Object overlay, prop; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3865 { |
9211
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3866 Lisp_Object plist, fallback; |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3867 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3868 CHECK_OVERLAY (overlay); |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3869 |
9211
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3870 fallback = Qnil; |
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3871 |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3872 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
|
3873 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
|
3874 plist = XCDR (XCDR (plist))) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3875 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3876 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
|
3877 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
|
3878 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
|
3879 { |
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3880 Lisp_Object tem; |
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3881 tem = Fcar (Fcdr (plist)); |
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3882 if (SYMBOLP (tem)) |
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3883 fallback = Fget (tem, prop); |
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3884 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3885 } |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3886 |
9211
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
3887 return fallback; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3888 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3889 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3890 DEFUN ("overlay-put", Foverlay_put, Soverlay_put, 3, 3, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3891 doc: /* Set one property of overlay OVERLAY: give property PROP value VALUE. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3892 (overlay, prop, value) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3893 Lisp_Object overlay, prop, value; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3894 { |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3895 Lisp_Object tail, buffer; |
8839 | 3896 int changed; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3897 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3898 CHECK_OVERLAY (overlay); |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3899 |
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
3900 buffer = Fmarker_buffer (OVERLAY_START (overlay)); |
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
3901 |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3902 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
|
3903 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
|
3904 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
|
3905 if (EQ (XCAR (tail), prop)) |
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
3906 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3907 changed = !EQ (XCAR (XCDR (tail)), value); |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
3908 XSETCAR (XCDR (tail), value); |
8839 | 3909 goto found; |
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
3910 } |
8839 | 3911 /* It wasn't in the list, so add it to the front. */ |
3912 changed = !NILP (value); | |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3913 XOVERLAY (overlay)->plist |
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3914 = Fcons (prop, Fcons (value, XOVERLAY (overlay)->plist)); |
8839 | 3915 found: |
3916 if (! NILP (buffer)) | |
3917 { | |
3918 if (changed) | |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3919 modify_overlay (XBUFFER (buffer), |
39333
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3920 marker_position (OVERLAY_START (overlay)), |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3921 marker_position (OVERLAY_END (overlay))); |
8839 | 3922 if (EQ (prop, Qevaporate) && ! NILP (value) |
3923 && (OVERLAY_POSITION (OVERLAY_START (overlay)) | |
3924 == OVERLAY_POSITION (OVERLAY_END (overlay)))) | |
3925 Fdelete_overlay (overlay); | |
3926 } | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3927 return value; |
333 | 3928 } |
3929 | |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3930 /* Subroutine of report_overlay_modification. */ |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3931 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3932 /* Lisp vector holding overlay hook functions to call. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3933 Vector elements come in pairs. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3934 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
|
3935 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
|
3936 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3937 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
|
3938 as we call overlay hook functions. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3939 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
|
3940 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
|
3941 static Lisp_Object last_overlay_modification_hooks; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3942 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3943 /* 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
|
3944 static int last_overlay_modification_hooks_used; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3945 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3946 /* Add one functionlist/overlay pair |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3947 to the end of last_overlay_modification_hooks. */ |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3948 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3949 static void |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3950 add_overlay_mod_hooklist (functionlist, overlay) |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3951 Lisp_Object functionlist, overlay; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3952 { |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3953 int oldsize = XVECTOR (last_overlay_modification_hooks)->size; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3954 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3955 if (last_overlay_modification_hooks_used == oldsize) |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3956 { |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3957 Lisp_Object old; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3958 old = last_overlay_modification_hooks; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3959 last_overlay_modification_hooks |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3960 = 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
|
3961 bcopy (XVECTOR (old)->contents, |
a46a40f1c30c
(add_overlay_mod_hooklist): Fix call to bcopy.
Richard M. Stallman <rms@gnu.org>
parents:
15032
diff
changeset
|
3962 XVECTOR (last_overlay_modification_hooks)->contents, |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3963 sizeof (Lisp_Object) * oldsize); |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3964 } |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3965 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
|
3966 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
|
3967 } |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3968 |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3969 /* Run the modification-hooks of overlays that include |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3970 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
|
3971 If this change is an insertion, also |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3972 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
|
3973 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
|
3974 |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3975 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
|
3976 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
|
3977 |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3978 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
|
3979 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
|
3980 the position after the inserted new text, |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3981 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
|
3982 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3983 void |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3984 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
|
3985 Lisp_Object start, end; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3986 int after; |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3987 Lisp_Object arg1, arg2, arg3; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3988 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3989 Lisp_Object prop, overlay, tail; |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3990 /* 1 if this change is an insertion. */ |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3991 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
|
3992 int tail_copied; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3993 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
|
3994 |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3995 overlay = Qnil; |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3996 tail = Qnil; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3997 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
|
3998 |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3999 if (after) |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4000 { |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4001 /* 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
|
4002 rather than scanning the overlays again. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4003 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
|
4004 do subsequent modification of the buffer. */ |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4005 int size = last_overlay_modification_hooks_used; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4006 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
|
4007 int i; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4008 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4009 bcopy (XVECTOR (last_overlay_modification_hooks)->contents, |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4010 copy, size * sizeof (Lisp_Object)); |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4011 gcpro1.var = copy; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4012 gcpro1.nvars = size; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4013 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4014 for (i = 0; i < size;) |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4015 { |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4016 Lisp_Object prop, overlay; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4017 prop = copy[i++]; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4018 overlay = copy[i++]; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4019 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
|
4020 } |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4021 UNGCPRO; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4022 return; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4023 } |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4024 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4025 /* We are being called before a change. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4026 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
|
4027 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
|
4028 tail_copied = 0; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4029 for (tail = current_buffer->overlays_before; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4030 CONSP (tail); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4031 tail = XCDR (tail)) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4032 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4033 int startpos, endpos; |
4416
9657ef911049
(Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents:
4226
diff
changeset
|
4034 Lisp_Object ostart, oend; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4035 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4036 overlay = XCAR (tail); |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4037 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4038 ostart = OVERLAY_START (overlay); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4039 oend = OVERLAY_END (overlay); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4040 endpos = OVERLAY_POSITION (oend); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4041 if (XFASTINT (start) > endpos) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4042 break; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4043 startpos = OVERLAY_POSITION (ostart); |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4044 if (insertion && (XFASTINT (start) == startpos |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4045 || XFASTINT (end) == startpos)) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4046 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4047 prop = Foverlay_get (overlay, Qinsert_in_front_hooks); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4048 if (!NILP (prop)) |
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4049 { |
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4050 /* 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
|
4051 if (!tail_copied) |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4052 tail = Fcopy_sequence (tail); |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4053 tail_copied = 1; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4054 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
|
4055 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4056 } |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4057 if (insertion && (XFASTINT (start) == endpos |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4058 || XFASTINT (end) == endpos)) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4059 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4060 prop = Foverlay_get (overlay, Qinsert_behind_hooks); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4061 if (!NILP (prop)) |
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4062 { |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4063 if (!tail_copied) |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4064 tail = Fcopy_sequence (tail); |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4065 tail_copied = 1; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4066 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
|
4067 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4068 } |
6675
cf38c5af079d
(verify_overlay_modification): Run modification-hooks for any deletion that
Karl Heuer <kwzh@gnu.org>
parents:
6659
diff
changeset
|
4069 /* 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
|
4070 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
|
4071 if (XFASTINT (end) > startpos && XFASTINT (start) < endpos) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4072 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4073 prop = Foverlay_get (overlay, Qmodification_hooks); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4074 if (!NILP (prop)) |
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4075 { |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4076 if (!tail_copied) |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4077 tail = Fcopy_sequence (tail); |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4078 tail_copied = 1; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4079 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
|
4080 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4081 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4082 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4083 |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4084 tail_copied = 0; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4085 for (tail = current_buffer->overlays_after; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4086 CONSP (tail); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4087 tail = XCDR (tail)) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4088 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4089 int startpos, endpos; |
4416
9657ef911049
(Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents:
4226
diff
changeset
|
4090 Lisp_Object ostart, oend; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4091 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4092 overlay = XCAR (tail); |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4093 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4094 ostart = OVERLAY_START (overlay); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4095 oend = OVERLAY_END (overlay); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4096 startpos = OVERLAY_POSITION (ostart); |
4574
503af6aa135b
(verify_overlay_modification): initialize endpos.
Richard M. Stallman <rms@gnu.org>
parents:
4416
diff
changeset
|
4097 endpos = OVERLAY_POSITION (oend); |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4098 if (XFASTINT (end) < startpos) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4099 break; |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4100 if (insertion && (XFASTINT (start) == startpos |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4101 || XFASTINT (end) == startpos)) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4102 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4103 prop = Foverlay_get (overlay, Qinsert_in_front_hooks); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4104 if (!NILP (prop)) |
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4105 { |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4106 if (!tail_copied) |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4107 tail = Fcopy_sequence (tail); |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4108 tail_copied = 1; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4109 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
|
4110 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4111 } |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4112 if (insertion && (XFASTINT (start) == endpos |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4113 || XFASTINT (end) == endpos)) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4114 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4115 prop = Foverlay_get (overlay, Qinsert_behind_hooks); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4116 if (!NILP (prop)) |
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4117 { |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4118 if (!tail_copied) |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4119 tail = Fcopy_sequence (tail); |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4120 tail_copied = 1; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4121 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
|
4122 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4123 } |
6675
cf38c5af079d
(verify_overlay_modification): Run modification-hooks for any deletion that
Karl Heuer <kwzh@gnu.org>
parents:
6659
diff
changeset
|
4124 /* 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
|
4125 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
|
4126 if (XFASTINT (end) > startpos && XFASTINT (start) < endpos) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4127 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4128 prop = Foverlay_get (overlay, Qmodification_hooks); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4129 if (!NILP (prop)) |
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4130 { |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4131 if (!tail_copied) |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4132 tail = Fcopy_sequence (tail); |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4133 tail_copied = 1; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4134 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
|
4135 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4136 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4137 } |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4138 |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4139 UNGCPRO; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4140 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4141 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4142 static void |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4143 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
|
4144 Lisp_Object list, overlay; |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4145 int after; |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4146 Lisp_Object arg1, arg2, arg3; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4147 { |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4148 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4149 |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4150 GCPRO4 (list, arg1, arg2, arg3); |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4151 if (! after) |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4152 add_overlay_mod_hooklist (list, overlay); |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4153 |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4154 while (!NILP (list)) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4155 { |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4156 if (NILP (arg3)) |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4157 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
|
4158 else |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4159 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
|
4160 list = Fcdr (list); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4161 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4162 UNGCPRO; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4163 } |
8839 | 4164 |
4165 /* Delete any zero-sized overlays at position POS, if the `evaporate' | |
4166 property is set. */ | |
4167 void | |
4168 evaporate_overlays (pos) | |
4169 int pos; | |
4170 { | |
4171 Lisp_Object tail, overlay, hit_list; | |
4172 | |
4173 hit_list = Qnil; | |
4174 if (pos <= XFASTINT (current_buffer->overlay_center)) | |
4175 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
|
4176 tail = XCDR (tail)) |
8839 | 4177 { |
4178 int endpos; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4179 overlay = XCAR (tail); |
8839 | 4180 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
4181 if (endpos < pos) | |
4182 break; | |
4183 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
|
4184 && ! NILP (Foverlay_get (overlay, Qevaporate))) |
8839 | 4185 hit_list = Fcons (overlay, hit_list); |
4186 } | |
4187 else | |
4188 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
|
4189 tail = XCDR (tail)) |
8839 | 4190 { |
4191 int startpos; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4192 overlay = XCAR (tail); |
8839 | 4193 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
4194 if (startpos > pos) | |
4195 break; | |
4196 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
|
4197 && ! NILP (Foverlay_get (overlay, Qevaporate))) |
8839 | 4198 hit_list = Fcons (overlay, hit_list); |
4199 } | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4200 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
|
4201 Fdelete_overlay (XCAR (hit_list)); |
8839 | 4202 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4203 |
9464
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
4204 /* 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
|
4205 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
|
4206 |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4207 void |
9464
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
4208 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
|
4209 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
|
4210 { |
9464
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
4211 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
|
4212 char *type_name; |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4213 |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
4214 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
|
4215 { |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4216 case Lisp_Int: |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4217 type_name = "integers"; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4218 break; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4219 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4220 case Lisp_String: |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4221 type_name = "strings"; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4222 break; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4223 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4224 case Lisp_Symbol: |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4225 type_name = "symbols"; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4226 break; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4227 |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4228 default: |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4229 abort (); |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4230 } |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4231 |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
4232 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
|
4233 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
|
4234 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
|
4235 } |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4236 |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4237 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4238 /*********************************************************************** |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4239 Allocation with mmap |
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 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4242 #ifdef USE_MMAP_FOR_BUFFERS |
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 #include <sys/types.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4245 #include <sys/mman.h> |
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 #ifndef MAP_ANON |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4248 #ifdef MAP_ANONYMOUS |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4249 #define MAP_ANON MAP_ANONYMOUS |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4250 #else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4251 #define MAP_ANON 0 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4252 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4253 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4254 |
33645
e822f94eb7d9
(MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents:
33598
diff
changeset
|
4255 #ifndef MAP_FAILED |
e822f94eb7d9
(MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents:
33598
diff
changeset
|
4256 #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
|
4257 #endif |
e822f94eb7d9
(MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents:
33598
diff
changeset
|
4258 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4259 #include <stdio.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4260 #include <errno.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4261 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4262 #if MAP_ANON == 0 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4263 #include <fcntl.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4264 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4265 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4266 #include "coding.h" |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4267 |
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 /* 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
|
4270 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
|
4271 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
|
4272 trying to enlarge regions. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4273 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4274 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
|
4275 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
|
4276 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4277 +-----------------------+ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4278 | struct mmap_info + | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4279 | padding | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4280 +-----------------------+ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4281 | user data | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4282 | | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4283 | | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4284 +-----------------------+ */ |
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 struct mmap_region |
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 /* User-specified size. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4289 size_t nbytes_specified; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4290 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4291 /* Number of bytes mapped */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4292 size_t nbytes_mapped; |
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 /* 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
|
4295 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
|
4296 after this structure. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4297 POINTER_TYPE **var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4298 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4299 /* 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
|
4300 struct mmap_region *next, *prev; |
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 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4303 /* 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
|
4304 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4305 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
|
4306 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4307 /* 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
|
4308 /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
|
4309 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4310 static int mmap_fd; |
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 /* 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
|
4313 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4314 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
|
4315 static int mmap_fd_1; |
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 /* Page size on this system. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4318 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4319 static int mmap_page_size; |
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 /* 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
|
4322 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4323 static int mmap_initialized_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 /* 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
|
4326 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4327 #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
|
4328 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4329 /* 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
|
4330 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4331 #define MMAP_REGION_STRUCT_SIZE \ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4332 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
|
4333 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4334 /* 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
|
4335 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
|
4336 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4337 #define MMAP_REGION(P) \ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4338 ((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
|
4339 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4340 /* 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
|
4341 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
|
4342 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4343 #define MMAP_USER_AREA(P) \ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4344 ((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
|
4345 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4346 #define MEM_ALIGN sizeof (double) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4347 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4348 /* Function prototypes. */ |
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 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
|
4351 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
|
4352 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
|
4353 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
|
4354 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
|
4355 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
|
4356 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
|
4357 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4358 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4359 /* 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
|
4360 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
|
4361 is at END - 1. */ |
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 static struct mmap_region * |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4364 mmap_find (start, end) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4365 POINTER_TYPE *start, *end; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4366 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4367 struct mmap_region *r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4368 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
|
4369 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4370 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
|
4371 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4372 char *rstart = (char *) r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4373 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
|
4374 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4375 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
|
4376 (s >= rstart && s < rend) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4377 /* 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
|
4378 || (e > rstart && e <= rend) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4379 /* 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
|
4380 || (rstart >= s && rstart < e) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4381 /* 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
|
4382 || (rend > s && rend <= e)) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4383 break; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4384 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4385 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4386 return 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 |
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 /* 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
|
4391 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
|
4392 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4393 static int |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4394 mmap_free_1 (r) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4395 struct mmap_region *r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4396 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4397 if (r->next) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4398 r->next->prev = r->prev; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4399 if (r->prev) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4400 r->prev->next = r->next; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4401 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4402 mmap_regions = r->next; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4403 |
33675
cd12ade4547d
(mmap_free_1): Avoid a compiler warning.
Gerd Moellmann <gerd@gnu.org>
parents:
33645
diff
changeset
|
4404 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
|
4405 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4406 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
|
4407 return 0; |
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 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4410 return 1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4411 } |
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 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4414 /* 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
|
4415 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
|
4416 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4417 static int |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4418 mmap_enlarge (r, npages) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4419 struct mmap_region *r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4420 int npages; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4421 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4422 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
|
4423 size_t nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4424 int success = 0; |
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 if (npages < 0) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4427 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4428 /* 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
|
4429 nbytes = - npages * mmap_page_size; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4430 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
|
4431 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
|
4432 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4433 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4434 r->nbytes_mapped -= nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4435 success = 1; |
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 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4438 else if (npages > 0) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4439 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4440 struct mmap_region *r2; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4441 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4442 nbytes = npages * mmap_page_size; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4443 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4444 /* 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
|
4445 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
|
4446 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
|
4447 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
|
4448 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
|
4449 if (r2 == NULL) |
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 POINTER_TYPE *p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4452 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4453 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
|
4454 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
|
4455 if (p == MAP_FAILED) |
33598
d2ed1317ec06
(mmap_enlarge): Don't print a message on stderr
Gerd Moellmann <gerd@gnu.org>
parents:
32856
diff
changeset
|
4456 ; /* 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
|
4457 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
|
4458 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4459 /* 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
|
4460 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
|
4461 no use for it. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4462 if (munmap (p, nbytes) == -1) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4463 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
|
4464 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4465 else |
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 r->nbytes_mapped += nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4468 success = 1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4469 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4470 } |
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 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4473 return success; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4474 } |
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 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4477 /* 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
|
4478 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
|
4479 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
|
4480 of mapped regions. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4481 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4482 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
|
4483 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
|
4484 when Emacs starts. */ |
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 void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4487 mmap_set_vars (restore_p) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4488 int restore_p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4489 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4490 struct mmap_region *r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4491 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4492 if (restore_p) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4493 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4494 mmap_regions = mmap_regions_1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4495 mmap_fd = mmap_fd_1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4496 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
|
4497 *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
|
4498 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4499 else |
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 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
|
4502 *r->var = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4503 mmap_regions_1 = mmap_regions; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4504 mmap_regions = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4505 mmap_fd_1 = mmap_fd; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4506 mmap_fd = -1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4507 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4508 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4509 |
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 /* 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
|
4512 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
|
4513 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
|
4514 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4515 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
|
4516 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4517 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
|
4518 return null. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4519 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4520 static POINTER_TYPE * |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4521 mmap_alloc (var, nbytes) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4522 POINTER_TYPE **var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4523 size_t nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4524 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4525 void *p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4526 size_t map; |
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 mmap_init (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4529 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4530 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
|
4531 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
|
4532 mmap_fd, 0); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4533 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4534 if (p == MAP_FAILED) |
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 if (errno != ENOMEM) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4537 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
|
4538 p = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4539 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4540 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4541 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4542 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
|
4543 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4544 r->nbytes_specified = nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4545 r->nbytes_mapped = map; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4546 r->var = var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4547 r->prev = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4548 r->next = mmap_regions; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4549 if (r->next) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4550 r->next->prev = r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4551 mmap_regions = r; |
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 p = MMAP_USER_AREA (p); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4554 } |
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 return *var = p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4557 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4558 |
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 /* 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
|
4561 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
|
4562 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
|
4563 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
|
4564 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4565 static POINTER_TYPE * |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4566 mmap_realloc (var, nbytes) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4567 POINTER_TYPE **var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4568 size_t nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4569 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4570 POINTER_TYPE *result; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4571 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4572 mmap_init (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4573 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4574 if (*var == NULL) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4575 result = mmap_alloc (var, nbytes); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4576 else if (nbytes == 0) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4577 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4578 mmap_free (var); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4579 result = mmap_alloc (var, nbytes); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4580 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4581 else |
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 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
|
4584 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
|
4585 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4586 if (room < nbytes) |
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 /* Must enlarge. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4589 POINTER_TYPE *old_ptr = *var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4590 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4591 /* 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
|
4592 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
|
4593 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
|
4594 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
|
4595 / mmap_page_size))) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4596 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4597 r->nbytes_specified = nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4598 *var = result = old_ptr; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4599 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4600 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
|
4601 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4602 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
|
4603 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
|
4604 result = *var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4605 r = MMAP_REGION (result); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4606 r->nbytes_specified = nbytes; |
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 else |
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 *var = old_ptr; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4611 result = NULL; |
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 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4614 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
|
4615 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4616 /* 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
|
4617 memory back to the system. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4618 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
|
4619 result = *var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4620 r->nbytes_specified = nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4621 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4622 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4623 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4624 /* Leave it alone. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4625 result = *var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4626 r->nbytes_specified = nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4627 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4628 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4629 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4630 return result; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4631 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4632 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4633 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4634 /* 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
|
4635 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
|
4636 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4637 static void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4638 mmap_free (var) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4639 POINTER_TYPE **var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4640 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4641 mmap_init (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4642 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4643 if (*var) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4644 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4645 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
|
4646 *var = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4647 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4648 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4649 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4650 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4651 /* 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
|
4652 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4653 static void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4654 mmap_init () |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4655 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4656 #if MAP_ANON == 0 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4657 /* 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
|
4658 in a dumped Emacs. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4659 if (mmap_fd <= 0) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4660 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4661 /* 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
|
4662 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
|
4663 if (mmap_fd == -1) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4664 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
|
4665 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4666 #endif /* MAP_ANON == 0 */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4667 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4668 if (mmap_initialized_p) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4669 return; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4670 mmap_initialized_p = 1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4671 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4672 #if MAP_ANON != 0 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4673 mmap_fd = -1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4674 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4675 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4676 mmap_page_size = getpagesize (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4677 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4678 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4679 #endif /* USE_MMAP_FOR_BUFFERS */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4680 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4681 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4682 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4683 /*********************************************************************** |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4684 Buffer-text Allocation |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4685 ***********************************************************************/ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4686 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4687 #ifdef REL_ALLOC |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4688 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
|
4689 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
|
4690 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
|
4691 #endif /* REL_ALLOC */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4692 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4693 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4694 /* 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
|
4695 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4696 static void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4697 alloc_buffer_text (b, nbytes) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4698 struct buffer *b; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4699 size_t nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4700 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4701 POINTER_TYPE *p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4702 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4703 BLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4704 #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
|
4705 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
|
4706 #elif defined REL_ALLOC |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4707 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
|
4708 #else |
31612
2050f93e8cef
(alloc_buffer_text): Fix xmalloc call.
Dave Love <fx@gnu.org>
parents:
31604
diff
changeset
|
4709 p = xmalloc (nbytes); |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4710 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4711 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4712 if (p == NULL) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4713 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4714 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4715 memory_full (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4716 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4717 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4718 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
|
4719 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4720 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4721 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4722 /* 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
|
4723 shrink it. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4724 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4725 void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4726 enlarge_buffer_text (b, delta) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4727 struct buffer *b; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4728 int delta; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4729 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4730 POINTER_TYPE *p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4731 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
|
4732 + delta); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4733 BLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4734 #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
|
4735 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
|
4736 #elif defined REL_ALLOC |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4737 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
|
4738 #else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4739 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
|
4740 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4741 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4742 if (p == NULL) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4743 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4744 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4745 memory_full (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4746 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4747 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4748 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
|
4749 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4750 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4751 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4752 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4753 /* 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
|
4754 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4755 static void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4756 free_buffer_text (b) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4757 struct buffer *b; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4758 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4759 BLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4760 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4761 #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
|
4762 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
|
4763 #elif defined REL_ALLOC |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4764 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
|
4765 #else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4766 xfree (b->text->beg); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4767 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4768 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4769 BUF_BEG_ADDR (b) = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4770 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4771 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4772 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4773 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4774 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4775 /*********************************************************************** |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4776 Initialization |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4777 ***********************************************************************/ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4778 |
21514 | 4779 void |
333 | 4780 init_buffer_once () |
4781 { | |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4782 int idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4783 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4784 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
|
4785 |
333 | 4786 /* Make sure all markable slots in buffer_defaults |
4787 are initialized reasonably, so mark_buffer won't choke. */ | |
4788 reset_buffer (&buffer_defaults); | |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
4789 reset_buffer_local_variables (&buffer_defaults, 1); |
333 | 4790 reset_buffer (&buffer_local_symbols); |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
4791 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
|
4792 /* Prevent GC from getting confused. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
4793 buffer_defaults.text = &buffer_defaults.own_text; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
4794 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
|
4795 BUF_INTERVALS (&buffer_defaults) = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
4796 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
|
4797 XSETBUFFER (Vbuffer_defaults, &buffer_defaults); |
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
4798 XSETBUFFER (Vbuffer_local_symbols, &buffer_local_symbols); |
333 | 4799 |
4800 /* Set up the default values of various buffer slots. */ | |
4801 /* Must do these before making the first buffer! */ | |
4802 | |
28636
19c81f320db5
(Fmake_indirect_buffer): Escape newline in doc.
Dave Love <fx@gnu.org>
parents:
28625
diff
changeset
|
4803 /* real setup is done in bindings.el */ |
333 | 4804 buffer_defaults.mode_line_format = build_string ("%-"); |
25546 | 4805 buffer_defaults.header_line_format = Qnil; |
333 | 4806 buffer_defaults.abbrev_mode = Qnil; |
4807 buffer_defaults.overwrite_mode = Qnil; | |
4808 buffer_defaults.case_fold_search = Qt; | |
4809 buffer_defaults.auto_fill_function = Qnil; | |
4810 buffer_defaults.selective_display = Qnil; | |
4811 #ifndef old | |
4812 buffer_defaults.selective_display_ellipses = Qt; | |
4813 #endif | |
4814 buffer_defaults.abbrev_table = Qnil; | |
4815 buffer_defaults.display_table = Qnil; | |
4816 buffer_defaults.undo_list = Qnil; | |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
4817 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
|
4818 buffer_defaults.file_format = Qnil; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4819 buffer_defaults.overlays_before = Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4820 buffer_defaults.overlays_after = Qnil; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
4821 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
|
4822 |
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
|
4823 XSETFASTINT (buffer_defaults.tab_width, 8); |
333 | 4824 buffer_defaults.truncate_lines = Qnil; |
4825 buffer_defaults.ctl_arrow = Qt; | |
17022 | 4826 buffer_defaults.direction_reversed = Qnil; |
28322
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
4827 buffer_defaults.cursor_type = Qt; |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
4828 buffer_defaults.extra_line_spacing = Qnil; |
333 | 4829 |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
4830 #ifdef DOS_NT |
7270
0f79f4bd3c62
(init_buffer_once): Initialize buffer_file_type field right.
Richard M. Stallman <rms@gnu.org>
parents:
7062
diff
changeset
|
4831 buffer_defaults.buffer_file_type = Qnil; /* TEXT */ |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
4832 #endif |
17124
fdad8ea24563
(init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents:
17022
diff
changeset
|
4833 buffer_defaults.enable_multibyte_characters = Qt; |
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
4834 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
|
4835 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
|
4836 XSETFASTINT (buffer_defaults.left_margin, 0); |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
4837 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
|
4838 buffer_defaults.file_truename = Qnil; |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
4839 XSETFASTINT (buffer_defaults.display_count, 0); |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4840 buffer_defaults.indicate_empty_lines = Qnil; |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4841 buffer_defaults.scroll_up_aggressively = Qnil; |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
4842 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
|
4843 buffer_defaults.display_time = Qnil; |
333 | 4844 |
4845 /* Assign the local-flags to the slots that have default values. | |
4846 The local flag is a bit that is used in the buffer | |
4847 to say that it has its own local value for the slot. | |
4848 The local flag bits are in the local_var_flags slot of the buffer. */ | |
4849 | |
4850 /* 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
|
4851 if (sizeof (EMACS_INT) != sizeof (Lisp_Object)) abort (); |
333 | 4852 |
4853 /* 0 means not a lisp var, -1 means always local, else mask */ | |
4854 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
|
4855 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
|
4856 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
|
4857 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
|
4858 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
|
4859 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
|
4860 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
|
4861 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
|
4862 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
|
4863 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
|
4864 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
|
4865 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
|
4866 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
|
4867 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
|
4868 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
|
4869 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
|
4870 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
|
4871 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
|
4872 |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4873 idx = 1; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4874 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
|
4875 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
|
4876 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
|
4877 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
|
4878 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
|
4879 XSETFASTINT (buffer_local_flags.selective_display, idx); ++idx; |
333 | 4880 #ifndef old |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4881 XSETFASTINT (buffer_local_flags.selective_display_ellipses, idx); ++idx; |
333 | 4882 #endif |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4883 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
|
4884 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
|
4885 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
|
4886 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
|
4887 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
|
4888 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
|
4889 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
|
4890 #ifdef DOS_NT |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4891 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
|
4892 /* 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
|
4893 buffer_permanent_local_flags[idx++] = 1; |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
4894 #endif |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4895 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
|
4896 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
|
4897 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
|
4898 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
|
4899 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
|
4900 /* 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
|
4901 buffer_permanent_local_flags[idx++] = 1; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4902 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
|
4903 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
|
4904 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
|
4905 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
|
4906 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
|
4907 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
|
4908 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
|
4909 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
|
4910 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4911 /* Need more room? */ |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
4912 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
|
4913 abort (); |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
4914 last_per_buffer_idx = idx; |
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
4915 |
333 | 4916 Vbuffer_alist = Qnil; |
4917 current_buffer = 0; | |
4918 all_buffers = 0; | |
4919 | |
4920 QSFundamental = build_string ("Fundamental"); | |
4921 | |
4922 Qfundamental_mode = intern ("fundamental-mode"); | |
4923 buffer_defaults.major_mode = Qfundamental_mode; | |
4924 | |
4925 Qmode_class = intern ("mode-class"); | |
4926 | |
4927 Qprotected_field = intern ("protected-field"); | |
4928 | |
4929 Qpermanent_local = intern ("permanent-local"); | |
4930 | |
4931 Qkill_buffer_hook = intern ("kill-buffer-hook"); | |
4932 | |
4933 Vprin1_to_string_buffer = Fget_buffer_create (build_string (" prin1")); | |
14396 | 4934 |
333 | 4935 /* super-magic invisible buffer */ |
4936 Vbuffer_alist = Qnil; | |
4937 | |
648 | 4938 Fset_buffer (Fget_buffer_create (build_string ("*scratch*"))); |
23399
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
4939 |
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
4940 inhibit_modification_hooks = 0; |
333 | 4941 } |
4942 | |
21514 | 4943 void |
333 | 4944 init_buffer () |
4945 { | |
31412
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4946 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
|
4947 char *pwd; |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
4948 struct stat dotstat, pwdstat; |
3463
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
4949 Lisp_Object temp; |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
4950 int rc; |
333 | 4951 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4952 #ifdef USE_MMAP_FOR_BUFFERS |
31412
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4953 { |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4954 /* 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
|
4955 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
|
4956 Map new memory. */ |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4957 struct buffer *b; |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4958 |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4959 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
|
4960 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
|
4961 enlarge_buffer_text (b, 0); |
31412
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4962 } |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4963 #endif /* USE_MMAP_FOR_BUFFERS */ |
31412
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
4964 |
333 | 4965 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
|
4966 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
|
4967 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
|
4968 |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
4969 /* 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
|
4970 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
|
4971 if ((pwd = getenv ("PWD")) != 0 |
e23d16d11ba9
(init_buffer): Support DOS_NT absolute file names.
Richard M. Stallman <rms@gnu.org>
parents:
22150
diff
changeset
|
4972 && (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
|
4973 && 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
|
4974 && 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
|
4975 && 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
|
4976 && 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
|
4977 && 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
|
4978 strcpy (buf, pwd); |
19242
a7d44588be35
(init_buffer): Use getcwd instead of getwd, if available.
Richard M. Stallman <rms@gnu.org>
parents:
18921
diff
changeset
|
4979 #ifdef HAVE_GETCWD |
a7d44588be35
(init_buffer): Use getcwd instead of getwd, if available.
Richard M. Stallman <rms@gnu.org>
parents:
18921
diff
changeset
|
4980 else if (getcwd (buf, MAXPATHLEN+1) == 0) |
19581 | 4981 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
|
4982 #else |
1563
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
4983 else if (getwd (buf) == 0) |
9810
c76b3e670eb3
(init_buffer): Fix error message syntax.
Richard M. Stallman <rms@gnu.org>
parents:
9785
diff
changeset
|
4984 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
|
4985 #endif |
333 | 4986 |
4987 #ifndef VMS | |
4988 /* Maybe this should really use some standard subroutine | |
4989 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
|
4990 rc = strlen (buf); |
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
4991 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
|
4992 { |
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
4993 buf[rc] = DIRECTORY_SEP; |
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
4994 buf[rc + 1] = '\0'; |
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
4995 } |
333 | 4996 #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
|
4997 |
333 | 4998 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
|
4999 |
16384
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
5000 /* 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
|
5001 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
|
5002 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
|
5003 if (! NILP (temp) |
52fbf5fad62e
(init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents:
19977
diff
changeset
|
5004 /* 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
|
5005 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
|
5006 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
|
5007 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
|
5008 && 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
|
5009 current_buffer->directory |
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
5010 = 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
|
5011 |
3463
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
5012 temp = get_minibuffer (0); |
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
5013 XBUFFER (temp)->directory = current_buffer->directory; |
333 | 5014 } |
5015 | |
5016 /* initialize the buffer routines */ | |
21514 | 5017 void |
333 | 5018 syms_of_buffer () |
5019 { | |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
5020 staticpro (&last_overlay_modification_hooks); |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
5021 last_overlay_modification_hooks |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
5022 = Fmake_vector (make_number (10), Qnil); |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
5023 |
333 | 5024 staticpro (&Vbuffer_defaults); |
5025 staticpro (&Vbuffer_local_symbols); | |
5026 staticpro (&Qfundamental_mode); | |
5027 staticpro (&Qmode_class); | |
5028 staticpro (&QSFundamental); | |
5029 staticpro (&Vbuffer_alist); | |
5030 staticpro (&Qprotected_field); | |
5031 staticpro (&Qpermanent_local); | |
5032 staticpro (&Qkill_buffer_hook); | |
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5033 Qoverlayp = intern ("overlayp"); |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
5034 staticpro (&Qoverlayp); |
8839 | 5035 Qevaporate = intern ("evaporate"); |
5036 staticpro (&Qevaporate); | |
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5037 Qmodification_hooks = intern ("modification-hooks"); |
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
5038 staticpro (&Qmodification_hooks); |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
5039 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
|
5040 staticpro (&Qinsert_in_front_hooks); |
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
5041 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
|
5042 staticpro (&Qinsert_behind_hooks); |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5043 Qget_file_buffer = intern ("get-file-buffer"); |
5433 | 5044 staticpro (&Qget_file_buffer); |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
5045 Qpriority = intern ("priority"); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
5046 staticpro (&Qpriority); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
5047 Qwindow = intern ("window"); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
5048 staticpro (&Qwindow); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
5049 Qbefore_string = intern ("before-string"); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
5050 staticpro (&Qbefore_string); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
5051 Qafter_string = intern ("after-string"); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
5052 staticpro (&Qafter_string); |
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5053 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
|
5054 staticpro (&Qfirst_change_hook); |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5055 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
|
5056 staticpro (&Qbefore_change_functions); |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5057 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
|
5058 staticpro (&Qafter_change_functions); |
333 | 5059 |
5060 Fput (Qprotected_field, Qerror_conditions, | |
5061 Fcons (Qprotected_field, Fcons (Qerror, Qnil))); | |
5062 Fput (Qprotected_field, Qerror_message, | |
5063 build_string ("Attempt to modify a protected field")); | |
5064 | |
5065 /* All these use DEFVAR_LISP_NOPRO because the slots in | |
5066 buffer_defaults will all be marked via Vbuffer_defaults. */ | |
5067 | |
5068 DEFVAR_LISP_NOPRO ("default-mode-line-format", | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5069 &buffer_defaults.mode_line_format, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5070 doc: /* Default value of `mode-line-format' for buffers that don't override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5071 This is the same as (default-value 'mode-line-format). */); |
333 | 5072 |
25546 | 5073 DEFVAR_LISP_NOPRO ("default-header-line-format", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5074 &buffer_defaults.header_line_format, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5075 doc: /* Default value of `header-line-format' for buffers that don't override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5076 This is the same as (default-value 'header-line-format). */); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5077 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5078 DEFVAR_LISP_NOPRO ("default-cursor-type", &buffer_defaults.cursor_type, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5079 doc: /* Default value of `cursor-type' for buffers that don't override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5080 This is the same as (default-value 'cursor-type). */); |
28332
8abeccb78576
(syms_of_buffer): Add default-cursor-type.
Gerd Moellmann <gerd@gnu.org>
parents:
28322
diff
changeset
|
5081 |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
5082 DEFVAR_LISP_NOPRO ("default-line-spacing", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5083 &buffer_defaults.extra_line_spacing, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5084 doc: /* Default value of `line-spacing' for buffers that don't override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5085 This is the same as (default-value 'line-spacing). */); |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
5086 |
333 | 5087 DEFVAR_LISP_NOPRO ("default-abbrev-mode", |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5088 &buffer_defaults.abbrev_mode, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5089 doc: /* Default value of `abbrev-mode' for buffers that do not override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5090 This is the same as (default-value 'abbrev-mode). */); |
333 | 5091 |
5092 DEFVAR_LISP_NOPRO ("default-ctl-arrow", | |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5093 &buffer_defaults.ctl_arrow, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5094 doc: /* Default value of `ctl-arrow' for buffers that do not override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5095 This is the same as (default-value 'ctl-arrow). */); |
333 | 5096 |
17022 | 5097 DEFVAR_LISP_NOPRO ("default-direction-reversed", |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5098 &buffer_defaults.direction_reversed, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5099 doc: /* Default value of `direction_reversed' for buffers that do not override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5100 This is the same as (default-value 'direction-reversed). */); |
17022 | 5101 |
17124
fdad8ea24563
(init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents:
17022
diff
changeset
|
5102 DEFVAR_LISP_NOPRO ("default-enable-multibyte-characters", |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5103 &buffer_defaults.enable_multibyte_characters, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5104 doc: /* *Default value of `enable-multibyte-characters' for buffers not overriding it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5105 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
|
5106 |
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5107 DEFVAR_LISP_NOPRO ("default-buffer-file-coding-system", |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5108 &buffer_defaults.buffer_file_coding_system, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5109 doc: /* Default value of `buffer-file-coding-system' for buffers not overriding it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5110 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
|
5111 |
333 | 5112 DEFVAR_LISP_NOPRO ("default-truncate-lines", |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5113 &buffer_defaults.truncate_lines, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5114 doc: /* Default value of `truncate-lines' for buffers that do not override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5115 This is the same as (default-value 'truncate-lines). */); |
333 | 5116 |
5117 DEFVAR_LISP_NOPRO ("default-fill-column", | |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5118 &buffer_defaults.fill_column, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5119 doc: /* Default value of `fill-column' for buffers that do not override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5120 This is the same as (default-value 'fill-column). */); |
333 | 5121 |
5122 DEFVAR_LISP_NOPRO ("default-left-margin", | |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5123 &buffer_defaults.left_margin, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5124 doc: /* Default value of `left-margin' for buffers that do not override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5125 This is the same as (default-value 'left-margin). */); |
333 | 5126 |
5127 DEFVAR_LISP_NOPRO ("default-tab-width", | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5128 &buffer_defaults.tab_width, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5129 doc: /* Default value of `tab-width' for buffers that do not override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5130 This is the same as (default-value 'tab-width). */); |
333 | 5131 |
5132 DEFVAR_LISP_NOPRO ("default-case-fold-search", | |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5133 &buffer_defaults.case_fold_search, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5134 doc: /* Default value of `case-fold-search' for buffers that don't override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5135 This is the same as (default-value 'case-fold-search). */); |
333 | 5136 |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
5137 #ifdef DOS_NT |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5138 DEFVAR_LISP_NOPRO ("default-buffer-file-type", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5139 &buffer_defaults.buffer_file_type, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5140 doc: /* Default file type for buffers that do not override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5141 This is the same as (default-value 'buffer-file-type). |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5142 The file type is nil for text, t for binary. */); |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5143 #endif |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5144 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5145 DEFVAR_LISP_NOPRO ("default-left-margin-width", |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5146 &buffer_defaults.left_margin_width, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5147 doc: /* Default value of `left-margin-width' for buffers that don't override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5148 This is the same as (default-value 'left-margin-width). */); |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5149 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5150 DEFVAR_LISP_NOPRO ("default-right-margin-width", |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5151 &buffer_defaults.right_margin_width, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5152 doc: /* Default value of `right_margin_width' for buffers that don't override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5153 This is the same as (default-value 'right-margin-width). */); |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5154 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5155 DEFVAR_LISP_NOPRO ("default-indicate-empty-lines", |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5156 &buffer_defaults.indicate_empty_lines, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5157 doc: /* Default value of `indicate-empty-lines' for buffers that don't override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5158 This is the same as (default-value 'indicate-empty-lines). */); |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5159 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5160 DEFVAR_LISP_NOPRO ("default-scroll-up-aggressively", |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5161 &buffer_defaults.scroll_up_aggressively, |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5162 doc: /* Default value of `scroll-up-aggressively'. |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5163 This value applies in buffers that don't have their own local values. |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5164 This variable is an alias for (default-value 'scroll-up-aggressively). */); |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5165 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5166 DEFVAR_LISP_NOPRO ("default-scroll-down-aggressively", |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5167 &buffer_defaults.scroll_down_aggressively, |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5168 doc: /* Default value of `scroll-down-aggressively'. |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5169 This value applies in buffers that don't have their own local values. |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5170 This variable is an alias for (default-value 'scroll-down-aggressively). */); |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5171 |
25546 | 5172 DEFVAR_PER_BUFFER ("header-line-format", |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5173 ¤t_buffer->header_line_format, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5174 Qnil, |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5175 doc: /* Analogous to `mode-line-format', but controls the header line. |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5176 The header line appears, optionally, at the top of a window; |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5177 the mode line appears at the bottom. */); |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5178 |
333 | 5179 DEFVAR_PER_BUFFER ("mode-line-format", ¤t_buffer->mode_line_format, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5180 Qnil, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5181 doc: /* Template for displaying mode line for current buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5182 Each buffer has its own value of this variable. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5183 Value may be nil, a string, a symbol or a list or cons cell. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5184 A value of nil means don't display a mode line. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5185 For a symbol, its value is used (but it is ignored if t or nil). |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5186 A string appearing directly as the value of a symbol is processed verbatim |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5187 in that the %-constructs below are not recognized. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5188 For a list of the form `(:eval FORM)', FORM is evaluated and the result |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5189 is used as a mode line element. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5190 For a list whose car is a symbol, the symbol's value is taken, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5191 and if that is non-nil, the cadr of the list is processed recursively. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5192 Otherwise, the caddr of the list (if there is one) is processed. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5193 For a list whose car is a string or list, each element is processed |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5194 recursively and the results are effectively concatenated. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5195 For a list whose car is an integer, the cdr of the list is processed |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5196 and padded (if the number is positive) or truncated (if negative) |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5197 to the width specified by that number. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5198 A string is printed verbatim in the mode line except for %-constructs: |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5199 (%-constructs are allowed when the string is the entire mode-line-format |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5200 or when it is found in a cons-cell or a list) |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5201 %b -- print buffer name. %f -- print visited file name. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5202 %F -- print frame name. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5203 %* -- print %, * or hyphen. %+ -- print *, % or hyphen. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5204 %& is like %*, but ignore read-only-ness. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5205 % means buffer is read-only and * means it is modified. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5206 For a modified read-only buffer, %* gives % and %+ gives *. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5207 %s -- print process status. %l -- print the current line number. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5208 %c -- print the current column number (this makes editing slower). |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5209 To make the column number update correctly in all cases, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5210 `column-number-mode' must be non-nil. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5211 %p -- print percent of buffer above top of window, or Top, Bot or All. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5212 %P -- print percent of buffer above bottom of window, perhaps plus Top, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5213 or print Bottom or All. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5214 %m -- print the mode name. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5215 %n -- print Narrow if appropriate. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5216 %z -- print mnemonics of buffer, terminal, and keyboard coding systems. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5217 %Z -- like %z, but including the end-of-line format. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5218 %[ -- print one [ for each recursive editing level. %] similar. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5219 %% -- print %. %- -- print infinitely many dashes. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5220 Decimal digits after the % specify field width to which to pad. */); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5221 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5222 DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5223 doc: /* *Major mode for new buffers. Defaults to `fundamental-mode'. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5224 nil here means use current buffer's major mode. */); |
333 | 5225 |
5226 DEFVAR_PER_BUFFER ("major-mode", ¤t_buffer->major_mode, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5227 make_number (Lisp_Symbol), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5228 doc: /* Symbol for current buffer's major mode. */); |
333 | 5229 |
5230 DEFVAR_PER_BUFFER ("mode-name", ¤t_buffer->mode_name, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5231 make_number (Lisp_String), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5232 doc: /* Pretty name of current buffer's major mode (a string). */); |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5233 |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5234 DEFVAR_PER_BUFFER ("abbrev-mode", ¤t_buffer->abbrev_mode, Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5235 doc: /* Non-nil turns on automatic expansion of abbrevs as they are inserted. */); |
333 | 5236 |
5237 DEFVAR_PER_BUFFER ("case-fold-search", ¤t_buffer->case_fold_search, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5238 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5239 doc: /* *Non-nil if searches and matches should ignore case. */); |
333 | 5240 |
5241 DEFVAR_PER_BUFFER ("fill-column", ¤t_buffer->fill_column, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5242 make_number (Lisp_Int), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5243 doc: /* *Column beyond which automatic line-wrapping should happen. */); |
333 | 5244 |
5245 DEFVAR_PER_BUFFER ("left-margin", ¤t_buffer->left_margin, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5246 make_number (Lisp_Int), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5247 doc: /* *Column for the default indent-line-function to indent to. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5248 Linefeed indents to this column in Fundamental mode. */); |
333 | 5249 |
5250 DEFVAR_PER_BUFFER ("tab-width", ¤t_buffer->tab_width, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5251 make_number (Lisp_Int), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5252 doc: /* *Distance between tab stops (for display of tab characters), in columns. */); |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5253 |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5254 DEFVAR_PER_BUFFER ("ctl-arrow", ¤t_buffer->ctl_arrow, Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5255 doc: /* *Non-nil means display control chars with uparrow. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5256 A value of nil means use backslash and octal digits. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5257 This variable does not apply to characters whose display is specified |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5258 in the current display table (if there is one). */); |
333 | 5259 |
17022 | 5260 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
|
5261 ¤t_buffer->enable_multibyte_characters, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5262 make_number (-1), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5263 doc: /* Non-nil means the buffer contents are regarded as multi-byte characters. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5264 Otherwise they are regarded as unibyte. This affects the display, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5265 file I/O and the behavior of various editing commands. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5266 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5267 This variable is buffer-local but you cannot set it directly; |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5268 use the function `set-buffer-multibyte' to change a buffer's representation. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5269 Changing its default value with `setq-default' is supported. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5270 See also variable `default-enable-multibyte-characters' and Info node |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5271 `(elisp)Text Representations'. */); |
17022 | 5272 |
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5273 DEFVAR_PER_BUFFER ("buffer-file-coding-system", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5274 ¤t_buffer->buffer_file_coding_system, Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5275 doc: /* Coding system to be used for encoding the buffer contents on saving. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5276 This variable applies to saving the buffer, and also to `write-region' |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5277 and other functions that use `write-region'. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5278 It does not apply to sending output to subprocesses, however. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5279 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5280 If this is nil, the buffer is saved without any code conversion |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5281 unless some coding system is specified in `file-coding-system-alist' |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5282 for the buffer file. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5283 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5284 The variable `coding-system-for-write', if non-nil, overrides this variable. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5285 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5286 This variable is never applied to a way of decoding a file while reading it. */); |
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5287 |
17022 | 5288 DEFVAR_PER_BUFFER ("direction-reversed", ¤t_buffer->direction_reversed, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5289 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5290 doc: /* *Non-nil means lines in the buffer are displayed right to left. */); |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5291 |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5292 DEFVAR_PER_BUFFER ("truncate-lines", ¤t_buffer->truncate_lines, Qnil, |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5293 doc: /* *Non-nil means do not display continuation lines. |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5294 Instead, give each line of text just one screen line. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5295 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5296 Note that this is overridden by the variable |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5297 `truncate-partial-width-windows' if that variable is non-nil |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5298 and this buffer is not full-frame width. */); |
333 | 5299 |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
5300 #ifdef DOS_NT |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5301 DEFVAR_PER_BUFFER ("buffer-file-type", ¤t_buffer->buffer_file_type, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5302 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5303 doc: /* Non-nil if the visited file is a binary file. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5304 This variable is meaningful on MS-DOG and Windows NT. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5305 On those systems, it is automatically local in every buffer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5306 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
|
5307 #endif |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5308 |
333 | 5309 DEFVAR_PER_BUFFER ("default-directory", ¤t_buffer->directory, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5310 make_number (Lisp_String), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5311 doc: /* Name of default directory of current buffer. Should end with slash. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5312 To interactively change the default directory, use command `cd'. */); |
333 | 5313 |
5314 DEFVAR_PER_BUFFER ("auto-fill-function", ¤t_buffer->auto_fill_function, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5315 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5316 doc: /* Function called (if non-nil) to perform auto-fill. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5317 It is called after self-inserting any character specified in |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5318 the `auto-fill-chars' table. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5319 NOTE: This variable is not a hook; |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5320 its value may not be a list of functions. */); |
333 | 5321 |
5322 DEFVAR_PER_BUFFER ("buffer-file-name", ¤t_buffer->filename, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5323 make_number (Lisp_String), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5324 doc: /* Name of file visited in current buffer, or nil if not visiting a file. */); |
333 | 5325 |
10751
dea8f022819d
(syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents:
10668
diff
changeset
|
5326 DEFVAR_PER_BUFFER ("buffer-file-truename", ¤t_buffer->file_truename, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5327 make_number (Lisp_String), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5328 doc: /* Abbreviated truename of file visited in current buffer, or nil if none. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5329 The truename of a file is calculated by `file-truename' |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5330 and then abbreviated with `abbreviate-file-name'. */); |
10751
dea8f022819d
(syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents:
10668
diff
changeset
|
5331 |
333 | 5332 DEFVAR_PER_BUFFER ("buffer-auto-save-file-name", |
1041 | 5333 ¤t_buffer->auto_save_file_name, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5334 make_number (Lisp_String), |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5335 doc: /* Name of file for auto-saving current buffer. |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5336 If it is nil, that means don't auto-save this buffer. */); |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5337 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5338 DEFVAR_PER_BUFFER ("buffer-read-only", ¤t_buffer->read_only, Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5339 doc: /* Non-nil if this buffer is read-only. */); |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5340 |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5341 DEFVAR_PER_BUFFER ("buffer-backed-up", ¤t_buffer->backed_up, Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5342 doc: /* Non-nil if this buffer's file has been backed up. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5343 Backing up is done before the first time the file is saved. */); |
333 | 5344 |
5345 DEFVAR_PER_BUFFER ("buffer-saved-size", ¤t_buffer->save_length, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5346 make_number (Lisp_Int), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5347 doc: /* Length of current buffer when last read in, saved or auto-saved. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5348 0 initially. */); |
333 | 5349 |
5350 DEFVAR_PER_BUFFER ("selective-display", ¤t_buffer->selective_display, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5351 Qnil, |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5352 doc: /* Non-nil enables selective display. |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5353 An Integer N as value means display only lines |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5354 that start with less than n columns of space. |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5355 A value of t means that the character ^M makes itself and |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5356 all the rest of the line invisible; also, when saving the buffer |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5357 in a file, save the ^M as a newline. */); |
333 | 5358 |
5359 #ifndef old | |
5360 DEFVAR_PER_BUFFER ("selective-display-ellipses", | |
5361 ¤t_buffer->selective_display_ellipses, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5362 Qnil, |
40567
7c28809db274
(selective-display-ellipses): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents:
40108
diff
changeset
|
5363 doc: /* Non-nil means display ... on previous line when a line is invisible. */); |
333 | 5364 #endif |
5365 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5366 DEFVAR_PER_BUFFER ("overwrite-mode", ¤t_buffer->overwrite_mode, Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5367 doc: /* Non-nil if self-insertion should replace existing text. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5368 The value should be one of `overwrite-mode-textual', |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5369 `overwrite-mode-binary', or nil. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5370 If it is `overwrite-mode-textual', self-insertion still |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5371 inserts at the end of a line, and inserts when point is before a tab, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5372 until the tab is filled in. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5373 If `overwrite-mode-binary', self-insertion replaces newlines and tabs too. */); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5374 |
333 | 5375 DEFVAR_PER_BUFFER ("buffer-display-table", ¤t_buffer->display_table, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5376 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5377 doc: /* Display table that controls display of the contents of current buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5378 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5379 If this variable is nil, the value of `standard-display-table' is used. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5380 Each window can have its own, overriding display table, see |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5381 `set-window-display-table' and `window-display-table'. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5382 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5383 The display table is a char-table created with `make-display-table'. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5384 A char-table is an array indexed by character codes. Normal array |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5385 primitives `aref' and `aset' can be used to access elements of a char-table. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5386 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5387 Each of the char-table elements control how to display the corresponding |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5388 text character: the element at index C in the table says how to display |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5389 the character whose code is C. Each element should be a vector of |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5390 characters or nil. nil means display the character in the default fashion; |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5391 otherwise, the characters from the vector are delivered to the screen |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5392 instead of the original character. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5393 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5394 For example, (aset buffer-display-table ?X ?Y) will cause Emacs to display |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5395 a capital Y instead of each X character. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5396 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5397 In addition, a char-table has six extra slots to control the display of: |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5398 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5399 the end of a truncated screen line (extra-slot 0, a single character); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5400 the end of a continued line (extra-slot 1, a single character); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5401 the escape character used to display character codes in octal |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5402 (extra-slot 2, a single character); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5403 the character used as an arrow for control characters (extra-slot 3, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5404 a single character); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5405 the decoration indicating the presence of invisible lines (extra-slot 4, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5406 a vector of characters); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5407 the character used to draw the border between side-by-side windows |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5408 (extra-slot 5, a single character). |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5409 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5410 See also the functions `display-table-slot' and `set-display-table-slot'. */); |
333 | 5411 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5412 DEFVAR_PER_BUFFER ("left-margin-width", ¤t_buffer->left_margin_width, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5413 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5414 doc: /* *Width of left marginal area for display of a buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5415 A value of nil means no marginal area. */); |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5416 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5417 DEFVAR_PER_BUFFER ("right-margin-width", ¤t_buffer->right_margin_width, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5418 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5419 doc: /* *Width of right marginal area for display of a buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5420 A value of nil means no marginal area. */); |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5421 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5422 DEFVAR_PER_BUFFER ("indicate-empty-lines", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5423 ¤t_buffer->indicate_empty_lines, Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5424 doc: /* *Visually indicate empty lines after the buffer end. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5425 If non-nil, a bitmap is displayed in the left fringe of a window on |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5426 window-systems. */); |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5427 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5428 DEFVAR_PER_BUFFER ("scroll-up-aggressively", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5429 ¤t_buffer->scroll_up_aggressively, Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5430 doc: /* *If a number, scroll display up aggressively. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5431 If scrolling a window because point is above the window start, choose |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5432 a new window start so that point ends up that fraction of the window's |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5433 height from the top of the window. */); |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5434 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5435 DEFVAR_PER_BUFFER ("scroll-down-aggressively", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5436 ¤t_buffer->scroll_down_aggressively, Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5437 doc: /* *If a number, scroll display down aggressively. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5438 If scrolling a window because point is below the window end, choose |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5439 a new window start so that point ends up that fraction of the window's |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5440 height from the bottom of the window. */); |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5441 |
333 | 5442 /*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol, |
5443 "Don't ask."); | |
5444 */ | |
5445 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5446 DEFVAR_LISP ("before-change-functions", &Vbefore_change_functions, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5447 doc: /* List of functions to call before each text change. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5448 Two arguments are passed to each function: the positions of |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5449 the beginning and end of the range of old text to be changed. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5450 \(For an insertion, the beginning and end are at the same place.) |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5451 No information is given about the length of the text after the change. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5452 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5453 Buffer changes made while executing the `before-change-functions' |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5454 don't call any before-change or after-change functions. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5455 That's because these variables are temporarily set to nil. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5456 As a result, a hook function cannot straightforwardly alter the value of |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5457 these variables. See the Emacs Lisp manual for a way of |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5458 accomplishing an equivalent result by using other variables. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5459 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5460 If an unhandled error happens in running these functions, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5461 the variable's value remains nil. That prevents the error |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5462 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
|
5463 Vbefore_change_functions = Qnil; |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5464 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5465 DEFVAR_LISP ("after-change-functions", &Vafter_change_functions, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5466 doc: /* List of function to call after each text change. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5467 Three arguments are passed to each function: the positions of |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5468 the beginning and end of the range of changed text, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5469 and the length in bytes of the pre-change text replaced by that range. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5470 \(For an insertion, the pre-change length is zero; |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5471 for a deletion, that length is the number of bytes deleted, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5472 and the post-change beginning and end are at the same place.) |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5473 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5474 Buffer changes made while executing the `after-change-functions' |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5475 don't call any before-change or after-change functions. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5476 That's because these variables are temporarily set to nil. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5477 As a result, a hook function cannot straightforwardly alter the value of |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5478 these variables. See the Emacs Lisp manual for a way of |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5479 accomplishing an equivalent result by using other variables. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5480 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5481 If an unhandled error happens in running these functions, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5482 the variable's value remains nil. That prevents the error |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5483 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
|
5484 Vafter_change_functions = Qnil; |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5485 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5486 DEFVAR_LISP ("first-change-hook", &Vfirst_change_hook, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5487 doc: /* A list of functions to call before changing a buffer which is unmodified. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5488 The functions are run using the `run-hooks' function. */); |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
5489 Vfirst_change_hook = Qnil; |
333 | 5490 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5491 DEFVAR_PER_BUFFER ("buffer-undo-list", ¤t_buffer->undo_list, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5492 doc: /* List of undo entries in current buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5493 Recent changes come first; older changes follow newer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5494 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5495 An entry (BEG . END) represents an insertion which begins at |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5496 position BEG and ends at position END. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5497 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5498 An entry (TEXT . POSITION) represents the deletion of the string TEXT |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5499 from (abs POSITION). If POSITION is positive, point was at the front |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5500 of the text being deleted; if negative, point was at the end. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5501 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5502 An entry (t HIGH . LOW) indicates that the buffer previously had |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5503 \"unmodified\" status. HIGH and LOW are the high and low 16-bit portions |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5504 of the visited file's modification time, as of that time. If the |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5505 modification time of the most recent save is different, this entry is |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5506 obsolete. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5507 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5508 An entry (nil PROPERTY VALUE BEG . END) indicates that a text property |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5509 was modified between BEG and END. PROPERTY is the property name, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5510 and VALUE is the old value. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5511 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5512 An entry (MARKER . DISTANCE) indicates that the marker MARKER |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5513 was adjusted in position by the offset DISTANCE (an integer). |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5514 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5515 An entry of the form POSITION indicates that point was at the buffer |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5516 location given by the integer. Undoing an entry of this form places |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5517 point at POSITION. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5518 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5519 nil marks undo boundaries. The undo command treats the changes |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5520 between two undo boundaries as a single step to be undone. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5521 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5522 If the value of the variable is t, undo information is not recorded. */); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5523 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5524 DEFVAR_PER_BUFFER ("mark-active", ¤t_buffer->mark_active, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5525 doc: /* Non-nil means the mark and region are currently active in this buffer. */); |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5526 |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5527 DEFVAR_PER_BUFFER ("cache-long-line-scans", ¤t_buffer->cache_long_line_scans, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5528 doc: /* Non-nil means that Emacs should use caches to handle long lines more quickly. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5529 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5530 Normally, the line-motion functions work by scanning the buffer for |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5531 newlines. Columnar operations (like move-to-column and |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5532 compute-motion) also work by scanning the buffer, summing character |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5533 widths as they go. This works well for ordinary text, but if the |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5534 buffer's lines are very long (say, more than 500 characters), these |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5535 motion functions will take longer to execute. Emacs may also take |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5536 longer to update the display. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5537 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5538 If cache-long-line-scans is non-nil, these motion functions cache the |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5539 results of their scans, and consult the cache to avoid rescanning |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5540 regions of the buffer until the text is modified. The caches are most |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5541 beneficial when they prevent the most searching---that is, when the |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5542 buffer contains long lines and large regions of characters with the |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5543 same, fixed screen width. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5544 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5545 When cache-long-line-scans is non-nil, processing short lines will |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5546 become slightly slower (because of the overhead of consulting the |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5547 cache), and the caches will use memory roughly proportional to the |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5548 number of newlines and characters whose screen width varies. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5549 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5550 The caches require no explicit maintenance; their accuracy is |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5551 maintained internally by the Emacs primitives. Enabling or disabling |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5552 the cache should not affect the behavior of any of the motion |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5553 functions; it should only affect their performance. */); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5554 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5555 DEFVAR_PER_BUFFER ("point-before-scroll", ¤t_buffer->point_before_scroll, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5556 doc: /* Value of point before the last series of scroll operations, or nil. */); |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5557 |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5558 DEFVAR_PER_BUFFER ("buffer-file-format", ¤t_buffer->file_format, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5559 doc: /* List of formats to use when saving this buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5560 Formats are defined by `format-alist'. This variable is |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5561 set when a file is visited. Automatically local in all buffers. */); |
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
|
5562 |
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
5563 DEFVAR_PER_BUFFER ("buffer-invisibility-spec", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5564 ¤t_buffer->invisibility_spec, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5565 doc: /* Invisibility spec of this buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5566 The default is t, which means that text is invisible |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5567 if it has a non-nil `invisible' property. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5568 If the value is a list, a text character is invisible if its `invisible' |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5569 property is an element in that list. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5570 If an element is a cons cell of the form (PROP . ELLIPSIS), |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5571 then characters with property value PROP are invisible, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5572 and they have an ellipsis as well if ELLIPSIS is non-nil. */); |
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
5573 |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
5574 DEFVAR_PER_BUFFER ("buffer-display-count", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5575 ¤t_buffer->display_count, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5576 doc: /* A number incremented each time this buffer is displayed in a window. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5577 The function `set-window-buffer' increments it. */); |
22150
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5578 |
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5579 DEFVAR_PER_BUFFER ("buffer-display-time", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5580 ¤t_buffer->display_time, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5581 doc: /* Time stamp updated each time this buffer is displayed in a window. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5582 The function `set-window-buffer' updates this variable |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5583 to the value obtained by calling `current-time'. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5584 If the buffer has never been shown in a window, the value is nil. */); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5585 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5586 DEFVAR_LISP ("transient-mark-mode", &Vtransient_mark_mode, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5587 doc: /* *Non-nil means deactivate the mark when the buffer contents change. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5588 Non-nil also enables highlighting of the region whenever the mark is active. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5589 The variable `highlight-nonselected-windows' controls whether to highlight |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5590 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
|
5591 Vtransient_mark_mode = Qnil; |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
5592 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5593 DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5594 doc: /* *Non-nil means disregard read-only status of buffers or characters. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5595 If the value is t, disregard `buffer-read-only' and all `read-only' |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5596 text properties. If the value is a list, disregard `buffer-read-only' |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5597 and disregard a `read-only' text property if the property value |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5598 is a member of the list. */); |
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
5599 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
|
5600 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5601 DEFVAR_PER_BUFFER ("cursor-type", ¤t_buffer->cursor_type, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5602 doc: /* Cursor to use in window displaying this buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5603 Values are interpreted as follows: |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5604 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5605 t use the cursor specified for the frame |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5606 nil don't display a cursor |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5607 `bar' display a bar cursor with default width |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5608 (bar . WIDTH) display a bar cursor with width WIDTH |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5609 others display a box cursor. */); |
28322
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
5610 |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
5611 DEFVAR_PER_BUFFER ("line-spacing", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5612 ¤t_buffer->extra_line_spacing, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5613 doc: /* Additional space to put between lines when displaying a buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5614 The space is measured in pixels, and put below lines on window systems. */); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5615 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5616 DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5617 doc: /* List of functions called with no args to query before killing a buffer. */); |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
5618 Vkill_buffer_query_functions = Qnil; |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
5619 |
14506
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
5620 defsubr (&Sbuffer_live_p); |
333 | 5621 defsubr (&Sbuffer_list); |
5622 defsubr (&Sget_buffer); | |
5623 defsubr (&Sget_file_buffer); | |
5624 defsubr (&Sget_buffer_create); | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
5625 defsubr (&Smake_indirect_buffer); |
392 | 5626 defsubr (&Sgenerate_new_buffer_name); |
333 | 5627 defsubr (&Sbuffer_name); |
5628 /*defsubr (&Sbuffer_number);*/ | |
5629 defsubr (&Sbuffer_file_name); | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
5630 defsubr (&Sbuffer_base_buffer); |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
5631 defsubr (&Sbuffer_local_value); |
333 | 5632 defsubr (&Sbuffer_local_variables); |
5633 defsubr (&Sbuffer_modified_p); | |
5634 defsubr (&Sset_buffer_modified_p); | |
5635 defsubr (&Sbuffer_modified_tick); | |
5636 defsubr (&Srename_buffer); | |
5637 defsubr (&Sother_buffer); | |
5638 defsubr (&Sbuffer_disable_undo); | |
5639 defsubr (&Sbuffer_enable_undo); | |
5640 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
|
5641 defsubr (&Sset_buffer_major_mode); |
333 | 5642 defsubr (&Sswitch_to_buffer); |
5643 defsubr (&Spop_to_buffer); | |
5644 defsubr (&Scurrent_buffer); | |
5645 defsubr (&Sset_buffer); | |
5646 defsubr (&Sbarf_if_buffer_read_only); | |
5647 defsubr (&Sbury_buffer); | |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
5648 defsubr (&Serase_buffer); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
5649 defsubr (&Sset_buffer_multibyte); |
333 | 5650 defsubr (&Skill_all_local_variables); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5651 |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
5652 defsubr (&Soverlayp); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5653 defsubr (&Smake_overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5654 defsubr (&Sdelete_overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5655 defsubr (&Smove_overlay); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
5656 defsubr (&Soverlay_start); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
5657 defsubr (&Soverlay_end); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
5658 defsubr (&Soverlay_buffer); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
5659 defsubr (&Soverlay_properties); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5660 defsubr (&Soverlays_at); |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
5661 defsubr (&Soverlays_in); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5662 defsubr (&Snext_overlay_change); |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
5663 defsubr (&Sprevious_overlay_change); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5664 defsubr (&Soverlay_recenter); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5665 defsubr (&Soverlay_lists); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5666 defsubr (&Soverlay_get); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
5667 defsubr (&Soverlay_put); |
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
5668 defsubr (&Srestore_buffer_modified_p); |
333 | 5669 } |
5670 | |
21514 | 5671 void |
333 | 5672 keys_of_buffer () |
5673 { | |
5674 initial_define_key (control_x_map, 'b', "switch-to-buffer"); | |
5675 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
|
5676 |
2c5f3537a1cc
(syms_of_buffer): Don't do (put 'erase-buffer 'disabled t) here.
Roland McGrath <roland@gnu.org>
parents:
5502
diff
changeset
|
5677 /* 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
|
5678 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
|
5679 Fput (intern ("erase-buffer"), Qdisabled, Qt); |
333 | 5680 } |