Mercurial > emacs
annotate src/buffer.c @ 15032:0d32c8a2ae39
(syms_of_buffer): Doc fix.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 16 Apr 1996 16:10:19 +0000 |
| parents | bddd8114eaa9 |
| children | a46a40f1c30c |
| rev | line source |
|---|---|
| 333 | 1 /* Buffer manipulation primitives for GNU Emacs. |
|
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
2 Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995 |
|
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 |
| 22 | |
|
1563
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
23 #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
|
24 #include <sys/stat.h> |
| 333 | 25 #include <sys/param.h> |
| 26 | |
| 27 #ifndef MAXPATHLEN | |
| 28 /* in 4.1, param.h fails to define this. */ | |
| 29 #define MAXPATHLEN 1024 | |
| 30 #endif /* not MAXPATHLEN */ | |
| 31 | |
|
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4574
diff
changeset
|
32 #include <config.h> |
| 333 | 33 #include "lisp.h" |
|
1308
2660a7053836
* buffer.c: #include intervals.h.
Joseph Arceneaux <jla@gnu.org>
parents:
1291
diff
changeset
|
34 #include "intervals.h" |
| 333 | 35 #include "window.h" |
| 36 #include "commands.h" | |
| 37 #include "buffer.h" | |
|
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
38 #include "region-cache.h" |
| 333 | 39 #include "indent.h" |
| 2480 | 40 #include "blockinput.h" |
| 333 | 41 |
| 42 struct buffer *current_buffer; /* the current buffer */ | |
| 43 | |
| 44 /* First buffer in chain of all buffers (in reverse order of creation). | |
| 45 Threaded through ->next. */ | |
| 46 | |
| 47 struct buffer *all_buffers; | |
| 48 | |
| 49 /* This structure holds the default values of the buffer-local variables | |
| 50 defined with DEFVAR_PER_BUFFER, that have special slots in each buffer. | |
| 51 The default value occupies the same slot in this structure | |
| 52 as an individual buffer's value occupies in that buffer. | |
| 53 Setting the default value also goes through the alist of buffers | |
| 54 and stores into each buffer that does not say it has a local value. */ | |
| 55 | |
| 56 struct buffer buffer_defaults; | |
| 57 | |
| 58 /* A Lisp_Object pointer to the above, used for staticpro */ | |
| 59 | |
| 60 static Lisp_Object Vbuffer_defaults; | |
| 61 | |
| 62 /* This structure marks which slots in a buffer have corresponding | |
| 63 default values in buffer_defaults. | |
| 64 Each such slot has a nonzero value in this structure. | |
| 65 The value has only one nonzero bit. | |
| 66 | |
| 67 When a buffer has its own local value for a slot, | |
| 68 the bit for that slot (found in the same slot in this structure) | |
| 69 is turned on in the buffer's local_var_flags slot. | |
| 70 | |
| 71 If a slot in this structure is -1, then even though there may | |
| 72 be a DEFVAR_PER_BUFFER for the slot, there is no default value for it; | |
| 73 and the corresponding slot in buffer_defaults is not used. | |
| 74 | |
| 75 If a slot is -2, then there is no DEFVAR_PER_BUFFER for it, | |
| 76 but there is a default value which is copied into each buffer. | |
| 77 | |
| 78 If a slot in this structure is negative, then even though there may | |
| 79 be a DEFVAR_PER_BUFFER for the slot, there is no default value for it; | |
| 80 and the corresponding slot in buffer_defaults is not used. | |
| 81 | |
| 82 If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is | |
| 83 zero, that is a bug */ | |
| 84 | |
| 85 struct buffer buffer_local_flags; | |
| 86 | |
| 87 /* This structure holds the names of symbols whose values may be | |
| 88 buffer-local. It is indexed and accessed in the same way as the above. */ | |
| 89 | |
| 90 struct buffer buffer_local_symbols; | |
| 91 /* A Lisp_Object pointer to the above, used for staticpro */ | |
| 92 static Lisp_Object Vbuffer_local_symbols; | |
| 93 | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
94 /* 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
|
95 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
|
96 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
|
97 slot contains an integer, then prospective values' tags must be |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
98 equal to that integer. When a tag does not match, the function |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
99 buffer_slot_type_mismatch will signal an error. */ |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
100 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
|
101 |
| 333 | 102 Lisp_Object Fset_buffer (); |
| 392 | 103 void set_buffer_internal (); |
|
11889
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
104 void set_buffer_internal_1 (); |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
105 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
|
106 static void swap_out_buffer_local_variables (); |
| 333 | 107 |
| 108 /* Alist of all buffer names vs the buffers. */ | |
| 109 /* This used to be a variable, but is no longer, | |
| 110 to prevent lossage due to user rplac'ing this alist or its elements. */ | |
| 111 Lisp_Object Vbuffer_alist; | |
| 112 | |
| 113 /* Functions to call before and after each text change. */ | |
| 114 Lisp_Object Vbefore_change_function; | |
| 115 Lisp_Object Vafter_change_function; | |
|
6785
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
116 Lisp_Object Vbefore_change_functions; |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
117 Lisp_Object Vafter_change_functions; |
| 333 | 118 |
|
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
119 Lisp_Object Vtransient_mark_mode; |
|
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
120 |
|
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
121 /* 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
|
122 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
|
123 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
|
124 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
|
125 |
|
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
126 /* 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
|
127 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
|
128 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
|
129 |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
130 /* 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
|
131 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
|
132 |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
133 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
|
134 Lisp_Object Qbefore_change_functions; |
|
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
135 Lisp_Object Qafter_change_functions; |
| 333 | 136 |
| 137 Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; | |
| 138 | |
| 139 Lisp_Object Qprotected_field; | |
| 140 | |
| 141 Lisp_Object QSFundamental; /* A string "Fundamental" */ | |
| 142 | |
| 143 Lisp_Object Qkill_buffer_hook; | |
| 144 | |
| 5433 | 145 Lisp_Object Qget_file_buffer; |
| 146 | |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
147 Lisp_Object Qoverlayp; |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
148 |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
149 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
|
150 |
|
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
151 Lisp_Object Qmodification_hooks; |
|
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
152 Lisp_Object Qinsert_in_front_hooks; |
|
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
153 Lisp_Object Qinsert_behind_hooks; |
|
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
154 |
| 333 | 155 /* For debugging; temporary. See set_buffer_internal. */ |
| 156 /* Lisp_Object Qlisp_mode, Vcheck_symbol; */ | |
| 157 | |
| 158 nsberror (spec) | |
| 159 Lisp_Object spec; | |
| 160 { | |
|
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
161 if (STRINGP (spec)) |
| 333 | 162 error ("No buffer named %s", XSTRING (spec)->data); |
| 163 error ("Invalid buffer argument"); | |
| 164 } | |
| 165 | |
|
14506
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
166 DEFUN ("buffer-live-p", Fbuffer_live_p, Sbuffer_live_p, 1, 1, 0, |
|
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
167 "Return non-nil if OBJECT is a buffer which has not been killed.\n\ |
|
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
168 Value is nil if OBJECT is not a buffer or if it has been killed.") |
|
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
169 (object) |
|
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
170 Lisp_Object object; |
|
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
171 { |
|
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
172 return ((BUFFERP (object) && ! NILP (XBUFFER (object)->name)) |
|
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
173 ? Qt : Qnil); |
|
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
174 } |
|
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
175 |
| 333 | 176 DEFUN ("buffer-list", Fbuffer_list, Sbuffer_list, 0, 0, 0, |
| 177 "Return a list of all existing live buffers.") | |
| 178 () | |
| 179 { | |
| 180 return Fmapcar (Qcdr, Vbuffer_alist); | |
| 181 } | |
| 182 | |
|
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
183 /* 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
|
184 (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
|
185 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
|
186 |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
187 static Lisp_Object |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
188 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
|
189 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
|
190 Lisp_Object list; |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
191 { |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
192 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
|
193 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
|
194 { |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
195 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
|
196 elt = Fcar (tail); |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
197 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
|
198 if (!NILP (tem)) |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
199 return elt; |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
200 } |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
201 return Qnil; |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
202 } |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
203 |
| 333 | 204 DEFUN ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0, |
| 205 "Return the buffer named NAME (a string).\n\ | |
| 206 If there is no live buffer named NAME, return nil.\n\ | |
| 207 NAME may also be a buffer; if so, the value is that buffer.") | |
| 208 (name) | |
| 209 register Lisp_Object name; | |
| 210 { | |
|
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
211 if (BUFFERP (name)) |
| 333 | 212 return name; |
| 213 CHECK_STRING (name, 0); | |
| 214 | |
|
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
215 return Fcdr (assoc_ignore_text_properties (name, Vbuffer_alist)); |
| 333 | 216 } |
| 217 | |
| 218 DEFUN ("get-file-buffer", Fget_file_buffer, Sget_file_buffer, 1, 1, 0, | |
| 219 "Return the buffer visiting file FILENAME (a string).\n\ | |
| 6169 | 220 The buffer's `buffer-file-name' must match exactly the expansion of FILENAME.\n\ |
|
9047
122d7c1a868b
(get-file-buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9006
diff
changeset
|
221 If there is no such live buffer, return nil.\n\ |
|
122d7c1a868b
(get-file-buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
9006
diff
changeset
|
222 See also `find-buffer-visiting'.") |
| 333 | 223 (filename) |
| 224 register Lisp_Object filename; | |
| 225 { | |
| 226 register Lisp_Object tail, buf, tem; | |
| 5433 | 227 Lisp_Object handler; |
| 228 | |
| 333 | 229 CHECK_STRING (filename, 0); |
| 230 filename = Fexpand_file_name (filename, Qnil); | |
| 231 | |
| 5433 | 232 /* If the file name has special constructs in it, |
| 233 call the corresponding file handler. */ | |
|
7028
6915bf781a38
Pass operation to Ffind_file_name_handler.
Karl Heuer <kwzh@gnu.org>
parents:
6785
diff
changeset
|
234 handler = Ffind_file_name_handler (filename, Qget_file_buffer); |
| 5433 | 235 if (!NILP (handler)) |
| 236 return call2 (handler, Qget_file_buffer, filename); | |
| 237 | |
| 333 | 238 for (tail = Vbuffer_alist; CONSP (tail); tail = XCONS (tail)->cdr) |
| 239 { | |
| 240 buf = Fcdr (XCONS (tail)->car); | |
|
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
241 if (!BUFFERP (buf)) continue; |
|
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
242 if (!STRINGP (XBUFFER (buf)->filename)) continue; |
| 333 | 243 tem = Fstring_equal (XBUFFER (buf)->filename, filename); |
| 485 | 244 if (!NILP (tem)) |
| 333 | 245 return buf; |
| 246 } | |
| 247 return Qnil; | |
| 248 } | |
| 249 | |
|
12810
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
250 Lisp_Object |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
251 get_truename_buffer (filename) |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
252 register Lisp_Object filename; |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
253 { |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
254 register Lisp_Object tail, buf, tem; |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
255 |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
256 for (tail = Vbuffer_alist; CONSP (tail); tail = XCONS (tail)->cdr) |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
257 { |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
258 buf = Fcdr (XCONS (tail)->car); |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
259 if (!BUFFERP (buf)) continue; |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
260 if (!STRINGP (XBUFFER (buf)->file_truename)) continue; |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
261 tem = Fstring_equal (XBUFFER (buf)->file_truename, filename); |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
262 if (!NILP (tem)) |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
263 return buf; |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
264 } |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
265 return Qnil; |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
266 } |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
267 |
| 333 | 268 /* Incremented for each buffer created, to assign the buffer number. */ |
| 269 int buffer_count; | |
| 270 | |
| 271 DEFUN ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0, | |
| 272 "Return the buffer named NAME, or create such a buffer and return it.\n\ | |
| 273 A new buffer is created if there is no live buffer named NAME.\n\ | |
|
1195
beefc235076e
* buffer.c (Fget_buffer_create): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1041
diff
changeset
|
274 If NAME starts with a space, the new buffer does not keep undo information.\n\ |
| 333 | 275 If NAME is a buffer instead of a string, then it is the value returned.\n\ |
| 276 The value is never nil.") | |
| 277 (name) | |
| 278 register Lisp_Object name; | |
| 279 { | |
|
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
280 register Lisp_Object buf; |
| 333 | 281 register struct buffer *b; |
| 282 | |
| 283 buf = Fget_buffer (name); | |
| 485 | 284 if (!NILP (buf)) |
| 333 | 285 return buf; |
| 286 | |
|
6697
28e36f59e856
(Fget_buffer_create): Disallow empty string.
Karl Heuer <kwzh@gnu.org>
parents:
6675
diff
changeset
|
287 if (XSTRING (name)->size == 0) |
|
28e36f59e856
(Fget_buffer_create): Disallow empty string.
Karl Heuer <kwzh@gnu.org>
parents:
6675
diff
changeset
|
288 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
|
289 |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
290 b = (struct buffer *) xmalloc (sizeof (struct buffer)); |
| 333 | 291 |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
292 b->size = sizeof (struct buffer) / sizeof (EMACS_INT); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
293 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
294 /* 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
|
295 b->text = &b->own_text; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
296 b->base_buffer = 0; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
297 |
| 333 | 298 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
|
299 BLOCK_INPUT; |
| 333 | 300 BUFFER_ALLOC (BUF_BEG_ADDR (b), BUF_GAP_SIZE (b)); |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
301 UNBLOCK_INPUT; |
| 333 | 302 if (! BUF_BEG_ADDR (b)) |
|
10668
acbd9fab366a
(Fget_buffer_create): Call buffer_memory_full.
Richard M. Stallman <rms@gnu.org>
parents:
10611
diff
changeset
|
303 buffer_memory_full (); |
| 333 | 304 |
| 305 BUF_PT (b) = 1; | |
| 306 BUF_GPT (b) = 1; | |
| 307 BUF_BEGV (b) = 1; | |
| 308 BUF_ZV (b) = 1; | |
| 309 BUF_Z (b) = 1; | |
| 310 BUF_MODIFF (b) = 1; | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
311 BUF_SAVE_MODIFF (b) = 1; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
312 BUF_INTERVALS (b) = 0; |
| 333 | 313 |
|
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
314 b->newline_cache = 0; |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
315 b->width_run_cache = 0; |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
316 b->width_table = Qnil; |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
317 |
| 333 | 318 /* Put this on the chain of all buffers including killed ones. */ |
| 319 b->next = all_buffers; | |
| 320 all_buffers = b; | |
| 321 | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
322 /* An ordinary buffer normally doesn't need markers |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
323 to handle BEGV and ZV. */ |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
324 b->pt_marker = Qnil; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
325 b->begv_marker = Qnil; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
326 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
|
327 |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
328 name = Fcopy_sequence (name); |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
329 INITIALIZE_INTERVAL (XSTRING (name), NULL_INTERVAL); |
| 333 | 330 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
|
331 |
| 333 | 332 if (XSTRING (name)->data[0] != ' ') |
| 333 b->undo_list = Qnil; | |
| 334 else | |
| 335 b->undo_list = Qt; | |
| 336 | |
| 337 reset_buffer (b); | |
|
8873
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
338 reset_buffer_local_variables (b); |
| 333 | 339 |
| 340 /* 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
|
341 XSETBUFFER (buf, b); |
| 333 | 342 Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil)); |
| 343 | |
| 344 b->mark = Fmake_marker (); | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
345 BUF_MARKERS (b) = Qnil; |
| 333 | 346 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
|
347 return buf; |
| 333 | 348 } |
| 349 | |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
350 DEFUN ("make-indirect-buffer", Fmake_indirect_buffer, Smake_indirect_buffer, 2, 2, |
|
11838
92a61e91ec05
(Fmake_indirect_buffer): Fix interactive spec.
Karl Heuer <kwzh@gnu.org>
parents:
11823
diff
changeset
|
351 "bMake indirect buffer (to buffer): \nBName of indirect buffer: ", |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
352 "Create and return an indirect buffer for buffer BASE-BUFFER, named NAME.\n\ |
|
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
353 BASE-BUFFER should be an existing buffer (or buffer name).\n\ |
|
11000
8482ccc01ec7
(Fmake_indirect_buffer): Invert the arguments.
Richard M. Stallman <rms@gnu.org>
parents:
10967
diff
changeset
|
354 NAME should be a string which is not the name of an existing buffer.") |
|
8482ccc01ec7
(Fmake_indirect_buffer): Invert the arguments.
Richard M. Stallman <rms@gnu.org>
parents:
10967
diff
changeset
|
355 (base_buffer, name) |
|
8482ccc01ec7
(Fmake_indirect_buffer): Invert the arguments.
Richard M. Stallman <rms@gnu.org>
parents:
10967
diff
changeset
|
356 register Lisp_Object base_buffer, name; |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
357 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
358 register Lisp_Object buf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
359 register struct buffer *b; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
360 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
361 buf = Fget_buffer (name); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
362 if (!NILP (buf)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
363 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
|
364 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
365 base_buffer = Fget_buffer (base_buffer); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
366 if (NILP (base_buffer)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
367 error ("No such buffer: `%s'", |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
368 XSTRING (XBUFFER (base_buffer)->name)->data); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
369 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
370 if (XSTRING (name)->size == 0) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
371 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
|
372 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
373 b = (struct buffer *) xmalloc (sizeof (struct buffer)); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
374 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
375 b->size = sizeof (struct buffer) / sizeof (EMACS_INT); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
376 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
377 if (XBUFFER (base_buffer)->base_buffer) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
378 b->base_buffer = XBUFFER (base_buffer)->base_buffer; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
379 else |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
380 b->base_buffer = XBUFFER (base_buffer); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
381 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
382 /* Use the base buffer's text object. */ |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
383 b->text = b->base_buffer->text; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
384 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
385 BUF_BEGV (b) = BUF_BEGV (b->base_buffer); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
386 BUF_ZV (b) = BUF_ZV (b->base_buffer); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
387 BUF_PT (b) = BUF_PT (b->base_buffer); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
388 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
389 b->newline_cache = 0; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
390 b->width_run_cache = 0; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
391 b->width_table = Qnil; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
392 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
393 /* 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
|
394 b->next = all_buffers; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
395 all_buffers = b; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
396 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
397 name = Fcopy_sequence (name); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
398 INITIALIZE_INTERVAL (XSTRING (name), NULL_INTERVAL); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
399 b->name = name; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
400 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
401 reset_buffer (b); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
402 reset_buffer_local_variables (b); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
403 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
404 /* 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
|
405 XSETBUFFER (buf, b); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
406 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
|
407 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
408 b->mark = Fmake_marker (); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
409 b->name = name; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
410 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
411 /* 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
|
412 if (NILP (b->base_buffer->pt_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
413 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
414 b->base_buffer->pt_marker = Fmake_marker (); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
415 Fset_marker (b->base_buffer->pt_marker, |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
416 make_number (BUF_PT (b->base_buffer)), base_buffer); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
417 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
418 if (NILP (b->base_buffer->begv_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
419 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
420 b->base_buffer->begv_marker = Fmake_marker (); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
421 Fset_marker (b->base_buffer->begv_marker, |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
422 make_number (BUF_BEGV (b->base_buffer)), base_buffer); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
423 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
424 if (NILP (b->base_buffer->zv_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
425 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
426 b->base_buffer->zv_marker = Fmake_marker (); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
427 Fset_marker (b->base_buffer->zv_marker, |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
428 make_number (BUF_ZV (b->base_buffer)), 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
|
429 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
|
430 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
431 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
432 /* Give the indirect buffer markers for its narrowing. */ |
|
13114
c521a85eaafd
(Fmake_indirect_buffer): Was taking marker positions
Richard M. Stallman <rms@gnu.org>
parents:
13110
diff
changeset
|
433 b->pt_marker = Fmake_marker (); |
|
c521a85eaafd
(Fmake_indirect_buffer): Was taking marker positions
Richard M. Stallman <rms@gnu.org>
parents:
13110
diff
changeset
|
434 Fset_marker (b->pt_marker, make_number (BUF_PT (b)), buf); |
|
c521a85eaafd
(Fmake_indirect_buffer): Was taking marker positions
Richard M. Stallman <rms@gnu.org>
parents:
13110
diff
changeset
|
435 b->begv_marker = Fmake_marker (); |
|
c521a85eaafd
(Fmake_indirect_buffer): Was taking marker positions
Richard M. Stallman <rms@gnu.org>
parents:
13110
diff
changeset
|
436 Fset_marker (b->begv_marker, make_number (BUF_BEGV (b)), buf); |
|
c521a85eaafd
(Fmake_indirect_buffer): Was taking marker positions
Richard M. Stallman <rms@gnu.org>
parents:
13110
diff
changeset
|
437 b->zv_marker = Fmake_marker (); |
|
c521a85eaafd
(Fmake_indirect_buffer): Was taking marker positions
Richard M. Stallman <rms@gnu.org>
parents:
13110
diff
changeset
|
438 Fset_marker (b->zv_marker, make_number (BUF_ZV (b)), buf); |
|
c521a85eaafd
(Fmake_indirect_buffer): Was taking marker positions
Richard M. Stallman <rms@gnu.org>
parents:
13110
diff
changeset
|
439 |
|
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
|
440 XMARKER (b->zv_marker)->insertion_type = 1; |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
441 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
442 return buf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
443 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
444 |
|
8873
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
445 /* 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
|
446 and local variables. */ |
| 333 | 447 |
| 448 void | |
| 449 reset_buffer (b) | |
| 450 register struct buffer *b; | |
| 451 { | |
| 452 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
|
453 b->file_truename = Qnil; |
| 333 | 454 b->directory = (current_buffer) ? current_buffer->directory : Qnil; |
| 455 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
|
456 XSETFASTINT (b->save_length, 0); |
| 333 | 457 b->last_window_start = 1; |
| 458 b->backed_up = Qnil; | |
| 459 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
|
460 b->auto_save_failure_time = -1; |
| 333 | 461 b->auto_save_file_name = Qnil; |
| 462 b->read_only = Qnil; | |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
463 b->overlays_before = Qnil; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
464 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
|
465 XSETFASTINT (b->overlay_center, 1); |
|
3242
f873e6b9af52
(reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents:
3226
diff
changeset
|
466 b->mark_active = Qnil; |
|
10561
53f34c870201
(init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
10505
diff
changeset
|
467 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
|
468 b->file_format = Qnil; |
|
13263
b135b01ba0e2
(reset_buffer): Initialize extra1, extra2 and extra3 slots.
Richard M. Stallman <rms@gnu.org>
parents:
13262
diff
changeset
|
469 b->extra1 = Qnil; |
|
b135b01ba0e2
(reset_buffer): Initialize extra1, extra2 and extra3 slots.
Richard M. Stallman <rms@gnu.org>
parents:
13262
diff
changeset
|
470 b->extra2 = Qnil; |
|
b135b01ba0e2
(reset_buffer): Initialize extra1, extra2 and extra3 slots.
Richard M. Stallman <rms@gnu.org>
parents:
13262
diff
changeset
|
471 b->extra3 = Qnil; |
| 333 | 472 } |
| 473 | |
|
8873
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
474 /* 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
|
475 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
|
476 it does not treat permanent locals consistently. |
|
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
477 Instead, use Fkill_all_local_variables. */ |
|
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
478 |
|
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
479 reset_buffer_local_variables (b) |
| 333 | 480 register struct buffer *b; |
| 481 { | |
| 482 register int offset; | |
| 483 | |
| 484 /* Reset the major mode to Fundamental, together with all the | |
| 485 things that depend on the major mode. | |
| 486 default-major-mode is handled at a higher level. | |
| 487 We ignore it here. */ | |
| 488 b->major_mode = Qfundamental_mode; | |
| 489 b->keymap = Qnil; | |
| 490 b->abbrev_table = Vfundamental_mode_abbrev_table; | |
| 491 b->mode_name = QSFundamental; | |
| 492 b->minor_modes = Qnil; | |
|
13270
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
493 |
|
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
494 /* 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
|
495 fix up its insides first. */ |
|
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
496 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
|
497 && 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
|
498 && 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
|
499 Fset_standard_case_table (Vascii_downcase_table); |
|
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
500 |
| 333 | 501 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
|
502 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
|
503 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
|
504 b->case_eqv_table = XCHAR_TABLE (Vascii_downcase_table)->extras[2]; |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
505 b->buffer_file_type = Qnil; |
|
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
506 b->invisibility_spec = Qt; |
|
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
507 |
| 333 | 508 #if 0 |
| 509 b->sort_table = XSTRING (Vascii_sort_table); | |
| 510 b->folding_sort_table = XSTRING (Vascii_folding_sort_table); | |
| 511 #endif /* 0 */ | |
| 512 | |
| 513 /* Reset all per-buffer variables to their defaults. */ | |
| 514 b->local_var_alist = Qnil; | |
| 515 b->local_var_flags = 0; | |
| 516 | |
| 517 /* For each slot that has a default value, | |
| 518 copy that into the slot. */ | |
| 519 | |
| 520 for (offset = (char *)&buffer_local_flags.name - (char *)&buffer_local_flags; | |
| 521 offset < sizeof (struct buffer); | |
|
8818
0996472bb39d
(reset_buffer_local_variables, Fbuffer_local_variables)
Richard M. Stallman <rms@gnu.org>
parents:
8599
diff
changeset
|
522 offset += sizeof (Lisp_Object)) /* sizeof EMACS_INT == sizeof Lisp_Object */ |
|
9362
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
523 { |
|
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
524 int flag = XINT (*(Lisp_Object *)(offset + (char *)&buffer_local_flags)); |
|
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
525 if (flag > 0 || flag == -2) |
|
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
526 *(Lisp_Object *)(offset + (char *)b) = |
|
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
527 *(Lisp_Object *)(offset + (char *)&buffer_defaults); |
|
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
528 } |
| 333 | 529 } |
| 530 | |
| 392 | 531 /* We split this away from generate-new-buffer, because rename-buffer |
| 532 and set-visited-file-name ought to be able to use this to really | |
| 533 rename the buffer properly. */ | |
| 534 | |
| 535 DEFUN ("generate-new-buffer-name", Fgenerate_new_buffer_name, Sgenerate_new_buffer_name, | |
|
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
536 1, 2, 0, |
| 392 | 537 "Return a string that is the name of no existing buffer based on NAME.\n\ |
| 538 If there is no live buffer named NAME, then return NAME.\n\ | |
| 333 | 539 Otherwise modify name by appending `<NUMBER>', incrementing NUMBER\n\ |
|
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
540 until an unused name is found, and then return that name.\n\ |
|
3329
c9443f73d329
(Fgenerate_new_buffer_name): Doc fix.
Roland McGrath <roland@gnu.org>
parents:
3295
diff
changeset
|
541 Optional second argument IGNORE specifies a name that is okay to use\n\ |
|
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
542 \(if it is in the sequence to be tried)\n\ |
|
3295
4d405f172c79
(reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents:
3242
diff
changeset
|
543 even if a buffer with that name exists.") |
|
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
544 (name, ignore) |
|
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
545 register Lisp_Object name, ignore; |
| 333 | 546 { |
| 547 register Lisp_Object gentemp, tem; | |
| 548 int count; | |
| 549 char number[10]; | |
| 550 | |
| 551 CHECK_STRING (name, 0); | |
| 552 | |
| 553 tem = Fget_buffer (name); | |
| 485 | 554 if (NILP (tem)) |
| 392 | 555 return name; |
| 333 | 556 |
| 557 count = 1; | |
| 558 while (1) | |
| 559 { | |
| 560 sprintf (number, "<%d>", ++count); | |
| 561 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
|
562 tem = Fstring_equal (gentemp, ignore); |
|
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
563 if (!NILP (tem)) |
|
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
564 return gentemp; |
| 333 | 565 tem = Fget_buffer (gentemp); |
| 485 | 566 if (NILP (tem)) |
| 392 | 567 return gentemp; |
| 333 | 568 } |
| 569 } | |
| 570 | |
| 571 | |
| 572 DEFUN ("buffer-name", Fbuffer_name, Sbuffer_name, 0, 1, 0, | |
| 573 "Return the name of BUFFER, as a string.\n\ | |
| 392 | 574 With no argument or nil as argument, return the name of the current buffer.") |
| 333 | 575 (buffer) |
| 576 register Lisp_Object buffer; | |
| 577 { | |
| 485 | 578 if (NILP (buffer)) |
| 333 | 579 return current_buffer->name; |
| 580 CHECK_BUFFER (buffer, 0); | |
| 581 return XBUFFER (buffer)->name; | |
| 582 } | |
| 583 | |
| 584 DEFUN ("buffer-file-name", Fbuffer_file_name, Sbuffer_file_name, 0, 1, 0, | |
| 585 "Return name of file BUFFER is visiting, or nil if none.\n\ | |
| 586 No argument or nil as argument means use the current buffer.") | |
| 587 (buffer) | |
| 588 register Lisp_Object buffer; | |
| 589 { | |
| 485 | 590 if (NILP (buffer)) |
| 333 | 591 return current_buffer->filename; |
| 592 CHECK_BUFFER (buffer, 0); | |
| 593 return XBUFFER (buffer)->filename; | |
| 594 } | |
| 595 | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
596 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
|
597 0, 1, 0, |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
598 "Return the base buffer of indirect buffer BUFFER.\n\ |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
599 If BUFFER is not indirect, return nil.") |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
600 (buffer) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
601 register Lisp_Object buffer; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
602 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
603 struct buffer *base; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
604 Lisp_Object base_buffer; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
605 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
606 if (NILP (buffer)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
607 base = current_buffer->base_buffer; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
608 else |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
609 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
610 CHECK_BUFFER (buffer, 0); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
611 base = XBUFFER (buffer)->base_buffer; |
|
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 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
614 if (! base) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
615 return Qnil; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
616 XSETBUFFER (base_buffer, base); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
617 return base_buffer; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
618 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
619 |
| 333 | 620 DEFUN ("buffer-local-variables", Fbuffer_local_variables, |
| 621 Sbuffer_local_variables, 0, 1, 0, | |
| 622 "Return an alist of variables that are buffer-local in BUFFER.\n\ | |
|
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
623 Most elements look like (SYMBOL . VALUE), describing one variable.\n\ |
|
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
624 For a symbol that is locally unbound, just the symbol appears in the value.\n\ |
| 333 | 625 Note that storing new VALUEs in these elements doesn't change the variables.\n\ |
| 626 No argument or nil as argument means use current buffer as BUFFER.") | |
| 627 (buffer) | |
| 628 register Lisp_Object buffer; | |
| 629 { | |
| 630 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
|
631 register Lisp_Object result; |
| 333 | 632 |
| 485 | 633 if (NILP (buffer)) |
| 333 | 634 buf = current_buffer; |
| 635 else | |
| 636 { | |
| 637 CHECK_BUFFER (buffer, 0); | |
| 638 buf = XBUFFER (buffer); | |
| 639 } | |
| 640 | |
|
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
641 result = Qnil; |
|
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
642 |
| 333 | 643 { |
|
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
644 register Lisp_Object tail; |
|
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
645 for (tail = buf->local_var_alist; CONSP (tail); tail = XCONS (tail)->cdr) |
| 333 | 646 { |
|
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
647 Lisp_Object val, elt; |
|
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
648 |
|
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
649 elt = XCONS (tail)->car; |
|
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
650 |
|
10505
4f7f9b9ff513
(syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents:
10443
diff
changeset
|
651 /* 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
|
652 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
|
653 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
|
654 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
|
655 for that buffer, making the alist up to date automatically. */ |
|
4f7f9b9ff513
(syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents:
10443
diff
changeset
|
656 val = find_symbol_value (XCONS (elt)->car); |
|
4f7f9b9ff513
(syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents:
10443
diff
changeset
|
657 /* 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
|
658 if (buf != current_buffer) |
|
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
659 val = XCONS (elt)->cdr; |
|
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
660 |
|
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
661 /* 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
|
662 if (EQ (val, Qunbound)) |
|
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
663 result = Fcons (XCONS (elt)->car, result); |
|
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
664 /* 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
|
665 else |
|
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
666 result = Fcons (Fcons (XCONS (elt)->car, val), result); |
| 333 | 667 } |
| 668 } | |
| 669 | |
| 670 /* Add on all the variables stored in special slots. */ | |
| 671 { | |
| 672 register int offset, mask; | |
| 673 | |
| 674 for (offset = (char *)&buffer_local_symbols.name - (char *)&buffer_local_symbols; | |
| 675 offset < sizeof (struct buffer); | |
|
8818
0996472bb39d
(reset_buffer_local_variables, Fbuffer_local_variables)
Richard M. Stallman <rms@gnu.org>
parents:
8599
diff
changeset
|
676 offset += (sizeof (EMACS_INT))) /* sizeof EMACS_INT == sizeof Lisp_Object */ |
| 333 | 677 { |
|
9362
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
678 mask = XINT (*(Lisp_Object *)(offset + (char *)&buffer_local_flags)); |
| 333 | 679 if (mask == -1 || (buf->local_var_flags & mask)) |
|
9362
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
680 if (SYMBOLP (*(Lisp_Object *)(offset |
|
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
681 + (char *)&buffer_local_symbols))) |
|
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
682 result = Fcons (Fcons (*((Lisp_Object *) |
|
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
683 (offset + (char *)&buffer_local_symbols)), |
|
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
684 *(Lisp_Object *)(offset + (char *)buf)), |
|
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
685 result); |
| 333 | 686 } |
| 687 } | |
|
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
688 |
|
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
689 return result; |
| 333 | 690 } |
| 691 | |
| 692 | |
| 693 DEFUN ("buffer-modified-p", Fbuffer_modified_p, Sbuffer_modified_p, | |
| 694 0, 1, 0, | |
| 695 "Return t if BUFFER was modified since its file was last read or saved.\n\ | |
| 696 No argument or nil as argument means use current buffer as BUFFER.") | |
| 697 (buffer) | |
| 698 register Lisp_Object buffer; | |
| 699 { | |
| 700 register struct buffer *buf; | |
| 485 | 701 if (NILP (buffer)) |
| 333 | 702 buf = current_buffer; |
| 703 else | |
| 704 { | |
| 705 CHECK_BUFFER (buffer, 0); | |
| 706 buf = XBUFFER (buffer); | |
| 707 } | |
| 708 | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
709 return BUF_SAVE_MODIFF (buf) < BUF_MODIFF (buf) ? Qt : Qnil; |
| 333 | 710 } |
| 711 | |
| 712 DEFUN ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p, | |
| 713 1, 1, 0, | |
| 714 "Mark current buffer as modified or unmodified according to FLAG.\n\ | |
| 715 A non-nil FLAG means mark the buffer modified.") | |
| 716 (flag) | |
| 717 register Lisp_Object flag; | |
| 718 { | |
| 719 register int already; | |
| 720 register Lisp_Object fn; | |
| 721 | |
| 722 #ifdef CLASH_DETECTION | |
| 723 /* If buffer becoming modified, lock the file. | |
| 724 If buffer becoming unmodified, unlock the file. */ | |
| 725 | |
|
11659
f9b6e65774e7
(Fset_buffer_modified_p): Use the truename for locking.
Richard M. Stallman <rms@gnu.org>
parents:
11473
diff
changeset
|
726 fn = current_buffer->file_truename; |
| 485 | 727 if (!NILP (fn)) |
| 333 | 728 { |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
729 already = SAVE_MODIFF < MODIFF; |
| 485 | 730 if (!already && !NILP (flag)) |
| 333 | 731 lock_file (fn); |
| 485 | 732 else if (already && NILP (flag)) |
| 333 | 733 unlock_file (fn); |
| 734 } | |
| 735 #endif /* CLASH_DETECTION */ | |
| 736 | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
737 SAVE_MODIFF = NILP (flag) ? MODIFF : 0; |
| 333 | 738 update_mode_lines++; |
| 739 return flag; | |
| 740 } | |
| 741 | |
| 742 DEFUN ("buffer-modified-tick", Fbuffer_modified_tick, Sbuffer_modified_tick, | |
| 743 0, 1, 0, | |
| 744 "Return BUFFER's tick counter, incremented for each change in text.\n\ | |
| 745 Each buffer has a tick counter which is incremented each time the text in\n\ | |
| 746 that buffer is changed. It wraps around occasionally.\n\ | |
| 747 No argument or nil as argument means use current buffer as BUFFER.") | |
| 748 (buffer) | |
| 749 register Lisp_Object buffer; | |
| 750 { | |
| 751 register struct buffer *buf; | |
| 485 | 752 if (NILP (buffer)) |
| 333 | 753 buf = current_buffer; |
| 754 else | |
| 755 { | |
| 756 CHECK_BUFFER (buffer, 0); | |
| 757 buf = XBUFFER (buffer); | |
| 758 } | |
| 759 | |
| 760 return make_number (BUF_MODIFF (buf)); | |
| 761 } | |
| 762 | |
| 392 | 763 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
|
764 "sRename buffer (to new name): \nP", |
| 333 | 765 "Change current buffer's name to NEWNAME (a string).\n\ |
|
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
766 If second arg UNIQUE is nil or omitted, it is an error if a\n\ |
| 392 | 767 buffer named NEWNAME already exists.\n\ |
|
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
768 If UNIQUE is non-nil, come up with a new name using\n\ |
| 392 | 769 `generate-new-buffer-name'.\n\ |
|
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
770 Interactively, you can set UNIQUE with a prefix argument.\n\ |
|
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
771 We return the name we actually gave the buffer.\n\ |
| 333 | 772 This does not change the name of the visited file (if any).") |
|
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
773 (newname, unique) |
|
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
774 register Lisp_Object newname, unique; |
| 333 | 775 { |
| 776 register Lisp_Object tem, buf; | |
| 777 | |
|
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
778 CHECK_STRING (newname, 0); |
|
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
779 |
|
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
780 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
|
781 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
|
782 |
|
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
783 tem = Fget_buffer (newname); |
|
5075
8deb7113bbdf
(Frename_buffer): When the current buffer is already named NAME, don't
Roland McGrath <roland@gnu.org>
parents:
5074
diff
changeset
|
784 /* Don't short-circuit if UNIQUE is t. That is a useful way to rename |
|
8deb7113bbdf
(Frename_buffer): When the current buffer is already named NAME, don't
Roland McGrath <roland@gnu.org>
parents:
5074
diff
changeset
|
785 the buffer automatically so you can create another with the original name. |
|
8deb7113bbdf
(Frename_buffer): When the current buffer is already named NAME, don't
Roland McGrath <roland@gnu.org>
parents:
5074
diff
changeset
|
786 It makes UNIQUE equivalent to |
|
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
787 (rename-buffer (generate-new-buffer-name NEWNAME)). */ |
|
5075
8deb7113bbdf
(Frename_buffer): When the current buffer is already named NAME, don't
Roland McGrath <roland@gnu.org>
parents:
5074
diff
changeset
|
788 if (NILP (unique) && XBUFFER (tem) == current_buffer) |
|
9939
686916b836b4
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9933
diff
changeset
|
789 return current_buffer->name; |
| 485 | 790 if (!NILP (tem)) |
| 392 | 791 { |
|
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
792 if (!NILP (unique)) |
|
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
793 newname = Fgenerate_new_buffer_name (newname, current_buffer->name); |
| 392 | 794 else |
|
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
795 error ("Buffer name `%s' is in use", XSTRING (newname)->data); |
| 392 | 796 } |
| 333 | 797 |
|
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
798 current_buffer->name = newname; |
|
1707
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
799 |
|
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
800 /* 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
|
801 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
|
802 update_mode_lines++; |
|
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
803 |
|
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
804 XSETBUFFER (buf, current_buffer); |
|
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
805 Fsetcar (Frassq (buf, Vbuffer_alist), newname); |
|
8599
cf3233d70e94
(Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents:
8550
diff
changeset
|
806 if (NILP (current_buffer->filename) |
|
cf3233d70e94
(Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents:
8550
diff
changeset
|
807 && !NILP (current_buffer->auto_save_file_name)) |
| 333 | 808 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
|
809 /* 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
|
810 return current_buffer->name; |
| 333 | 811 } |
| 812 | |
|
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
813 DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 2, 0, |
| 333 | 814 "Return most recently selected buffer other than BUFFER.\n\ |
|
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
815 Buffers not visible in windows are preferred to visible buffers,\n\ |
|
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
816 unless optional second argument VISIBLE-OK is non-nil.\n\ |
| 333 | 817 If no other buffer exists, the buffer `*scratch*' is returned.\n\ |
| 818 If BUFFER is omitted or nil, some interesting buffer is returned.") | |
|
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
819 (buffer, visible_ok) |
|
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
820 register Lisp_Object buffer, visible_ok; |
| 333 | 821 { |
|
14226
ad275aca6fc5
(Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
822 Lisp_Object Fset_buffer_major_mode (); |
| 333 | 823 register Lisp_Object tail, buf, notsogood, tem; |
| 824 notsogood = Qnil; | |
| 825 | |
| 485 | 826 for (tail = Vbuffer_alist; !NILP (tail); tail = Fcdr (tail)) |
| 333 | 827 { |
| 828 buf = Fcdr (Fcar (tail)); | |
| 829 if (EQ (buf, buffer)) | |
| 830 continue; | |
| 831 if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ') | |
| 832 continue; | |
|
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
833 #ifdef MULTI_FRAME |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
834 /* 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
|
835 disregard buffers that don't fit the predicate. */ |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
836 tem = frame_buffer_predicate (); |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
837 if (!NILP (tem)) |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
838 { |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
839 tem = call1 (tem, buf); |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
840 if (NILP (tem)) |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
841 continue; |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
842 } |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
843 #endif |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
844 |
|
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
845 if (NILP (visible_ok)) |
|
3802
594bc11c67ba
Don't let the 'B' interactive spec default to buffers viewed in
Jim Blandy <jimb@redhat.com>
parents:
3785
diff
changeset
|
846 tem = Fget_buffer_window (buf, Qt); |
|
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
847 else |
|
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
848 tem = Qnil; |
| 485 | 849 if (NILP (tem)) |
| 333 | 850 return buf; |
| 485 | 851 if (NILP (notsogood)) |
| 333 | 852 notsogood = buf; |
| 853 } | |
| 485 | 854 if (!NILP (notsogood)) |
| 333 | 855 return notsogood; |
|
14226
ad275aca6fc5
(Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
856 buf = Fget_buffer_create (build_string ("*scratch*")); |
|
ad275aca6fc5
(Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
857 Fset_buffer_major_mode (buf); |
|
ad275aca6fc5
(Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
858 return buf; |
| 333 | 859 } |
| 860 | |
|
12110
d7d7f15f3a92
(Fbuffer_disable_undo): Make this function interactive.
Karl Heuer <kwzh@gnu.org>
parents:
12101
diff
changeset
|
861 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
|
862 0, 1, "", |
|
5247
0cf95629f6c4
(Fbuffer_disable_undo): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
5075
diff
changeset
|
863 "Make BUFFER stop keeping undo information.\n\ |
|
0cf95629f6c4
(Fbuffer_disable_undo): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
5075
diff
changeset
|
864 No argument or nil as argument means do this for the current buffer.") |
| 648 | 865 (buffer) |
| 866 register Lisp_Object buffer; | |
| 333 | 867 { |
| 648 | 868 Lisp_Object real_buffer; |
| 869 | |
| 870 if (NILP (buffer)) | |
|
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
871 XSETBUFFER (real_buffer, current_buffer); |
| 648 | 872 else |
| 873 { | |
| 874 real_buffer = Fget_buffer (buffer); | |
| 875 if (NILP (real_buffer)) | |
| 876 nsberror (buffer); | |
| 877 } | |
| 878 | |
| 879 XBUFFER (real_buffer)->undo_list = Qt; | |
| 880 | |
| 333 | 881 return Qnil; |
| 882 } | |
| 883 | |
| 884 DEFUN ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo, | |
| 885 0, 1, "", | |
| 886 "Start keeping undo information for buffer BUFFER.\n\ | |
| 887 No argument or nil as argument means do this for the current buffer.") | |
| 648 | 888 (buffer) |
| 889 register Lisp_Object buffer; | |
| 333 | 890 { |
| 648 | 891 Lisp_Object real_buffer; |
| 333 | 892 |
| 648 | 893 if (NILP (buffer)) |
|
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
894 XSETBUFFER (real_buffer, current_buffer); |
| 333 | 895 else |
| 896 { | |
| 648 | 897 real_buffer = Fget_buffer (buffer); |
| 898 if (NILP (real_buffer)) | |
| 899 nsberror (buffer); | |
| 333 | 900 } |
| 901 | |
| 648 | 902 if (EQ (XBUFFER (real_buffer)->undo_list, Qt)) |
| 903 XBUFFER (real_buffer)->undo_list = Qnil; | |
| 333 | 904 |
| 905 return Qnil; | |
| 906 } | |
| 907 | |
| 908 /* | |
| 909 DEFVAR_LISP ("kill-buffer-hook", no_cell, "\ | |
| 910 Hook to be run (by `run-hooks', which see) when a buffer is killed.\n\ | |
| 911 The buffer being killed will be current while the hook is running.\n\ | |
| 912 See `kill-buffer'." | |
| 913 */ | |
| 914 DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 1, 1, "bKill buffer: ", | |
| 915 "Kill the buffer BUFFER.\n\ | |
| 916 The argument may be a buffer or may be the name of a buffer.\n\ | |
| 917 An argument of nil means kill the current buffer.\n\n\ | |
| 918 Value is t if the buffer is actually killed, nil if user says no.\n\n\ | |
| 919 The value of `kill-buffer-hook' (which may be local to that buffer),\n\ | |
| 920 if not void, is a list of functions to be called, with no arguments,\n\ | |
| 921 before the buffer is actually killed. The buffer to be killed is current\n\ | |
| 922 when the hook functions are called.\n\n\ | |
| 923 Any processes that have this buffer as the `process-buffer' are killed\n\ | |
| 924 with `delete-process'.") | |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
925 (buffer) |
|
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
926 Lisp_Object buffer; |
| 333 | 927 { |
| 928 Lisp_Object buf; | |
| 929 register struct buffer *b; | |
| 930 register Lisp_Object tem; | |
| 931 register struct Lisp_Marker *m; | |
| 932 struct gcpro gcpro1, gcpro2; | |
| 933 | |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
934 if (NILP (buffer)) |
| 333 | 935 buf = Fcurrent_buffer (); |
| 936 else | |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
937 buf = Fget_buffer (buffer); |
| 485 | 938 if (NILP (buf)) |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
939 nsberror (buffer); |
| 333 | 940 |
| 941 b = XBUFFER (buf); | |
| 942 | |
|
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
943 /* Avoid trouble for buffer already dead. */ |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
944 if (NILP (b->name)) |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
945 return Qnil; |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
946 |
| 333 | 947 /* Query if the buffer is still modified. */ |
| 485 | 948 if (INTERACTIVE && !NILP (b->filename) |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
949 && BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) |
| 333 | 950 { |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
951 GCPRO1 (buf); |
| 333 | 952 tem = do_yes_or_no_p (format1 ("Buffer %s modified; kill anyway? ", |
| 953 XSTRING (b->name)->data)); | |
| 954 UNGCPRO; | |
| 485 | 955 if (NILP (tem)) |
| 333 | 956 return Qnil; |
| 957 } | |
| 958 | |
|
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
959 /* Run hooks with the buffer to be killed the current buffer. */ |
| 333 | 960 { |
| 961 register Lisp_Object val; | |
| 962 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
|
963 Lisp_Object list; |
| 333 | 964 |
| 965 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
| 966 set_buffer_internal (b); | |
|
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
967 |
|
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
968 /* 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
|
969 don't kill the buffer. */ |
|
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
970 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
|
971 { |
|
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
972 tem = call0 (Fcar (list)); |
|
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
973 if (NILP (tem)) |
|
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
974 return unbind_to (count, Qnil); |
|
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
975 } |
|
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
976 |
|
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
977 /* Then run the hooks. */ |
|
6205
88e41d7d1e27
(Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents:
6169
diff
changeset
|
978 if (!NILP (Vrun_hooks)) |
|
88e41d7d1e27
(Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents:
6169
diff
changeset
|
979 call1 (Vrun_hooks, Qkill_buffer_hook); |
| 333 | 980 unbind_to (count, Qnil); |
| 981 } | |
| 982 | |
| 983 /* We have no more questions to ask. Verify that it is valid | |
| 984 to kill the buffer. This must be done after the questions | |
| 985 since anything can happen within do_yes_or_no_p. */ | |
| 986 | |
| 987 /* Don't kill the minibuffer now current. */ | |
| 988 if (EQ (buf, XWINDOW (minibuf_window)->buffer)) | |
| 989 return Qnil; | |
| 990 | |
| 485 | 991 if (NILP (b->name)) |
| 333 | 992 return Qnil; |
| 993 | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
994 /* 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
|
995 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
|
996 ask questions or their hooks get errors. */ |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
997 if (! b->base_buffer) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
998 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
999 struct buffer *other; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1000 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1001 GCPRO1 (buf); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1002 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1003 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
|
1004 /* all_buffers contains dead buffers too; |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1005 don't re-kill them. */ |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1006 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
|
1007 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1008 Lisp_Object buf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1009 XSETBUFFER (buf, other); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1010 Fkill_buffer (buf); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1011 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1012 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1013 UNGCPRO; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1014 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1015 |
| 333 | 1016 /* Make this buffer not be current. |
| 1017 In the process, notice if this is the sole visible buffer | |
| 1018 and give up if so. */ | |
| 1019 if (b == current_buffer) | |
| 1020 { | |
|
1348
f6ab9d1e1709
(Fkill_buffer): Pass 2nd arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1308
diff
changeset
|
1021 tem = Fother_buffer (buf, Qnil); |
| 333 | 1022 Fset_buffer (tem); |
| 1023 if (b == current_buffer) | |
| 1024 return Qnil; | |
| 1025 } | |
| 1026 | |
| 1027 /* Now there is no question: we can kill the buffer. */ | |
| 1028 | |
| 1029 #ifdef CLASH_DETECTION | |
| 1030 /* Unlock this buffer's file, if it is locked. */ | |
| 1031 unlock_buffer (b); | |
| 1032 #endif /* CLASH_DETECTION */ | |
| 1033 | |
| 1034 kill_buffer_processes (buf); | |
| 1035 | |
| 1036 tem = Vinhibit_quit; | |
| 1037 Vinhibit_quit = Qt; | |
|
13922
5636ed4243ec
(Fkill_buffer): Delete buffer from Vbuffer_alist after replacing it.
Erik Naggum <erik@naggum.no>
parents:
13917
diff
changeset
|
1038 replace_buffer_in_all_windows (buf); |
| 333 | 1039 Vbuffer_alist = Fdelq (Frassq (buf, Vbuffer_alist), Vbuffer_alist); |
| 1040 Vinhibit_quit = tem; | |
| 1041 | |
|
7994
c5b7f74b5023
(Fkill_buffer): Don't delete auto save file
Richard M. Stallman <rms@gnu.org>
parents:
7985
diff
changeset
|
1042 /* Delete any auto-save file, if we saved it in this session. */ |
|
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1043 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
|
1044 && b->auto_save_modified != 0 |
|
86fef98acedc
(Fkill_buffer): Don't kill auto save file if not recent.
Richard M. Stallman <rms@gnu.org>
parents:
13169
diff
changeset
|
1045 && SAVE_MODIFF < b->auto_save_modified) |
| 333 | 1046 { |
| 1047 Lisp_Object tem; | |
| 1048 tem = Fsymbol_value (intern ("delete-auto-save-files")); | |
| 485 | 1049 if (! NILP (tem)) |
|
10082
8d3a71736423
(Fkill_buffer): Use internal_delete_file.
Richard M. Stallman <rms@gnu.org>
parents:
9950
diff
changeset
|
1050 internal_delete_file (b->auto_save_file_name); |
| 333 | 1051 } |
| 1052 | |
|
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1053 if (b->base_buffer) |
| 333 | 1054 { |
|
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1055 /* 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
|
1056 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
|
1057 or its other indirect buffers. */ |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1058 for (tem = BUF_MARKERS (b); !NILP (tem); ) |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1059 { |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1060 Lisp_Object next; |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1061 m = XMARKER (tem); |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1062 next = m->chain; |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1063 if (m->buffer == b) |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1064 unchain_marker (tem); |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1065 tem = next; |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1066 } |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1067 } |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1068 else |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1069 { |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1070 /* 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
|
1071 and leave them pointing nowhere. */ |
|
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1072 for (tem = BUF_MARKERS (b); !NILP (tem); ) |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1073 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1074 m = XMARKER (tem); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1075 m->buffer = 0; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1076 tem = m->chain; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1077 m->chain = Qnil; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1078 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1079 BUF_MARKERS (b) = Qnil; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1080 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1081 #ifdef USE_TEXT_PROPERTIES |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1082 BUF_INTERVALS (b) = NULL_INTERVAL; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1083 #endif |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1084 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1085 /* Perhaps we should explicitly free the interval tree here... */ |
| 333 | 1086 } |
|
1291
7c32612174c3
* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents:
1281
diff
changeset
|
1087 |
|
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1088 /* 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
|
1089 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
|
1090 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
|
1091 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
|
1092 swap_out_buffer_local_variables (b); |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1093 reset_buffer_local_variables (b); |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1094 |
| 333 | 1095 b->name = Qnil; |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1096 |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
1097 BLOCK_INPUT; |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1098 if (! b->base_buffer) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1099 BUFFER_FREE (BUF_BEG_ADDR (b)); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1100 |
|
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1101 if (b->newline_cache) |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1102 { |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1103 free_region_cache (b->newline_cache); |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1104 b->newline_cache = 0; |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1105 } |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1106 if (b->width_run_cache) |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1107 { |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1108 free_region_cache (b->width_run_cache); |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1109 b->width_run_cache = 0; |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1110 } |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1111 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
|
1112 UNBLOCK_INPUT; |
| 333 | 1113 b->undo_list = Qnil; |
| 1114 | |
| 1115 return Qt; | |
| 1116 } | |
| 1117 | |
| 550 | 1118 /* Move the assoc for buffer BUF to the front of buffer-alist. Since |
| 1119 we do this each time BUF is selected visibly, the more recently | |
| 1120 selected buffers are always closer to the front of the list. This | |
| 1121 means that other_buffer is more likely to choose a relevant buffer. */ | |
| 333 | 1122 |
| 1123 record_buffer (buf) | |
| 1124 Lisp_Object buf; | |
| 1125 { | |
| 1126 register Lisp_Object link, prev; | |
| 1127 | |
| 1128 prev = Qnil; | |
| 1129 for (link = Vbuffer_alist; CONSP (link); link = XCONS (link)->cdr) | |
| 1130 { | |
| 1131 if (EQ (XCONS (XCONS (link)->car)->cdr, buf)) | |
| 1132 break; | |
| 1133 prev = link; | |
| 1134 } | |
| 1135 | |
| 550 | 1136 /* Effectively do Vbuffer_alist = Fdelq (link, Vbuffer_alist); |
| 1137 we cannot use Fdelq itself here because it allows quitting. */ | |
| 333 | 1138 |
| 485 | 1139 if (NILP (prev)) |
| 333 | 1140 Vbuffer_alist = XCONS (Vbuffer_alist)->cdr; |
| 1141 else | |
| 1142 XCONS (prev)->cdr = XCONS (XCONS (prev)->cdr)->cdr; | |
| 1143 | |
| 1144 XCONS(link)->cdr = Vbuffer_alist; | |
| 1145 Vbuffer_alist = link; | |
| 1146 } | |
| 1147 | |
|
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1148 DEFUN ("set-buffer-major-mode", Fset_buffer_major_mode, Sset_buffer_major_mode, 1, 1, 0, |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1149 "Set an appropriate major mode for BUFFER, according to `default-major-mode'.\n\ |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1150 Use this function before selecting the buffer, since it may need to inspect\n\ |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1151 the current buffer's major mode.") |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1152 (buffer) |
|
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1153 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
|
1154 { |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1155 int count; |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1156 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
|
1157 |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1158 function = buffer_defaults.major_mode; |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1159 if (NILP (function) && NILP (Fget (current_buffer->major_mode, Qmode_class))) |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1160 function = current_buffer->major_mode; |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1161 |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1162 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
|
1163 return Qnil; |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1164 |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1165 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
|
1166 |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1167 /* 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
|
1168 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
|
1169 |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1170 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
|
1171 |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1172 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
|
1173 call0 (function); |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1174 |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1175 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
|
1176 } |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1177 |
| 333 | 1178 DEFUN ("switch-to-buffer", Fswitch_to_buffer, Sswitch_to_buffer, 1, 2, "BSwitch to buffer: ", |
| 1179 "Select buffer BUFFER in the current window.\n\ | |
| 1180 BUFFER may be a buffer or a buffer name.\n\ | |
| 1181 Optional second arg NORECORD non-nil means\n\ | |
| 1182 do not put this buffer at the front of the list of recently selected ones.\n\ | |
| 1183 \n\ | |
| 1184 WARNING: This is NOT the way to work on another buffer temporarily\n\ | |
| 1185 within a Lisp program! Use `set-buffer' instead. That avoids messing with\n\ | |
| 1186 the window-buffer correspondences.") | |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1187 (buffer, norecord) |
|
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1188 Lisp_Object buffer, norecord; |
| 333 | 1189 { |
| 1190 register Lisp_Object buf; | |
| 1191 Lisp_Object tem; | |
| 1192 | |
| 1193 if (EQ (minibuf_window, selected_window)) | |
| 1194 error ("Cannot switch buffers in minibuffer window"); | |
| 1195 tem = Fwindow_dedicated_p (selected_window); | |
| 485 | 1196 if (!NILP (tem)) |
| 333 | 1197 error ("Cannot switch buffers in a dedicated window"); |
| 1198 | |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1199 if (NILP (buffer)) |
|
1348
f6ab9d1e1709
(Fkill_buffer): Pass 2nd arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1308
diff
changeset
|
1200 buf = Fother_buffer (Fcurrent_buffer (), Qnil); |
| 333 | 1201 else |
|
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1202 { |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1203 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
|
1204 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
|
1205 { |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1206 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
|
1207 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
|
1208 } |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1209 } |
| 333 | 1210 Fset_buffer (buf); |
| 485 | 1211 if (NILP (norecord)) |
| 333 | 1212 record_buffer (buf); |
| 1213 | |
| 1214 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
|
1215 ? 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
|
1216 : selected_window, |
| 333 | 1217 buf); |
| 1218 | |
|
3295
4d405f172c79
(reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents:
3242
diff
changeset
|
1219 return buf; |
| 333 | 1220 } |
| 1221 | |
| 1222 DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 2, 0, | |
| 1223 "Select buffer BUFFER in some window, preferably a different one.\n\ | |
| 1224 If BUFFER is nil, then some other buffer is chosen.\n\ | |
| 1225 If `pop-up-windows' is non-nil, windows can be split to do this.\n\ | |
| 1226 If optional second arg OTHER-WINDOW is non-nil, insist on finding another\n\ | |
| 1227 window even if BUFFER is already visible in the selected window.") | |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1228 (buffer, other_window) |
|
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1229 Lisp_Object buffer, other_window; |
| 333 | 1230 { |
| 1231 register Lisp_Object buf; | |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1232 if (NILP (buffer)) |
|
1348
f6ab9d1e1709
(Fkill_buffer): Pass 2nd arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1308
diff
changeset
|
1233 buf = Fother_buffer (Fcurrent_buffer (), Qnil); |
| 333 | 1234 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
|
1235 { |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1236 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
|
1237 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
|
1238 { |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1239 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
|
1240 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
|
1241 } |
|
3aea65d9eb68
(Fpop_to_buffer): Call Fset_buffer_major_mode if we create a buffer.
Richard M. Stallman <rms@gnu.org>
parents:
10751
diff
changeset
|
1242 } |
| 333 | 1243 Fset_buffer (buf); |
| 1244 record_buffer (buf); | |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1245 Fselect_window (Fdisplay_buffer (buf, other_window)); |
|
3295
4d405f172c79
(reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents:
3242
diff
changeset
|
1246 return buf; |
| 333 | 1247 } |
| 1248 | |
| 1249 DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0, | |
| 1250 "Return the current buffer as a Lisp object.") | |
| 1251 () | |
| 1252 { | |
| 1253 register Lisp_Object buf; | |
|
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
1254 XSETBUFFER (buf, current_buffer); |
| 333 | 1255 return buf; |
| 1256 } | |
| 1257 | |
|
11889
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1258 /* Set the current buffer to B. */ |
| 333 | 1259 |
| 1260 void | |
| 1261 set_buffer_internal (b) | |
| 1262 register struct buffer *b; | |
| 1263 { | |
| 1264 register struct buffer *old_buf; | |
| 1265 register Lisp_Object tail, valcontents; | |
|
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1266 Lisp_Object tem; |
| 333 | 1267 |
| 1268 if (current_buffer == b) | |
| 1269 return; | |
| 1270 | |
| 1271 windows_or_buffers_changed = 1; | |
|
11889
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1272 set_buffer_internal_1 (b); |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1273 } |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1274 |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1275 /* 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
|
1276 This is used by redisplay. */ |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1277 |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1278 void |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1279 set_buffer_internal_1 (b) |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1280 register struct buffer *b; |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1281 { |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1282 register struct buffer *old_buf; |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1283 register Lisp_Object tail, valcontents; |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1284 Lisp_Object tem; |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1285 |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1286 if (current_buffer == b) |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1287 return; |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1288 |
| 333 | 1289 old_buf = current_buffer; |
| 1290 current_buffer = b; | |
| 1291 last_known_column_point = -1; /* invalidate indentation cache */ | |
| 1292 | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1293 if (old_buf) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1294 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1295 /* 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
|
1296 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
|
1297 if (old_buf->base_buffer) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1298 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
|
1299 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1300 /* 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
|
1301 when it is not current, update them now. */ |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1302 if (! NILP (old_buf->pt_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1303 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1304 Lisp_Object obuf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1305 XSETBUFFER (obuf, old_buf); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1306 Fset_marker (old_buf->pt_marker, BUF_PT (old_buf), obuf); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1307 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1308 if (! NILP (old_buf->begv_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1309 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1310 Lisp_Object obuf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1311 XSETBUFFER (obuf, old_buf); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1312 Fset_marker (old_buf->begv_marker, BUF_BEGV (old_buf), obuf); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1313 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1314 if (! NILP (old_buf->zv_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1315 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1316 Lisp_Object obuf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1317 XSETBUFFER (obuf, old_buf); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1318 Fset_marker (old_buf->zv_marker, BUF_ZV (old_buf), obuf); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1319 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1320 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1321 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1322 /* 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
|
1323 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
|
1324 if (b->base_buffer) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1325 b->undo_list = b->base_buffer->undo_list; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1326 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1327 /* 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
|
1328 when it is not current, fetch them now. */ |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1329 if (! NILP (b->pt_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1330 BUF_PT (b) = marker_position (b->pt_marker); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1331 if (! NILP (b->begv_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1332 BUF_BEGV (b) = marker_position (b->begv_marker); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1333 if (! NILP (b->zv_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1334 BUF_ZV (b) = marker_position (b->zv_marker); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1335 |
| 333 | 1336 /* Look down buffer's list of local Lisp variables |
| 1337 to find and update any that forward into C variables. */ | |
| 1338 | |
| 485 | 1339 for (tail = b->local_var_alist; !NILP (tail); tail = XCONS (tail)->cdr) |
| 333 | 1340 { |
| 1341 valcontents = XSYMBOL (XCONS (XCONS (tail)->car)->car)->value; | |
|
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1342 if ((BUFFER_LOCAL_VALUEP (valcontents) |
|
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1343 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
9892
beb59716f299
(set_buffer_internal): Use XBUFFER_LOCAL_VALUE, not XCONS.
Karl Heuer <kwzh@gnu.org>
parents:
9810
diff
changeset
|
1344 && (tem = XBUFFER_LOCAL_VALUE (valcontents)->car, |
|
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1345 (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem)))) |
| 333 | 1346 /* Just reference the variable |
| 1347 to cause it to become set for this buffer. */ | |
| 1348 Fsymbol_value (XCONS (XCONS (tail)->car)->car); | |
| 1349 } | |
| 1350 | |
| 1351 /* Do the same with any others that were local to the previous buffer */ | |
| 1352 | |
| 1353 if (old_buf) | |
| 485 | 1354 for (tail = old_buf->local_var_alist; !NILP (tail); tail = XCONS (tail)->cdr) |
| 333 | 1355 { |
| 1356 valcontents = XSYMBOL (XCONS (XCONS (tail)->car)->car)->value; | |
|
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1357 if ((BUFFER_LOCAL_VALUEP (valcontents) |
|
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1358 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
9892
beb59716f299
(set_buffer_internal): Use XBUFFER_LOCAL_VALUE, not XCONS.
Karl Heuer <kwzh@gnu.org>
parents:
9810
diff
changeset
|
1359 && (tem = XBUFFER_LOCAL_VALUE (valcontents)->car, |
|
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1360 (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem)))) |
| 333 | 1361 /* Just reference the variable |
| 1362 to cause it to become set for this buffer. */ | |
| 1363 Fsymbol_value (XCONS (XCONS (tail)->car)->car); | |
| 1364 } | |
| 1365 } | |
| 1366 | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1367 /* 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
|
1368 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
|
1369 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1370 void |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1371 set_buffer_temp (b) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1372 struct buffer *b; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1373 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1374 register struct buffer *old_buf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1375 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1376 if (current_buffer == b) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1377 return; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1378 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1379 old_buf = current_buffer; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1380 current_buffer = b; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1381 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1382 if (old_buf) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1383 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1384 /* 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
|
1385 when it is not current, update them now. */ |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1386 if (! NILP (old_buf->pt_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1387 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1388 Lisp_Object obuf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1389 XSETBUFFER (obuf, old_buf); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1390 Fset_marker (old_buf->pt_marker, BUF_PT (old_buf), obuf); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1391 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1392 if (! NILP (old_buf->begv_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1393 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1394 Lisp_Object obuf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1395 XSETBUFFER (obuf, old_buf); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1396 Fset_marker (old_buf->begv_marker, BUF_BEGV (old_buf), obuf); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1397 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1398 if (! NILP (old_buf->zv_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1399 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1400 Lisp_Object obuf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1401 XSETBUFFER (obuf, old_buf); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1402 Fset_marker (old_buf->zv_marker, BUF_ZV (old_buf), obuf); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1403 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1404 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1405 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1406 /* 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
|
1407 when it is not current, fetch them now. */ |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1408 if (! NILP (b->pt_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1409 BUF_PT (b) = marker_position (b->pt_marker); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1410 if (! NILP (b->begv_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1411 BUF_BEGV (b) = marker_position (b->begv_marker); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1412 if (! NILP (b->zv_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1413 BUF_ZV (b) = marker_position (b->zv_marker); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1414 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1415 |
| 333 | 1416 DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0, |
| 1417 "Make the buffer BUFFER current for editing operations.\n\ | |
| 1418 BUFFER may be a buffer or the name of an existing buffer.\n\ | |
| 1419 See also `save-excursion' when you want to make a buffer current temporarily.\n\ | |
| 1420 This function does not display the buffer, so its effect ends\n\ | |
| 1421 when the current command terminates.\n\ | |
| 1422 Use `switch-to-buffer' or `pop-to-buffer' to switch buffers permanently.") | |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1423 (buffer) |
|
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1424 register Lisp_Object buffer; |
| 333 | 1425 { |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1426 register Lisp_Object buf; |
|
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1427 buf = Fget_buffer (buffer); |
|
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1428 if (NILP (buf)) |
|
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1429 nsberror (buffer); |
|
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1430 if (NILP (XBUFFER (buf)->name)) |
| 333 | 1431 error ("Selecting deleted buffer"); |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1432 set_buffer_internal (XBUFFER (buf)); |
|
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1433 return buf; |
| 333 | 1434 } |
| 1435 | |
| 1436 DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only, | |
| 1437 Sbarf_if_buffer_read_only, 0, 0, 0, | |
| 1438 "Signal a `buffer-read-only' error if the current buffer is read-only.") | |
| 1439 () | |
| 1440 { | |
|
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
1441 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
|
1442 && NILP (Vinhibit_read_only)) |
| 333 | 1443 Fsignal (Qbuffer_read_only, (Fcons (Fcurrent_buffer (), Qnil))); |
| 1444 return Qnil; | |
| 1445 } | |
| 1446 | |
| 1447 DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "", | |
| 1448 "Put BUFFER at the end of the list of all buffers.\n\ | |
| 1449 There it is the least likely candidate for `other-buffer' to return;\n\ | |
|
739
0bb85f26b79c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
1450 thus, the least likely buffer for \\[switch-to-buffer] to select by default.\n\ |
|
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1451 If BUFFER is nil or omitted, bury the current buffer.\n\ |
|
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1452 Also, if BUFFER is nil or omitted, remove the current buffer from the\n\ |
|
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1453 selected window if it is displayed there.") |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1454 (buffer) |
|
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1455 register Lisp_Object buffer; |
| 333 | 1456 { |
|
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1457 /* 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
|
1458 if (NILP (buffer)) |
|
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1459 { |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1460 XSETBUFFER (buffer, current_buffer); |
|
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1461 |
|
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1462 /* If we're burying the current buffer, unshow it. */ |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1463 Fswitch_to_buffer (Fother_buffer (buffer, Qnil), Qnil); |
|
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1464 } |
| 333 | 1465 else |
| 1466 { | |
| 1467 Lisp_Object buf1; | |
| 1468 | |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1469 buf1 = Fget_buffer (buffer); |
| 485 | 1470 if (NILP (buf1)) |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1471 nsberror (buffer); |
|
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1472 buffer = buf1; |
|
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1473 } |
|
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1474 |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1475 /* Move buffer to the end of the buffer list. */ |
|
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1476 { |
|
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1477 register Lisp_Object aelt, link; |
|
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1478 |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1479 aelt = Frassq (buffer, Vbuffer_alist); |
|
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1480 link = Fmemq (aelt, Vbuffer_alist); |
|
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1481 Vbuffer_alist = Fdelq (aelt, Vbuffer_alist); |
|
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1482 XCONS (link)->cdr = Qnil; |
|
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1483 Vbuffer_alist = nconc2 (Vbuffer_alist, link); |
|
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1484 } |
|
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1485 |
| 333 | 1486 return Qnil; |
| 1487 } | |
| 1488 | |
|
1953
714df59790af
(Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents:
1952
diff
changeset
|
1489 DEFUN ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, "*", |
| 333 | 1490 "Delete the entire contents of the current buffer.\n\ |
|
4942
0ea29f510ba0
(Ferase_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
4852
diff
changeset
|
1491 Any narrowing restriction in effect (see `narrow-to-region') is removed,\n\ |
| 333 | 1492 so the buffer is truly empty after this.") |
| 1493 () | |
| 1494 { | |
| 1495 Fwiden (); | |
| 1496 del_range (BEG, Z); | |
| 1497 current_buffer->last_window_start = 1; | |
| 1498 /* Prevent warnings, or suspension of auto saving, that would happen | |
| 1499 if future size is less than past size. Use of erase-buffer | |
| 1500 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
|
1501 XSETFASTINT (current_buffer->save_length, 0); |
| 333 | 1502 return Qnil; |
| 1503 } | |
| 1504 | |
| 1505 validate_region (b, e) | |
| 1506 register Lisp_Object *b, *e; | |
| 1507 { | |
| 1508 CHECK_NUMBER_COERCE_MARKER (*b, 0); | |
| 1509 CHECK_NUMBER_COERCE_MARKER (*e, 1); | |
| 1510 | |
| 1511 if (XINT (*b) > XINT (*e)) | |
| 1512 { | |
|
9335
8cf58b38d244
(validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents:
9296
diff
changeset
|
1513 Lisp_Object tem; |
|
8cf58b38d244
(validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents:
9296
diff
changeset
|
1514 tem = *b; *b = *e; *e = tem; |
| 333 | 1515 } |
| 1516 | |
| 1517 if (!(BEGV <= XINT (*b) && XINT (*b) <= XINT (*e) | |
| 1518 && XINT (*e) <= ZV)) | |
| 1519 args_out_of_range (*b, *e); | |
| 1520 } | |
| 1521 | |
| 1522 DEFUN ("kill-all-local-variables", Fkill_all_local_variables, Skill_all_local_variables, | |
| 1523 0, 0, 0, | |
| 1524 "Switch to Fundamental mode by killing current buffer's local variables.\n\ | |
| 1525 Most local variable bindings are eliminated so that the default values\n\ | |
| 1526 become effective once more. Also, the syntax table is set from\n\ | |
| 1527 `standard-syntax-table', the local keymap is set to nil,\n\ | |
| 1528 and the abbrev table from `fundamental-mode-abbrev-table'.\n\ | |
| 1529 This function also forces redisplay of the mode line.\n\ | |
| 1530 \n\ | |
| 1531 Every function to select a new major mode starts by\n\ | |
| 1532 calling this function.\n\n\ | |
| 1533 As a special exception, local variables whose names have\n\ | |
|
7062
6356b8d3144e
(Fkill_all_local_variables): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7053
diff
changeset
|
1534 a non-nil `permanent-local' property are not eliminated by this function.\n\ |
|
6356b8d3144e
(Fkill_all_local_variables): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7053
diff
changeset
|
1535 \n\ |
|
6356b8d3144e
(Fkill_all_local_variables): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7053
diff
changeset
|
1536 The first thing this function does is run\n\ |
|
6356b8d3144e
(Fkill_all_local_variables): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7053
diff
changeset
|
1537 the normal hook `change-major-mode-hook'.") |
| 333 | 1538 () |
| 1539 { | |
| 1540 register Lisp_Object alist, sym, tem; | |
| 1541 Lisp_Object oalist; | |
|
5873
fa8b769ef564
(Fkill_all_local_variables): Run change-major-mode-hook.
Karl Heuer <kwzh@gnu.org>
parents:
5857
diff
changeset
|
1542 |
|
6205
88e41d7d1e27
(Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents:
6169
diff
changeset
|
1543 if (!NILP (Vrun_hooks)) |
|
88e41d7d1e27
(Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents:
6169
diff
changeset
|
1544 call1 (Vrun_hooks, intern ("change-major-mode-hook")); |
| 333 | 1545 oalist = current_buffer->local_var_alist; |
| 1546 | |
|
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1547 /* 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
|
1548 remain swapped in, in their symbols. */ |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1549 |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1550 swap_out_buffer_local_variables (current_buffer); |
| 333 | 1551 |
| 1552 /* Actually eliminate all local bindings of this buffer. */ | |
| 1553 | |
| 1554 reset_buffer_local_variables (current_buffer); | |
| 1555 | |
| 1556 /* Redisplay mode lines; we are changing major mode. */ | |
| 1557 | |
| 1558 update_mode_lines++; | |
| 1559 | |
| 1560 /* Any which are supposed to be permanent, | |
| 1561 make local again, with the same values they had. */ | |
| 1562 | |
| 485 | 1563 for (alist = oalist; !NILP (alist); alist = XCONS (alist)->cdr) |
| 333 | 1564 { |
| 1565 sym = XCONS (XCONS (alist)->car)->car; | |
| 1566 tem = Fget (sym, Qpermanent_local); | |
| 485 | 1567 if (! NILP (tem)) |
| 392 | 1568 { |
| 1569 Fmake_local_variable (sym); | |
| 1570 Fset (sym, XCONS (XCONS (alist)->car)->cdr); | |
| 1571 } | |
| 333 | 1572 } |
| 1573 | |
| 1574 /* Force mode-line redisplay. Useful here because all major mode | |
| 1575 commands call this function. */ | |
| 1576 update_mode_lines++; | |
| 1577 | |
| 1578 return Qnil; | |
| 1579 } | |
|
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1580 |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1581 /* 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
|
1582 for their current values. */ |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1583 |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1584 static void |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1585 swap_out_buffer_local_variables (b) |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1586 struct buffer *b; |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1587 { |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1588 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
|
1589 |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1590 XSETBUFFER (buffer, b); |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1591 oalist = b->local_var_alist; |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1592 |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1593 for (alist = oalist; !NILP (alist); alist = XCONS (alist)->cdr) |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1594 { |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1595 sym = XCONS (XCONS (alist)->car)->car; |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1596 |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1597 /* Need not do anything if some other buffer's binding is now encached. */ |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1598 tem = XCONS (XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->cdr)->car; |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1599 if (XBUFFER (tem) == current_buffer) |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1600 { |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1601 /* 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
|
1602 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
|
1603 |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1604 tem = XCONS (XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->cdr)->cdr; |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1605 /* 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
|
1606 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
|
1607 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
|
1608 later in Fkill_all_local_variables, we don't lose the value. */ |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1609 XCONS (XCONS (tem)->car)->cdr |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1610 = do_symval_forwarding (XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->car); |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1611 /* Switch to the symbol's default-value alist entry. */ |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1612 XCONS (tem)->car = tem; |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1613 /* Mark it as current for buffer B. */ |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1614 XCONS (XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->cdr)->car |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1615 = buffer; |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1616 /* Store the current value into any forwarding in the symbol. */ |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1617 store_symval_forwarding (sym, XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->car, |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1618 XCONS (tem)->cdr); |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1619 } |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1620 } |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1621 } |
| 333 | 1622 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1623 /* 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
|
1624 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
|
1625 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
|
1626 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
|
1627 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
|
1628 Store in *PREV_PTR the previous position before POS where an overlay ends, |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1629 or BEGV if there are no previous overlays. |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1630 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
|
1631 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1632 *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
|
1633 when this function is called. |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1634 |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1635 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
|
1636 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
|
1637 and we store only as many overlays as will fit. |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1638 But we still return the total number of overlays. */ |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1639 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1640 int |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1641 overlays_at (pos, extend, vec_ptr, len_ptr, next_ptr, prev_ptr) |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1642 int pos; |
|
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1643 int extend; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1644 Lisp_Object **vec_ptr; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1645 int *len_ptr; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1646 int *next_ptr; |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1647 int *prev_ptr; |
| 333 | 1648 { |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1649 Lisp_Object tail, overlay, start, end, result; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1650 int idx = 0; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1651 int len = *len_ptr; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1652 Lisp_Object *vec = *vec_ptr; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1653 int next = ZV; |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1654 int prev = BEGV; |
|
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1655 int inhibit_storing = 0; |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1656 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1657 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
|
1658 GC_CONSP (tail); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1659 tail = XCONS (tail)->cdr) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1660 { |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1661 int startpos, endpos; |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1662 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1663 overlay = XCONS (tail)->car; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1664 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1665 start = OVERLAY_START (overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1666 end = OVERLAY_END (overlay); |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1667 endpos = OVERLAY_POSITION (end); |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1668 if (endpos < pos) |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1669 { |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1670 if (prev < endpos) |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1671 prev = endpos; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1672 break; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1673 } |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1674 if (endpos == pos) |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1675 continue; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1676 startpos = OVERLAY_POSITION (start); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1677 if (startpos <= pos) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1678 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1679 if (idx == len) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1680 { |
|
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1681 /* The supplied vector is full. |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1682 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
|
1683 if (extend) |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1684 { |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1685 *len_ptr = len *= 2; |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1686 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
|
1687 *vec_ptr = vec; |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1688 } |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1689 else |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1690 inhibit_storing = 1; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1691 } |
|
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1692 |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1693 if (!inhibit_storing) |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1694 vec[idx] = overlay; |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1695 /* 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
|
1696 idx++; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1697 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1698 else if (startpos < next) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1699 next = startpos; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1700 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1701 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1702 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
|
1703 GC_CONSP (tail); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1704 tail = XCONS (tail)->cdr) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1705 { |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1706 int startpos, endpos; |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1707 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1708 overlay = XCONS (tail)->car; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1709 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1710 start = OVERLAY_START (overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1711 end = OVERLAY_END (overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1712 startpos = OVERLAY_POSITION (start); |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1713 if (pos < startpos) |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1714 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1715 if (startpos < next) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1716 next = startpos; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1717 break; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1718 } |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1719 endpos = OVERLAY_POSITION (end); |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1720 if (pos < endpos) |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1721 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1722 if (idx == len) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1723 { |
|
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1724 if (extend) |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1725 { |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1726 *len_ptr = len *= 2; |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1727 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
|
1728 *vec_ptr = vec; |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1729 } |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1730 else |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1731 inhibit_storing = 1; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1732 } |
|
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1733 |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1734 if (!inhibit_storing) |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1735 vec[idx] = overlay; |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1736 idx++; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1737 } |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1738 else if (endpos < pos && endpos > prev) |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1739 prev = endpos; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1740 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1741 |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1742 if (next_ptr) |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1743 *next_ptr = next; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1744 if (prev_ptr) |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
1745 *prev_ptr = prev; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1746 return idx; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1747 } |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1748 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1749 /* 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
|
1750 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
|
1751 |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1752 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
|
1753 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
|
1754 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
|
1755 or ZV if there are no more overlays. |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1756 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
|
1757 or BEGV if there are no previous overlays. |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1758 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
|
1759 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1760 *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
|
1761 when this function is called. |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1762 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1763 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
|
1764 If EXTEND is zero, we never extend the vector, |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1765 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
|
1766 But we still return the total number of overlays. */ |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1767 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1768 int |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1769 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
|
1770 int beg, end; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1771 int extend; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1772 Lisp_Object **vec_ptr; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1773 int *len_ptr; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1774 int *next_ptr; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1775 int *prev_ptr; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1776 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1777 Lisp_Object tail, overlay, ostart, oend, result; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1778 int idx = 0; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1779 int len = *len_ptr; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1780 Lisp_Object *vec = *vec_ptr; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1781 int next = ZV; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1782 int prev = BEGV; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1783 int inhibit_storing = 0; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1784 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1785 for (tail = current_buffer->overlays_before; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1786 GC_CONSP (tail); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1787 tail = XCONS (tail)->cdr) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1788 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1789 int startpos, endpos; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1790 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1791 overlay = XCONS (tail)->car; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1792 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1793 ostart = OVERLAY_START (overlay); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1794 oend = OVERLAY_END (overlay); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1795 endpos = OVERLAY_POSITION (oend); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1796 if (endpos < beg) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1797 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1798 if (prev < endpos) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1799 prev = endpos; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1800 break; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1801 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1802 startpos = OVERLAY_POSITION (ostart); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1803 /* 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
|
1804 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
|
1805 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
|
1806 || (startpos == endpos && beg == endpos)) |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1807 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1808 if (idx == len) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1809 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1810 /* The supplied vector is full. |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1811 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
|
1812 if (extend) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1813 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1814 *len_ptr = len *= 2; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1815 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1816 *vec_ptr = vec; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1817 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1818 else |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1819 inhibit_storing = 1; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1820 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1821 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1822 if (!inhibit_storing) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1823 vec[idx] = overlay; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1824 /* 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
|
1825 idx++; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1826 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1827 else if (startpos < next) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1828 next = startpos; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1829 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1830 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1831 for (tail = current_buffer->overlays_after; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1832 GC_CONSP (tail); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1833 tail = XCONS (tail)->cdr) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1834 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1835 int startpos, endpos; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1836 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1837 overlay = XCONS (tail)->car; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1838 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1839 ostart = OVERLAY_START (overlay); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1840 oend = OVERLAY_END (overlay); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1841 startpos = OVERLAY_POSITION (ostart); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1842 if (end < startpos) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1843 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1844 if (startpos < next) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1845 next = startpos; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1846 break; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1847 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1848 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
|
1849 /* 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
|
1850 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
|
1851 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
|
1852 || (startpos == endpos && beg == endpos)) |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1853 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1854 if (idx == len) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1855 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1856 if (extend) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1857 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1858 *len_ptr = len *= 2; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1859 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1860 *vec_ptr = vec; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1861 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1862 else |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1863 inhibit_storing = 1; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1864 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1865 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1866 if (!inhibit_storing) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1867 vec[idx] = overlay; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1868 idx++; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1869 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1870 else if (endpos < beg && endpos > prev) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1871 prev = endpos; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1872 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1873 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1874 if (next_ptr) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1875 *next_ptr = next; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1876 if (prev_ptr) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1877 *prev_ptr = prev; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1878 return idx; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1879 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
1880 |
|
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1881 /* 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
|
1882 int |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1883 overlay_touches_p (pos) |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1884 int pos; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1885 { |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1886 Lisp_Object tail, overlay; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1887 |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1888 for (tail = current_buffer->overlays_before; GC_CONSP (tail); |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1889 tail = XCONS (tail)->cdr) |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1890 { |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1891 int endpos; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1892 |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1893 overlay = XCONS (tail)->car; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1894 if (!GC_OVERLAYP (overlay)) |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1895 abort (); |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1896 |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1897 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1898 if (endpos < pos) |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1899 break; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1900 if (endpos == pos || OVERLAY_POSITION (OVERLAY_START (overlay)) == pos) |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1901 return 1; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1902 } |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1903 |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1904 for (tail = current_buffer->overlays_after; GC_CONSP (tail); |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1905 tail = XCONS (tail)->cdr) |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1906 { |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1907 int startpos; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1908 |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1909 overlay = XCONS (tail)->car; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1910 if (!GC_OVERLAYP (overlay)) |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1911 abort (); |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1912 |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1913 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1914 if (pos < startpos) |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1915 break; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1916 if (startpos == pos || OVERLAY_POSITION (OVERLAY_END (overlay)) == pos) |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1917 return 1; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1918 } |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1919 return 0; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
1920 } |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1921 |
|
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1922 struct sortvec |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1923 { |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1924 Lisp_Object overlay; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1925 int beg, end; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1926 int priority; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1927 }; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1928 |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1929 static int |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1930 compare_overlays (s1, s2) |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1931 struct sortvec *s1, *s2; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1932 { |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1933 if (s1->priority != s2->priority) |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1934 return s1->priority - s2->priority; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1935 if (s1->beg != s2->beg) |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1936 return s1->beg - s2->beg; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1937 if (s1->end != s2->end) |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1938 return s2->end - s1->end; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1939 return 0; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1940 } |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1941 |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1942 /* 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
|
1943 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
|
1944 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
|
1945 int |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1946 sort_overlays (overlay_vec, noverlays, w) |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1947 Lisp_Object *overlay_vec; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1948 int noverlays; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1949 struct window *w; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1950 { |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1951 int i, j; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1952 struct sortvec *sortvec; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1953 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
|
1954 |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1955 /* 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
|
1956 |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1957 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
|
1958 { |
|
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1959 Lisp_Object tem; |
|
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
1960 Lisp_Object overlay; |
|
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
1961 |
|
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
1962 overlay = overlay_vec[i]; |
|
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1963 if (OVERLAY_VALID (overlay) |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1964 && OVERLAY_POSITION (OVERLAY_START (overlay)) > 0 |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1965 && OVERLAY_POSITION (OVERLAY_END (overlay)) > 0) |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1966 { |
|
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1967 /* 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
|
1968 overlays that are limited to some other window. */ |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1969 if (w) |
|
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1970 { |
|
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1971 Lisp_Object window; |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1972 |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1973 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
|
1974 if (WINDOWP (window) && XWINDOW (window) != w) |
|
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1975 continue; |
|
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1976 } |
|
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1977 |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1978 /* 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
|
1979 sortvec[j].overlay = overlay; |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1980 sortvec[j].beg = OVERLAY_POSITION (OVERLAY_START (overlay)); |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1981 sortvec[j].end = OVERLAY_POSITION (OVERLAY_END (overlay)); |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1982 tem = Foverlay_get (overlay, Qpriority); |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1983 if (INTEGERP (tem)) |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1984 sortvec[j].priority = XINT (tem); |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1985 else |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1986 sortvec[j].priority = 0; |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1987 j++; |
|
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1988 } |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1989 } |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1990 noverlays = j; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1991 |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1992 /* 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
|
1993 |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1994 if (noverlays > 1) |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1995 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
|
1996 |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1997 for (i = 0; i < noverlays; i++) |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1998 overlay_vec[i] = sortvec[i].overlay; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1999 return (noverlays); |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2000 } |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2001 |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2002 struct sortstr |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2003 { |
|
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2004 Lisp_Object string, string2; |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2005 int size; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2006 int priority; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2007 }; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2008 |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2009 struct sortstrlist |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2010 { |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2011 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
|
2012 int size; /* Allocated length of that array. */ |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2013 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
|
2014 int bytes; /* Total length of the strings in buf. */ |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2015 }; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2016 |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2017 /* Buffers for storing information about the overlays touching a given |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2018 position. These could be automatic variables in overlay_strings, but |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2019 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
|
2020 allocating and freeing it. */ |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2021 static struct sortstrlist overlay_heads, overlay_tails; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2022 static char *overlay_str_buf; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2023 |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2024 /* Allocated length of overlay_str_buf. */ |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2025 static int overlay_str_len; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2026 |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2027 /* A comparison function suitable for passing to qsort. */ |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2028 static int |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2029 cmp_for_strings (as1, as2) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2030 char *as1, *as2; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2031 { |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2032 struct sortstr *s1 = (struct sortstr *)as1; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2033 struct sortstr *s2 = (struct sortstr *)as2; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2034 if (s1->size != s2->size) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2035 return s2->size - s1->size; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2036 if (s1->priority != s2->priority) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2037 return s1->priority - s2->priority; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2038 return 0; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2039 } |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2040 |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2041 static void |
|
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2042 record_overlay_string (ssl, str, str2, pri, size) |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2043 struct sortstrlist *ssl; |
|
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2044 Lisp_Object str, str2, pri; |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2045 int size; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2046 { |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2047 if (ssl->used == ssl->size) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2048 { |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2049 if (ssl->buf) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2050 ssl->size *= 2; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2051 else |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2052 ssl->size = 5; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2053 ssl->buf = ((struct sortstr *) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2054 xrealloc (ssl->buf, ssl->size * sizeof (struct sortstr))); |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2055 } |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2056 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
|
2057 ssl->buf[ssl->used].string2 = str2; |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2058 ssl->buf[ssl->used].size = size; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2059 ssl->buf[ssl->used].priority = (INTEGERP (pri) ? XINT (pri) : 0); |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2060 ssl->used++; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2061 ssl->bytes += XSTRING (str)->size; |
|
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2062 if (STRINGP (str2)) |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2063 ssl->bytes += XSTRING (str2)->size; |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2064 } |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2065 |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2066 /* 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
|
2067 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
|
2068 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
|
2069 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
|
2070 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
|
2071 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
|
2072 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
|
2073 |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2074 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
|
2075 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
|
2076 subsequent calls. */ |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2077 int |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2078 overlay_strings (pos, w, pstr) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2079 int pos; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2080 struct window *w; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2081 char **pstr; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2082 { |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2083 Lisp_Object ov, overlay, window, str; |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2084 int startpos, endpos; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2085 |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2086 overlay_heads.used = overlay_heads.bytes = 0; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2087 overlay_tails.used = overlay_tails.bytes = 0; |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2088 for (ov = current_buffer->overlays_before; CONSP (ov); ov = XCONS (ov)->cdr) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2089 { |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2090 overlay = XCONS (ov)->car; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2091 if (!OVERLAYP (overlay)) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2092 abort (); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2093 |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2094 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2095 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2096 if (endpos < pos) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2097 break; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2098 if (endpos != pos && startpos != pos) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2099 continue; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2100 window = Foverlay_get (overlay, Qwindow); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2101 if (WINDOWP (window) && XWINDOW (window) != w) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2102 continue; |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2103 if (startpos == pos |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2104 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2105 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
|
2106 (startpos == endpos |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2107 ? 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
|
2108 : Qnil), |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2109 Foverlay_get (overlay, Qpriority), |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2110 endpos - startpos); |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2111 else if (endpos == pos |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2112 && (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
|
2113 record_overlay_string (&overlay_tails, str, Qnil, |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2114 Foverlay_get (overlay, Qpriority), |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2115 endpos - startpos); |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2116 } |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2117 for (ov = current_buffer->overlays_after; CONSP (ov); ov = XCONS (ov)->cdr) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2118 { |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2119 overlay = XCONS (ov)->car; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2120 if (!OVERLAYP (overlay)) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2121 abort (); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2122 |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2123 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2124 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2125 if (startpos > pos) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2126 break; |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2127 if (endpos != pos && startpos != pos) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2128 continue; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2129 window = Foverlay_get (overlay, Qwindow); |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2130 if (WINDOWP (window) && XWINDOW (window) != w) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2131 continue; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2132 if (startpos == pos |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2133 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2134 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
|
2135 (startpos == endpos |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2136 ? 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
|
2137 : Qnil), |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2138 Foverlay_get (overlay, Qpriority), |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2139 endpos - startpos); |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2140 else if (endpos == pos |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2141 && (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
|
2142 record_overlay_string (&overlay_tails, str, Qnil, |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2143 Foverlay_get (overlay, Qpriority), |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2144 endpos - startpos); |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2145 } |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2146 if (overlay_tails.used > 1) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2147 qsort (overlay_tails.buf, overlay_tails.used, sizeof (struct sortstr), |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2148 cmp_for_strings); |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2149 if (overlay_heads.used > 1) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2150 qsort (overlay_heads.buf, overlay_heads.used, sizeof (struct sortstr), |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2151 cmp_for_strings); |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2152 if (overlay_heads.bytes || overlay_tails.bytes) |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2153 { |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2154 Lisp_Object tem; |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2155 int i; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2156 char *p; |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2157 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
|
2158 |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2159 if (total > overlay_str_len) |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2160 overlay_str_buf = (char *)xrealloc (overlay_str_buf, |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2161 overlay_str_len = total); |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2162 p = overlay_str_buf; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2163 for (i = overlay_tails.used; --i >= 0;) |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2164 { |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2165 tem = overlay_tails.buf[i].string; |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2166 bcopy (XSTRING (tem)->data, p, XSTRING (tem)->size); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2167 p += XSTRING (tem)->size; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2168 } |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2169 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
|
2170 { |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2171 tem = overlay_heads.buf[i].string; |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2172 bcopy (XSTRING (tem)->data, p, XSTRING (tem)->size); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2173 p += XSTRING (tem)->size; |
|
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2174 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
|
2175 if (STRINGP (tem)) |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2176 { |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2177 bcopy (XSTRING (tem)->data, p, XSTRING (tem)->size); |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2178 p += XSTRING (tem)->size; |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2179 } |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2180 } |
|
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2181 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
|
2182 abort (); |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2183 if (pstr) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2184 *pstr = overlay_str_buf; |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2185 return total; |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2186 } |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2187 return 0; |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2188 } |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2189 |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2190 /* Shift overlays in BUF's overlay lists, to center the lists at POS. */ |
| 333 | 2191 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2192 void |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2193 recenter_overlay_lists (buf, pos) |
|
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2194 struct buffer *buf; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2195 int pos; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2196 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2197 Lisp_Object overlay, tail, next, prev, beg, end; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2198 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2199 /* 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
|
2200 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2201 /* 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
|
2202 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
|
2203 with some future change. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2204 prev = Qnil; |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2205 for (tail = buf->overlays_before; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2206 CONSP (tail); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2207 prev = tail, tail = next) |
| 333 | 2208 { |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2209 next = XCONS (tail)->cdr; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2210 overlay = XCONS (tail)->car; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2211 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2212 /* 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
|
2213 if (!OVERLAY_VALID (overlay)) |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2214 #if 1 |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2215 abort (); |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2216 #else |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2217 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2218 /* 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
|
2219 if (!NILP (prev)) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2220 XCONS (prev)->cdr = next; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2221 else |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2222 buf->overlays_before = next; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2223 tail = prev; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2224 continue; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2225 } |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2226 #endif |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2227 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2228 beg = OVERLAY_START (overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2229 end = OVERLAY_END (overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2230 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2231 if (OVERLAY_POSITION (end) > pos) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2232 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2233 /* OVERLAY needs to be moved. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2234 int where = OVERLAY_POSITION (beg); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2235 Lisp_Object other, other_prev; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2236 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2237 /* 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
|
2238 if (!NILP (prev)) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2239 XCONS (prev)->cdr = next; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2240 else |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2241 buf->overlays_before = next; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2242 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2243 /* 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
|
2244 other_prev = Qnil; |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2245 for (other = buf->overlays_after; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2246 CONSP (other); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2247 other_prev = other, other = XCONS (other)->cdr) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2248 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2249 Lisp_Object otherbeg, otheroverlay, follower; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2250 int win; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2251 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2252 otheroverlay = XCONS (other)->car; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2253 if (! OVERLAY_VALID (otheroverlay)) |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2254 abort (); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2255 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2256 otherbeg = OVERLAY_START (otheroverlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2257 if (OVERLAY_POSITION (otherbeg) >= where) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2258 break; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2259 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2260 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2261 /* Add TAIL to overlays_after before OTHER. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2262 XCONS (tail)->cdr = other; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2263 if (!NILP (other_prev)) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2264 XCONS (other_prev)->cdr = tail; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2265 else |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2266 buf->overlays_after = tail; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2267 tail = prev; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2268 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2269 else |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2270 /* 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
|
2271 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
|
2272 so stop now. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2273 break; |
| 333 | 2274 } |
| 2275 | |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2276 /* 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
|
2277 prev = Qnil; |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2278 for (tail = buf->overlays_after; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2279 CONSP (tail); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2280 prev = tail, tail = next) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2281 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2282 next = XCONS (tail)->cdr; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2283 overlay = XCONS (tail)->car; |
| 333 | 2284 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2285 /* 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
|
2286 if (!OVERLAY_VALID (overlay)) |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2287 #if 1 |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2288 abort (); |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2289 #else |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2290 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2291 /* 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
|
2292 if (!NILP (prev)) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2293 XCONS (prev)->cdr = next; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2294 else |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2295 buf->overlays_after = next; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2296 tail = prev; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2297 continue; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2298 } |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2299 #endif |
| 333 | 2300 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2301 beg = OVERLAY_START (overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2302 end = OVERLAY_END (overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2303 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2304 /* Stop looking, when we know that nothing further |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2305 can possibly end before POS. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2306 if (OVERLAY_POSITION (beg) > pos) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2307 break; |
| 333 | 2308 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2309 if (OVERLAY_POSITION (end) <= pos) |
| 333 | 2310 { |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2311 /* OVERLAY needs to be moved. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2312 int where = OVERLAY_POSITION (end); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2313 Lisp_Object other, other_prev; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2314 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2315 /* 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
|
2316 if (!NILP (prev)) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2317 XCONS (prev)->cdr = next; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2318 else |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2319 buf->overlays_after = next; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2320 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2321 /* 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
|
2322 other_prev = Qnil; |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2323 for (other = buf->overlays_before; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2324 CONSP (other); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2325 other_prev = other, other = XCONS (other)->cdr) |
| 333 | 2326 { |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2327 Lisp_Object otherend, otheroverlay; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2328 int win; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2329 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2330 otheroverlay = XCONS (other)->car; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2331 if (! OVERLAY_VALID (otheroverlay)) |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2332 abort (); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2333 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2334 otherend = OVERLAY_END (otheroverlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2335 if (OVERLAY_POSITION (otherend) <= where) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2336 break; |
| 333 | 2337 } |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2338 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2339 /* Add TAIL to overlays_before before OTHER. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2340 XCONS (tail)->cdr = other; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2341 if (!NILP (other_prev)) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2342 XCONS (other_prev)->cdr = tail; |
| 333 | 2343 else |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2344 buf->overlays_before = tail; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2345 tail = prev; |
| 333 | 2346 } |
| 2347 } | |
| 2348 | |
|
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
|
2349 XSETFASTINT (buf->overlay_center, pos); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2350 } |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2351 |
|
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2352 void |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2353 adjust_overlays_for_insert (pos, length) |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2354 int pos; |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2355 int length; |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2356 { |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2357 /* 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
|
2358 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
|
2359 if (XFASTINT (current_buffer->overlay_center) >= pos) |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2360 XSETFASTINT (current_buffer->overlay_center, |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2361 XFASTINT (current_buffer->overlay_center) + length); |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2362 } |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2363 |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2364 void |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2365 adjust_overlays_for_delete (pos, length) |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2366 int pos; |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2367 int length; |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2368 { |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2369 if (XFASTINT (current_buffer->overlay_center) < pos) |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2370 /* 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
|
2371 after-lists are still consistent. */ |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2372 ; |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2373 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
|
2374 /* 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
|
2375 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
|
2376 given the new value. */ |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2377 XSETFASTINT (current_buffer->overlay_center, |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2378 XFASTINT (current_buffer->overlay_center) - length); |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2379 else |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2380 /* 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
|
2381 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
|
2382 and also update the center point. */ |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2383 recenter_overlay_lists (current_buffer, pos); |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2384 } |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
2385 |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2386 /* 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
|
2387 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
|
2388 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
|
2389 list and reinserted in its proper place. |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2390 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
|
2391 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
|
2392 better to do in this situation? */ |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2393 void |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2394 fix_overlays_in_range (start, end) |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2395 register int start, end; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2396 { |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2397 Lisp_Object tem, overlay; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2398 Lisp_Object before_list, after_list; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2399 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
|
2400 int startpos, endpos; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2401 |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2402 /* 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
|
2403 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
|
2404 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
|
2405 *pbefore (resp. *pafter) points to, is still uninitialized. |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2406 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
|
2407 it may look strange. */ |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2408 for (ptail = ¤t_buffer->overlays_before; CONSP (*ptail);) |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2409 { |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2410 overlay = XCONS (*ptail)->car; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2411 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2412 if (endpos < start) |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2413 break; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2414 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2415 if (endpos < end |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2416 || (startpos >= start && startpos < end)) |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2417 { |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2418 /* If the overlay is backwards, fix that now. */ |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2419 if (startpos > endpos) |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2420 { |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2421 int tem; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2422 Fset_marker (OVERLAY_START (overlay), endpos, Qnil); |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2423 Fset_marker (OVERLAY_END (overlay), startpos, Qnil); |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2424 tem = startpos; startpos = endpos; endpos = tem; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2425 } |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2426 /* 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
|
2427 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
|
2428 if (endpos < XINT (current_buffer->overlay_center)) |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2429 { |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2430 *pafter = *ptail; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2431 pafter = &XCONS (*ptail)->cdr; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2432 } |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2433 else |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2434 { |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2435 *pbefore = *ptail; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2436 pbefore = &XCONS (*ptail)->cdr; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2437 } |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2438 *ptail = XCONS (*ptail)->cdr; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2439 } |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2440 else |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2441 ptail = &XCONS (*ptail)->cdr; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2442 } |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2443 for (ptail = ¤t_buffer->overlays_after; CONSP (*ptail);) |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2444 { |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2445 overlay = XCONS (*ptail)->car; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2446 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2447 if (startpos >= end) |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2448 break; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2449 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2450 if (startpos >= start |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2451 || (endpos >= start && endpos < end)) |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2452 { |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2453 if (startpos > endpos) |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2454 { |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2455 int tem; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2456 Fset_marker (OVERLAY_START (overlay), endpos, Qnil); |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2457 Fset_marker (OVERLAY_END (overlay), startpos, Qnil); |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2458 tem = startpos; startpos = endpos; endpos = tem; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2459 } |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2460 if (endpos < XINT (current_buffer->overlay_center)) |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2461 { |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2462 *pafter = *ptail; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2463 pafter = &XCONS (*ptail)->cdr; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2464 } |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2465 else |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2466 { |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2467 *pbefore = *ptail; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2468 pbefore = &XCONS (*ptail)->cdr; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2469 } |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2470 *ptail = XCONS (*ptail)->cdr; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2471 } |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2472 else |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2473 ptail = &XCONS (*ptail)->cdr; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2474 } |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2475 |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2476 /* 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
|
2477 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
|
2478 *pbefore = current_buffer->overlays_before; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2479 current_buffer->overlays_before = before_list; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2480 recenter_overlay_lists (current_buffer, |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2481 XINT (current_buffer->overlay_center)); |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2482 |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2483 *pafter = current_buffer->overlays_after; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2484 current_buffer->overlays_after = after_list; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2485 recenter_overlay_lists (current_buffer, |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2486 XINT (current_buffer->overlay_center)); |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
2487 } |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2488 |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2489 DEFUN ("overlayp", Foverlayp, Soverlayp, 1, 1, 0, |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2490 "Return t if OBJECT is an overlay.") |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2491 (object) |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2492 Lisp_Object object; |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2493 { |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2494 return (OVERLAYP (object) ? Qt : Qnil); |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2495 } |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2496 |
|
13446
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
2497 DEFUN ("make-overlay", Fmake_overlay, Smake_overlay, 2, 5, 0, |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2498 "Create a new overlay with range BEG to END in BUFFER.\n\ |
|
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2499 If omitted, BUFFER defaults to the current buffer.\n\ |
|
13446
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
2500 BEG and END may be integers or markers.\n\ |
|
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
2501 The fourth arg FRONT-ADVANCE, if non-nil, makes the\n\ |
|
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
2502 front delimiter advance when text is inserted there.\n\ |
|
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
2503 The fifth arg REAR-ADVANCE, if non-nil, makes the\n\ |
|
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
2504 rear delimiter advance when text is inserted there.") |
|
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
2505 (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
|
2506 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
|
2507 Lisp_Object front_advance, rear_advance; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2508 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2509 Lisp_Object overlay; |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2510 struct buffer *b; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2511 |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2512 if (NILP (buffer)) |
|
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
2513 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
|
2514 else |
|
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
2515 CHECK_BUFFER (buffer, 2); |
|
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
2516 if (MARKERP (beg) |
|
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
2517 && ! 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
|
2518 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
|
2519 if (MARKERP (end) |
|
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
2520 && ! 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
|
2521 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
|
2522 |
|
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
2523 CHECK_NUMBER_COERCE_MARKER (beg, 1); |
|
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
2524 CHECK_NUMBER_COERCE_MARKER (end, 1); |
|
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
2525 |
|
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
2526 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
|
2527 { |
|
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
2528 Lisp_Object temp; |
|
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
2529 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
|
2530 } |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2531 |
|
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2532 b = XBUFFER (buffer); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2533 |
|
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
2534 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
|
2535 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
|
2536 |
|
13446
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
2537 if (!NILP (front_advance)) |
|
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
2538 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
|
2539 if (!NILP (rear_advance)) |
|
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
2540 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
|
2541 |
|
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
2542 overlay = allocate_misc (); |
|
11244
f3b11dc9014e
(Fmake_overlay): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11214
diff
changeset
|
2543 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
|
2544 XOVERLAY (overlay)->start = beg; |
|
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
2545 XOVERLAY (overlay)->end = end; |
|
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
2546 XOVERLAY (overlay)->plist = Qnil; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2547 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2548 /* Put the new overlay on the wrong list. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2549 end = OVERLAY_END (overlay); |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2550 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
|
2551 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
|
2552 else |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2553 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
|
2554 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2555 /* 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
|
2556 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
|
2557 |
|
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
2558 /* 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
|
2559 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
|
2560 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2561 return overlay; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2562 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2563 |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2564 DEFUN ("move-overlay", Fmove_overlay, Smove_overlay, 3, 4, 0, |
|
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2565 "Set the endpoints of OVERLAY to BEG and END in BUFFER.\n\ |
|
2791
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
2566 If BUFFER is omitted, leave OVERLAY in the same buffer it inhabits now.\n\ |
|
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
2567 If BUFFER is omitted, and OVERLAY is in no buffer, put it in the current\n\ |
|
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
2568 buffer.") |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2569 (overlay, beg, end, buffer) |
|
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2570 Lisp_Object overlay, beg, end, buffer; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2571 { |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2572 struct buffer *b, *ob; |
|
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2573 Lisp_Object obuffer; |
|
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2574 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
|
2575 |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2576 CHECK_OVERLAY (overlay, 0); |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2577 if (NILP (buffer)) |
|
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2578 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
|
2579 if (NILP (buffer)) |
|
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
2580 XSETBUFFER (buffer, current_buffer); |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2581 CHECK_BUFFER (buffer, 3); |
|
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
2582 |
|
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
2583 if (MARKERP (beg) |
|
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
2584 && ! 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
|
2585 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
|
2586 if (MARKERP (end) |
|
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
2587 && ! 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
|
2588 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
|
2589 |
|
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
2590 CHECK_NUMBER_COERCE_MARKER (beg, 1); |
|
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
2591 CHECK_NUMBER_COERCE_MARKER (end, 1); |
|
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
2592 |
| 8839 | 2593 if (XINT (beg) == XINT (end) && ! NILP (Foverlay_get (overlay, Qevaporate))) |
| 2594 return Fdelete_overlay (overlay); | |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2595 |
|
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
2596 if (XINT (beg) > XINT (end)) |
|
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
2597 { |
|
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
2598 Lisp_Object temp; |
|
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
2599 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
|
2600 } |
|
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
2601 |
| 8839 | 2602 specbind (Qinhibit_quit, Qt); |
| 2603 | |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2604 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
|
2605 b = XBUFFER (buffer); |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2606 ob = XBUFFER (obuffer); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2607 |
|
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2608 /* 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
|
2609 if (!EQ (buffer, obuffer)) |
|
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
2610 { |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
2611 /* Redisplay where the overlay was. */ |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
2612 if (!NILP (obuffer)) |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
2613 { |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
2614 Lisp_Object o_beg; |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
2615 Lisp_Object o_end; |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
2616 |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
2617 o_beg = OVERLAY_START (overlay); |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
2618 o_end = OVERLAY_END (overlay); |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
2619 o_beg = OVERLAY_POSITION (o_beg); |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
2620 o_end = OVERLAY_POSITION (o_end); |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
2621 |
|
8035
e16ebbd6f14b
(Fmove_overlay): Fix typo in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
7995
diff
changeset
|
2622 redisplay_region (ob, XINT (o_beg), XINT (o_end)); |
|
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
2623 } |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
2624 |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
2625 /* Redisplay where the overlay is going to be. */ |
|
8035
e16ebbd6f14b
(Fmove_overlay): Fix typo in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
7995
diff
changeset
|
2626 redisplay_region (b, XINT (beg), XINT (end)); |
|
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
2627 } |
|
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2628 else |
|
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2629 /* 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
|
2630 { |
|
4416
9657ef911049
(Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents:
4226
diff
changeset
|
2631 Lisp_Object o_beg; |
|
9657ef911049
(Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents:
4226
diff
changeset
|
2632 Lisp_Object o_end; |
|
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2633 int change_beg, change_end; |
|
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
2634 |
|
4416
9657ef911049
(Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents:
4226
diff
changeset
|
2635 o_beg = OVERLAY_START (overlay); |
|
9657ef911049
(Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents:
4226
diff
changeset
|
2636 o_end = OVERLAY_END (overlay); |
|
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2637 o_beg = OVERLAY_POSITION (o_beg); |
|
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2638 o_end = OVERLAY_POSITION (o_end); |
|
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2639 |
|
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2640 if (XINT (o_beg) == XINT (beg)) |
|
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2641 redisplay_region (b, XINT (o_end), XINT (end)); |
|
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2642 else if (XINT (o_end) == XINT (end)) |
|
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2643 redisplay_region (b, XINT (o_beg), XINT (beg)); |
|
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2644 else |
|
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2645 { |
|
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2646 if (XINT (beg) < XINT (o_beg)) o_beg = beg; |
|
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2647 if (XINT (end) > XINT (o_end)) o_end = end; |
|
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2648 redisplay_region (b, XINT (o_beg), XINT (o_end)); |
|
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2649 } |
|
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
2650 } |
|
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
2651 |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2652 if (!NILP (obuffer)) |
|
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2653 { |
|
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2654 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
|
2655 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
|
2656 } |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2657 |
|
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2658 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
|
2659 Fset_marker (OVERLAY_END (overlay), end, buffer); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2660 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2661 /* Put the overlay on the wrong list. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2662 end = OVERLAY_END (overlay); |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2663 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
|
2664 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
|
2665 else |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2666 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
|
2667 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2668 /* 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
|
2669 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
|
2670 |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2671 return unbind_to (count, overlay); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2672 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2673 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2674 DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0, |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2675 "Delete the overlay OVERLAY from its buffer.") |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2676 (overlay) |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2677 Lisp_Object overlay; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2678 { |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2679 Lisp_Object buffer; |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2680 struct buffer *b; |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2681 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
|
2682 |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2683 CHECK_OVERLAY (overlay, 0); |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2684 |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2685 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
|
2686 if (NILP (buffer)) |
|
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2687 return Qnil; |
|
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2688 |
|
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2689 b = XBUFFER (buffer); |
|
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2690 |
|
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2691 specbind (Qinhibit_quit, Qt); |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2692 |
|
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2693 b->overlays_before = Fdelq (overlay, b->overlays_before); |
|
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2694 b->overlays_after = Fdelq (overlay, b->overlays_after); |
|
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2695 |
|
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
2696 redisplay_region (b, |
|
4852
ef44bf38f456
(Fdelete_overlay, Foverlay_put): Use marker_position,
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2697 marker_position (OVERLAY_START (overlay)), |
|
ef44bf38f456
(Fdelete_overlay, Foverlay_put): Use marker_position,
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2698 marker_position (OVERLAY_END (overlay))); |
|
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
2699 |
|
2791
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
2700 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
|
2701 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
|
2702 |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2703 return unbind_to (count, Qnil); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2704 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2705 |
|
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2706 /* Overlay dissection functions. */ |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2707 |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2708 DEFUN ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0, |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2709 "Return the position at which OVERLAY starts.") |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2710 (overlay) |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2711 Lisp_Object overlay; |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2712 { |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2713 CHECK_OVERLAY (overlay, 0); |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2714 |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2715 return (Fmarker_position (OVERLAY_START (overlay))); |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2716 } |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2717 |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2718 DEFUN ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0, |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2719 "Return the position at which OVERLAY ends.") |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2720 (overlay) |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2721 Lisp_Object overlay; |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2722 { |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2723 CHECK_OVERLAY (overlay, 0); |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2724 |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2725 return (Fmarker_position (OVERLAY_END (overlay))); |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2726 } |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2727 |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2728 DEFUN ("overlay-buffer", Foverlay_buffer, Soverlay_buffer, 1, 1, 0, |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2729 "Return the buffer OVERLAY belongs to.") |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2730 (overlay) |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2731 Lisp_Object overlay; |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2732 { |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2733 CHECK_OVERLAY (overlay, 0); |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2734 |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2735 return Fmarker_buffer (OVERLAY_START (overlay)); |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2736 } |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2737 |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2738 DEFUN ("overlay-properties", Foverlay_properties, Soverlay_properties, 1, 1, 0, |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2739 "Return a list of the properties on OVERLAY.\n\ |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2740 This is a copy of OVERLAY's plist; modifying its conses has no effect on\n\ |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2741 OVERLAY.") |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2742 (overlay) |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2743 Lisp_Object overlay; |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2744 { |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2745 CHECK_OVERLAY (overlay, 0); |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2746 |
|
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
2747 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
|
2748 } |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2749 |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2750 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2751 DEFUN ("overlays-at", Foverlays_at, Soverlays_at, 1, 1, 0, |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3533
diff
changeset
|
2752 "Return a list of the overlays that contain position POS.") |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2753 (pos) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2754 Lisp_Object pos; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2755 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2756 int noverlays; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2757 Lisp_Object *overlay_vec; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2758 int len; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2759 Lisp_Object result; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2760 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2761 CHECK_NUMBER_COERCE_MARKER (pos, 0); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2762 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2763 len = 10; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2764 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
|
2765 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2766 /* 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
|
2767 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
|
2768 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, |
|
f892e7cb7f51
(Foverlays_at, Fnext_overlay_change): Don't use NULL.
Richard M. Stallman <rms@gnu.org>
parents:
11414
diff
changeset
|
2769 (int *) 0, (int *) 0); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2770 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2771 /* Make a list of them all. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2772 result = Flist (noverlays, overlay_vec); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2773 |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
2774 xfree (overlay_vec); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2775 return result; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2776 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2777 |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2778 DEFUN ("overlays-in", Foverlays_in, Soverlays_in, 2, 2, 0, |
|
12488
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2779 "Return a list of the overlays that overlap the region BEG ... END.\n\ |
|
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2780 Overlap means that at least one character is contained within the overlay\n\ |
|
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2781 and also contained within the specified region.\n\ |
|
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2782 Empty overlays are included in the result if they are located at BEG\n\ |
|
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2783 or between BEG and END.") |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2784 (beg, end) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2785 Lisp_Object beg, end; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2786 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2787 int noverlays; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2788 Lisp_Object *overlay_vec; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2789 int len; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2790 Lisp_Object result; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2791 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2792 CHECK_NUMBER_COERCE_MARKER (beg, 0); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2793 CHECK_NUMBER_COERCE_MARKER (end, 0); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2794 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2795 len = 10; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2796 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object)); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2797 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2798 /* 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
|
2799 Store the length in len. */ |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2800 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
|
2801 (int *) 0, (int *) 0); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2802 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2803 /* Make a list of them all. */ |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2804 result = Flist (noverlays, overlay_vec); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2805 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2806 xfree (overlay_vec); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2807 return result; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2808 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2809 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2810 DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change, |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2811 1, 1, 0, |
| 7492 | 2812 "Return the next position after POS where an overlay starts or ends.\n\ |
| 2813 If there are no more overlay boundaries after POS, return (point-max).") | |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2814 (pos) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2815 Lisp_Object pos; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2816 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2817 int noverlays; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2818 int endpos; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2819 Lisp_Object *overlay_vec; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2820 int len; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2821 int i; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2822 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2823 CHECK_NUMBER_COERCE_MARKER (pos, 0); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2824 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2825 len = 10; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2826 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
|
2827 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2828 /* 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
|
2829 Store the length in len. |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2830 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
|
2831 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, |
|
f892e7cb7f51
(Foverlays_at, Fnext_overlay_change): Don't use NULL.
Richard M. Stallman <rms@gnu.org>
parents:
11414
diff
changeset
|
2832 &endpos, (int *) 0); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2833 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2834 /* If any of these overlays ends before endpos, |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2835 use its ending point instead. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2836 for (i = 0; i < noverlays; i++) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2837 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2838 Lisp_Object oend; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2839 int oendpos; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2840 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2841 oend = OVERLAY_END (overlay_vec[i]); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2842 oendpos = OVERLAY_POSITION (oend); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2843 if (oendpos < endpos) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2844 endpos = oendpos; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2845 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2846 |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
2847 xfree (overlay_vec); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2848 return make_number (endpos); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2849 } |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2850 |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2851 DEFUN ("previous-overlay-change", Fprevious_overlay_change, |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2852 Sprevious_overlay_change, 1, 1, 0, |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2853 "Return the previous position before POS where an overlay starts or ends.\n\ |
|
12214
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2854 If there are no more overlay boundaries before POS, return (point-min).") |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2855 (pos) |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2856 Lisp_Object pos; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2857 { |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2858 int noverlays; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2859 int prevpos; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2860 Lisp_Object *overlay_vec; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2861 int len; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2862 int i; |
|
12214
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2863 Lisp_Object tail; |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2864 |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2865 CHECK_NUMBER_COERCE_MARKER (pos, 0); |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2866 |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2867 len = 10; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2868 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object)); |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2869 |
|
12214
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2870 /* 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
|
2871 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
|
2872 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
|
2873 return pos; |
|
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2874 |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2875 /* 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
|
2876 Store the length in len. |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2877 prevpos gets the position of an overlay end. */ |
|
11418
f892e7cb7f51
(Foverlays_at, Fnext_overlay_change): Don't use NULL.
Richard M. Stallman <rms@gnu.org>
parents:
11414
diff
changeset
|
2878 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, |
|
f892e7cb7f51
(Foverlays_at, Fnext_overlay_change): Don't use NULL.
Richard M. Stallman <rms@gnu.org>
parents:
11414
diff
changeset
|
2879 (int *) 0, &prevpos); |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2880 |
|
12214
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2881 /* If any of these overlays starts after prevpos, |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2882 maybe use its starting point instead. */ |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2883 for (i = 0; i < noverlays; i++) |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2884 { |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2885 Lisp_Object ostart; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2886 int ostartpos; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2887 |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2888 ostart = OVERLAY_START (overlay_vec[i]); |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2889 ostartpos = OVERLAY_POSITION (ostart); |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2890 if (ostartpos > prevpos && ostartpos < XINT (pos)) |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2891 prevpos = ostartpos; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2892 } |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2893 |
|
12214
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2894 /* If any overlay ends at pos, consider its starting point too. */ |
|
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2895 for (tail = current_buffer->overlays_before; |
|
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2896 GC_CONSP (tail); |
|
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2897 tail = XCONS (tail)->cdr) |
|
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2898 { |
|
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2899 Lisp_Object overlay, ostart; |
|
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2900 int ostartpos; |
|
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2901 |
|
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2902 overlay = XCONS (tail)->car; |
|
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2903 |
|
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2904 ostart = OVERLAY_START (overlay); |
|
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2905 ostartpos = OVERLAY_POSITION (ostart); |
|
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2906 if (ostartpos > prevpos && ostartpos < XINT (pos)) |
|
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2907 prevpos = ostartpos; |
|
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2908 } |
|
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
2909 |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2910 xfree (overlay_vec); |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2911 return make_number (prevpos); |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2912 } |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2913 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2914 /* These functions are for debugging overlays. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2915 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2916 DEFUN ("overlay-lists", Foverlay_lists, Soverlay_lists, 0, 0, 0, |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2917 "Return a pair of lists giving all the overlays of the current buffer.\n\ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2918 The car has all the overlays before the overlay center;\n\ |
| 7492 | 2919 the cdr has all the overlays after the overlay center.\n\ |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2920 Recentering overlays moves overlays between these lists.\n\ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2921 The lists you get are copies, so that changing them has no effect.\n\ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2922 However, the overlays you get are the real objects that the buffer uses.") |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2923 () |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2924 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2925 Lisp_Object before, after; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2926 before = current_buffer->overlays_before; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2927 if (CONSP (before)) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2928 before = Fcopy_sequence (before); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2929 after = current_buffer->overlays_after; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2930 if (CONSP (after)) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2931 after = Fcopy_sequence (after); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2932 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2933 return Fcons (before, after); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2934 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2935 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2936 DEFUN ("overlay-recenter", Foverlay_recenter, Soverlay_recenter, 1, 1, 0, |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2937 "Recenter the overlays of the current buffer around position POS.") |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2938 (pos) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2939 Lisp_Object pos; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2940 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2941 CHECK_NUMBER_COERCE_MARKER (pos, 0); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2942 |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
2943 recenter_overlay_lists (current_buffer, XINT (pos)); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2944 return Qnil; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2945 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2946 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2947 DEFUN ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0, |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
2948 "Get the property of overlay OVERLAY with property name PROP.") |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2949 (overlay, prop) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2950 Lisp_Object overlay, prop; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2951 { |
|
9211
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
2952 Lisp_Object plist, fallback; |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2953 |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2954 CHECK_OVERLAY (overlay, 0); |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2955 |
|
9211
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
2956 fallback = Qnil; |
|
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
2957 |
|
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
2958 for (plist = XOVERLAY (overlay)->plist; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2959 CONSP (plist) && CONSP (XCONS (plist)->cdr); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2960 plist = XCONS (XCONS (plist)->cdr)->cdr) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2961 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2962 if (EQ (XCONS (plist)->car, prop)) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2963 return XCONS (XCONS (plist)->cdr)->car; |
|
9211
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
2964 else if (EQ (XCONS (plist)->car, Qcategory)) |
|
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
2965 { |
|
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
2966 Lisp_Object tem; |
|
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
2967 tem = Fcar (Fcdr (plist)); |
|
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
2968 if (SYMBOLP (tem)) |
|
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
2969 fallback = Fget (tem, prop); |
|
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
2970 } |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2971 } |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2972 |
|
9211
c7bfa0da167b
(Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents:
9146
diff
changeset
|
2973 return fallback; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2974 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2975 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2976 DEFUN ("overlay-put", Foverlay_put, Soverlay_put, 3, 3, 0, |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2977 "Set one property of overlay OVERLAY: give property PROP value VALUE.") |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2978 (overlay, prop, value) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2979 Lisp_Object overlay, prop, value; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2980 { |
|
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
2981 Lisp_Object tail, buffer; |
| 8839 | 2982 int changed; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2983 |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2984 CHECK_OVERLAY (overlay, 0); |
|
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
2985 |
|
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
2986 buffer = Fmarker_buffer (OVERLAY_START (overlay)); |
|
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
2987 |
|
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
2988 for (tail = XOVERLAY (overlay)->plist; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2989 CONSP (tail) && CONSP (XCONS (tail)->cdr); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2990 tail = XCONS (XCONS (tail)->cdr)->cdr) |
|
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
2991 if (EQ (XCONS (tail)->car, prop)) |
|
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
2992 { |
| 8839 | 2993 changed = !EQ (XCONS (XCONS (tail)->cdr)->car, value); |
| 2994 XCONS (XCONS (tail)->cdr)->car = value; | |
| 2995 goto found; | |
|
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
2996 } |
| 8839 | 2997 /* It wasn't in the list, so add it to the front. */ |
| 2998 changed = !NILP (value); | |
|
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
2999 XOVERLAY (overlay)->plist |
|
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3000 = Fcons (prop, Fcons (value, XOVERLAY (overlay)->plist)); |
| 8839 | 3001 found: |
| 3002 if (! NILP (buffer)) | |
| 3003 { | |
| 3004 if (changed) | |
| 3005 redisplay_region (XBUFFER (buffer), | |
| 3006 marker_position (OVERLAY_START (overlay)), | |
| 3007 marker_position (OVERLAY_END (overlay))); | |
| 3008 if (EQ (prop, Qevaporate) && ! NILP (value) | |
| 3009 && (OVERLAY_POSITION (OVERLAY_START (overlay)) | |
| 3010 == OVERLAY_POSITION (OVERLAY_END (overlay)))) | |
| 3011 Fdelete_overlay (overlay); | |
| 3012 } | |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3013 return value; |
| 333 | 3014 } |
| 3015 | |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3016 /* Subroutine of report_overlay_modification. */ |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3017 |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3018 /* Lisp vector holding overlay hook functions to call. |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3019 Vector elements come in pairs. |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3020 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
|
3021 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
|
3022 |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3023 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
|
3024 as we call overlay hook functions. |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3025 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
|
3026 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
|
3027 static Lisp_Object last_overlay_modification_hooks; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3028 |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3029 /* 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
|
3030 static int last_overlay_modification_hooks_used; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3031 |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3032 /* Add one functionlist/overlay pair |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3033 to the end of last_overlay_modification_hooks. */ |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3034 |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3035 static void |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3036 add_overlay_mod_hooklist (functionlist, overlay) |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3037 Lisp_Object functionlist, overlay; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3038 { |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3039 int oldsize = XVECTOR (last_overlay_modification_hooks)->size; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3040 |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3041 if (last_overlay_modification_hooks_used == oldsize) |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3042 { |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3043 Lisp_Object old; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3044 old = last_overlay_modification_hooks; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3045 last_overlay_modification_hooks |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3046 = Fmake_vector (make_number (oldsize * 2), Qnil); |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3047 bcopy (XVECTOR (last_overlay_modification_hooks)->contents, |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3048 XVECTOR (old)->contents, |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3049 sizeof (Lisp_Object) * oldsize); |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3050 } |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3051 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
|
3052 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
|
3053 } |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3054 |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3055 /* Run the modification-hooks of overlays that include |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3056 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
|
3057 If this change is an insertion, also |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3058 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
|
3059 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
|
3060 |
|
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3061 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
|
3062 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
|
3063 |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3064 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
|
3065 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
|
3066 the position after the inserted new text, |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3067 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
|
3068 |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3069 void |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3070 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
|
3071 Lisp_Object start, end; |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3072 int after; |
|
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3073 Lisp_Object arg1, arg2, arg3; |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3074 { |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3075 Lisp_Object prop, overlay, tail; |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3076 /* 1 if this change is an insertion. */ |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3077 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
|
3078 int tail_copied; |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3079 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
|
3080 |
|
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3081 overlay = Qnil; |
|
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3082 tail = Qnil; |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3083 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
|
3084 |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3085 if (after) |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3086 { |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3087 /* 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
|
3088 rather than scanning the overlays again. |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3089 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
|
3090 do subsequent modification of the buffer. */ |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3091 int size = last_overlay_modification_hooks_used; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3092 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
|
3093 int i; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3094 |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3095 bcopy (XVECTOR (last_overlay_modification_hooks)->contents, |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3096 copy, size * sizeof (Lisp_Object)); |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3097 gcpro1.var = copy; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3098 gcpro1.nvars = size; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3099 |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3100 for (i = 0; i < size;) |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3101 { |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3102 Lisp_Object prop, overlay; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3103 prop = copy[i++]; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3104 overlay = copy[i++]; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3105 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
|
3106 } |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3107 UNGCPRO; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3108 return; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3109 } |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3110 |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3111 /* We are being called before a change. |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3112 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
|
3113 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
|
3114 tail_copied = 0; |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3115 for (tail = current_buffer->overlays_before; |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3116 CONSP (tail); |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3117 tail = XCONS (tail)->cdr) |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3118 { |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3119 int startpos, endpos; |
|
4416
9657ef911049
(Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents:
4226
diff
changeset
|
3120 Lisp_Object ostart, oend; |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3121 |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3122 overlay = XCONS (tail)->car; |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3123 |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3124 ostart = OVERLAY_START (overlay); |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3125 oend = OVERLAY_END (overlay); |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3126 endpos = OVERLAY_POSITION (oend); |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3127 if (XFASTINT (start) > endpos) |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3128 break; |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3129 startpos = OVERLAY_POSITION (ostart); |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3130 if (insertion && (XFASTINT (start) == startpos |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3131 || XFASTINT (end) == startpos)) |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3132 { |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3133 prop = Foverlay_get (overlay, Qinsert_in_front_hooks); |
|
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3134 if (!NILP (prop)) |
|
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3135 { |
|
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3136 /* 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
|
3137 if (!tail_copied) |
|
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3138 tail = Fcopy_sequence (tail); |
|
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3139 tail_copied = 1; |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3140 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
|
3141 } |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3142 } |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3143 if (insertion && (XFASTINT (start) == endpos |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3144 || XFASTINT (end) == endpos)) |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3145 { |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3146 prop = Foverlay_get (overlay, Qinsert_behind_hooks); |
|
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3147 if (!NILP (prop)) |
|
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3148 { |
|
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3149 if (!tail_copied) |
|
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3150 tail = Fcopy_sequence (tail); |
|
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3151 tail_copied = 1; |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3152 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
|
3153 } |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3154 } |
|
6675
cf38c5af079d
(verify_overlay_modification): Run modification-hooks for any deletion that
Karl Heuer <kwzh@gnu.org>
parents:
6659
diff
changeset
|
3155 /* 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
|
3156 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
|
3157 if (XFASTINT (end) > startpos && XFASTINT (start) < endpos) |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3158 { |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3159 prop = Foverlay_get (overlay, Qmodification_hooks); |
|
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3160 if (!NILP (prop)) |
|
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3161 { |
|
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3162 if (!tail_copied) |
|
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3163 tail = Fcopy_sequence (tail); |
|
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3164 tail_copied = 1; |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3165 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
|
3166 } |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3167 } |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3168 } |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3169 |
|
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3170 tail_copied = 0; |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3171 for (tail = current_buffer->overlays_after; |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3172 CONSP (tail); |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3173 tail = XCONS (tail)->cdr) |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3174 { |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3175 int startpos, endpos; |
|
4416
9657ef911049
(Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents:
4226
diff
changeset
|
3176 Lisp_Object ostart, oend; |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3177 |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3178 overlay = XCONS (tail)->car; |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3179 |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3180 ostart = OVERLAY_START (overlay); |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3181 oend = OVERLAY_END (overlay); |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3182 startpos = OVERLAY_POSITION (ostart); |
|
4574
503af6aa135b
(verify_overlay_modification): initialize endpos.
Richard M. Stallman <rms@gnu.org>
parents:
4416
diff
changeset
|
3183 endpos = OVERLAY_POSITION (oend); |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3184 if (XFASTINT (end) < startpos) |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3185 break; |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3186 if (insertion && (XFASTINT (start) == startpos |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3187 || XFASTINT (end) == startpos)) |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3188 { |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3189 prop = Foverlay_get (overlay, Qinsert_in_front_hooks); |
|
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3190 if (!NILP (prop)) |
|
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3191 { |
|
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3192 if (!tail_copied) |
|
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3193 tail = Fcopy_sequence (tail); |
|
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3194 tail_copied = 1; |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3195 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
|
3196 } |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3197 } |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3198 if (insertion && (XFASTINT (start) == endpos |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3199 || XFASTINT (end) == endpos)) |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3200 { |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3201 prop = Foverlay_get (overlay, Qinsert_behind_hooks); |
|
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3202 if (!NILP (prop)) |
|
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3203 { |
|
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3204 if (!tail_copied) |
|
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3205 tail = Fcopy_sequence (tail); |
|
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3206 tail_copied = 1; |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3207 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
|
3208 } |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3209 } |
|
6675
cf38c5af079d
(verify_overlay_modification): Run modification-hooks for any deletion that
Karl Heuer <kwzh@gnu.org>
parents:
6659
diff
changeset
|
3210 /* 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
|
3211 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
|
3212 if (XFASTINT (end) > startpos && XFASTINT (start) < endpos) |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3213 { |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3214 prop = Foverlay_get (overlay, Qmodification_hooks); |
|
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3215 if (!NILP (prop)) |
|
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
3216 { |
|
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3217 if (!tail_copied) |
|
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3218 tail = Fcopy_sequence (tail); |
|
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3219 tail_copied = 1; |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3220 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
|
3221 } |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3222 } |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3223 } |
|
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3224 |
|
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
3225 UNGCPRO; |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3226 } |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3227 |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3228 static void |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3229 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
|
3230 Lisp_Object list, overlay; |
|
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3231 int after; |
|
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3232 Lisp_Object arg1, arg2, arg3; |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3233 { |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3234 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3235 |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3236 GCPRO4 (list, arg1, arg2, arg3); |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3237 if (! after) |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3238 add_overlay_mod_hooklist (list, overlay); |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3239 |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3240 while (!NILP (list)) |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3241 { |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3242 if (NILP (arg3)) |
|
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3243 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
|
3244 else |
|
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
3245 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
|
3246 list = Fcdr (list); |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3247 } |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3248 UNGCPRO; |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3249 } |
| 8839 | 3250 |
| 3251 /* Delete any zero-sized overlays at position POS, if the `evaporate' | |
| 3252 property is set. */ | |
| 3253 void | |
| 3254 evaporate_overlays (pos) | |
| 3255 int pos; | |
| 3256 { | |
| 3257 Lisp_Object tail, overlay, hit_list; | |
| 3258 | |
| 3259 hit_list = Qnil; | |
| 3260 if (pos <= XFASTINT (current_buffer->overlay_center)) | |
| 3261 for (tail = current_buffer->overlays_before; CONSP (tail); | |
| 3262 tail = XCONS (tail)->cdr) | |
| 3263 { | |
| 3264 int endpos; | |
| 3265 overlay = XCONS (tail)->car; | |
| 3266 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); | |
| 3267 if (endpos < pos) | |
| 3268 break; | |
| 3269 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
|
3270 && ! NILP (Foverlay_get (overlay, Qevaporate))) |
| 8839 | 3271 hit_list = Fcons (overlay, hit_list); |
| 3272 } | |
| 3273 else | |
| 3274 for (tail = current_buffer->overlays_after; CONSP (tail); | |
| 3275 tail = XCONS (tail)->cdr) | |
| 3276 { | |
| 3277 int startpos; | |
|
9006
186aff8c1f51
(evaporate_overlays): Overlay is in car, not cdr.
Karl Heuer <kwzh@gnu.org>
parents:
8967
diff
changeset
|
3278 overlay = XCONS (tail)->car; |
| 8839 | 3279 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
| 3280 if (startpos > pos) | |
| 3281 break; | |
| 3282 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
|
3283 && ! NILP (Foverlay_get (overlay, Qevaporate))) |
| 8839 | 3284 hit_list = Fcons (overlay, hit_list); |
| 3285 } | |
| 3286 for (; CONSP (hit_list); hit_list = XCONS (hit_list)->cdr) | |
| 3287 Fdelete_overlay (XCONS (hit_list)->car); | |
| 3288 } | |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
3289 |
|
9464
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
3290 /* Somebody has tried to store a value with an unacceptable type |
|
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
3291 into the buffer-local slot with offset OFFSET. */ |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3292 void |
|
9464
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
3293 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
|
3294 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
|
3295 { |
|
9464
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
3296 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
|
3297 char *type_name; |
|
9464
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
3298 sym = *(Lisp_Object *)(offset + (char *)&buffer_local_symbols); |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3299 switch (XINT (*(Lisp_Object *)(offset + (char *)&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
|
3300 { |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3301 case Lisp_Int: type_name = "integers"; break; |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3302 case Lisp_String: type_name = "strings"; break; |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3303 case Lisp_Symbol: type_name = "symbols"; break; |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3304 default: |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3305 abort (); |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3306 } |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3307 |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3308 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
|
3309 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
|
3310 } |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3311 |
| 333 | 3312 init_buffer_once () |
| 3313 { | |
| 3314 register Lisp_Object tem; | |
| 3315 | |
| 3316 /* Make sure all markable slots in buffer_defaults | |
| 3317 are initialized reasonably, so mark_buffer won't choke. */ | |
| 3318 reset_buffer (&buffer_defaults); | |
|
8873
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
3319 reset_buffer_local_variables (&buffer_defaults); |
| 333 | 3320 reset_buffer (&buffer_local_symbols); |
|
8873
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
3321 reset_buffer_local_variables (&buffer_local_symbols); |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
3322 /* Prevent GC from getting confused. */ |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
3323 buffer_defaults.text = &buffer_defaults.own_text; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
3324 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
|
3325 #ifdef USE_TEXT_PROPERTIES |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
3326 BUF_INTERVALS (&buffer_defaults) = 0; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
3327 BUF_INTERVALS (&buffer_local_symbols) = 0; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
3328 #endif |
|
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
3329 XSETBUFFER (Vbuffer_defaults, &buffer_defaults); |
|
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
3330 XSETBUFFER (Vbuffer_local_symbols, &buffer_local_symbols); |
| 333 | 3331 |
| 3332 /* Set up the default values of various buffer slots. */ | |
| 3333 /* Must do these before making the first buffer! */ | |
| 3334 | |
| 3335 /* real setup is done in loaddefs.el */ | |
| 3336 buffer_defaults.mode_line_format = build_string ("%-"); | |
| 3337 buffer_defaults.abbrev_mode = Qnil; | |
| 3338 buffer_defaults.overwrite_mode = Qnil; | |
| 3339 buffer_defaults.case_fold_search = Qt; | |
| 3340 buffer_defaults.auto_fill_function = Qnil; | |
| 3341 buffer_defaults.selective_display = Qnil; | |
| 3342 #ifndef old | |
| 3343 buffer_defaults.selective_display_ellipses = Qt; | |
| 3344 #endif | |
| 3345 buffer_defaults.abbrev_table = Qnil; | |
| 3346 buffer_defaults.display_table = Qnil; | |
| 3347 buffer_defaults.undo_list = Qnil; | |
|
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
3348 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
|
3349 buffer_defaults.file_format = Qnil; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3350 buffer_defaults.overlays_before = Qnil; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3351 buffer_defaults.overlays_after = Qnil; |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3352 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
|
3353 |
|
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
|
3354 XSETFASTINT (buffer_defaults.tab_width, 8); |
| 333 | 3355 buffer_defaults.truncate_lines = Qnil; |
| 3356 buffer_defaults.ctl_arrow = Qt; | |
| 3357 | |
|
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
3358 #ifdef DOS_NT |
|
7270
0f79f4bd3c62
(init_buffer_once): Initialize buffer_file_type field right.
Richard M. Stallman <rms@gnu.org>
parents:
7062
diff
changeset
|
3359 buffer_defaults.buffer_file_type = Qnil; /* TEXT */ |
|
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
3360 #endif |
|
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
|
3361 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
|
3362 XSETFASTINT (buffer_defaults.left_margin, 0); |
|
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
3363 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
|
3364 buffer_defaults.file_truename = Qnil; |
| 333 | 3365 |
| 3366 /* Assign the local-flags to the slots that have default values. | |
| 3367 The local flag is a bit that is used in the buffer | |
| 3368 to say that it has its own local value for the slot. | |
| 3369 The local flag bits are in the local_var_flags slot of the buffer. */ | |
| 3370 | |
| 3371 /* 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
|
3372 if (sizeof (EMACS_INT) != sizeof (Lisp_Object)) abort (); |
| 333 | 3373 |
| 3374 /* 0 means not a lisp var, -1 means always local, else mask */ | |
| 3375 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
|
3376 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
|
3377 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
|
3378 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
|
3379 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
|
3380 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
|
3381 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
|
3382 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
|
3383 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
|
3384 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
|
3385 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
|
3386 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
|
3387 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
|
3388 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
|
3389 XSETINT (buffer_local_flags.file_format, -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
|
3390 |
|
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
|
3391 XSETFASTINT (buffer_local_flags.mode_line_format, 1); |
|
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
|
3392 XSETFASTINT (buffer_local_flags.abbrev_mode, 2); |
|
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
|
3393 XSETFASTINT (buffer_local_flags.overwrite_mode, 4); |
|
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
|
3394 XSETFASTINT (buffer_local_flags.case_fold_search, 8); |
|
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
|
3395 XSETFASTINT (buffer_local_flags.auto_fill_function, 0x10); |
|
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
|
3396 XSETFASTINT (buffer_local_flags.selective_display, 0x20); |
| 333 | 3397 #ifndef old |
|
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
|
3398 XSETFASTINT (buffer_local_flags.selective_display_ellipses, 0x40); |
| 333 | 3399 #endif |
|
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
|
3400 XSETFASTINT (buffer_local_flags.tab_width, 0x80); |
|
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
|
3401 XSETFASTINT (buffer_local_flags.truncate_lines, 0x100); |
|
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
|
3402 XSETFASTINT (buffer_local_flags.ctl_arrow, 0x200); |
|
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
|
3403 XSETFASTINT (buffer_local_flags.fill_column, 0x400); |
|
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
|
3404 XSETFASTINT (buffer_local_flags.left_margin, 0x800); |
|
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
|
3405 XSETFASTINT (buffer_local_flags.abbrev_table, 0x1000); |
|
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
|
3406 XSETFASTINT (buffer_local_flags.display_table, 0x2000); |
|
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
|
3407 XSETFASTINT (buffer_local_flags.syntax_table, 0x8000); |
|
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
3408 XSETFASTINT (buffer_local_flags.cache_long_line_scans, 0x10000); |
|
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
3409 #ifdef DOS_NT |
|
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
|
3410 XSETFASTINT (buffer_local_flags.buffer_file_type, 0x4000); |
|
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
3411 #endif |
| 333 | 3412 |
| 3413 Vbuffer_alist = Qnil; | |
| 3414 current_buffer = 0; | |
| 3415 all_buffers = 0; | |
| 3416 | |
| 3417 QSFundamental = build_string ("Fundamental"); | |
| 3418 | |
| 3419 Qfundamental_mode = intern ("fundamental-mode"); | |
| 3420 buffer_defaults.major_mode = Qfundamental_mode; | |
| 3421 | |
| 3422 Qmode_class = intern ("mode-class"); | |
| 3423 | |
| 3424 Qprotected_field = intern ("protected-field"); | |
| 3425 | |
| 3426 Qpermanent_local = intern ("permanent-local"); | |
| 3427 | |
| 3428 Qkill_buffer_hook = intern ("kill-buffer-hook"); | |
| 3429 | |
| 3430 Vprin1_to_string_buffer = Fget_buffer_create (build_string (" prin1")); | |
| 14396 | 3431 |
| 333 | 3432 /* super-magic invisible buffer */ |
| 3433 Vbuffer_alist = Qnil; | |
| 3434 | |
| 648 | 3435 Fset_buffer (Fget_buffer_create (build_string ("*scratch*"))); |
| 333 | 3436 } |
| 3437 | |
| 3438 init_buffer () | |
| 3439 { | |
| 3440 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
|
3441 char *pwd; |
|
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
3442 struct stat dotstat, pwdstat; |
|
3463
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
3443 Lisp_Object temp; |
|
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
3444 int rc; |
| 333 | 3445 |
| 3446 Fset_buffer (Fget_buffer_create (build_string ("*scratch*"))); | |
|
1563
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
3447 |
|
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
3448 /* 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
|
3449 when PWD is right, and may avoid a fatal error. */ |
|
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
3450 if ((pwd = getenv ("PWD")) != 0 && IS_DIRECTORY_SEP (*pwd) |
|
1563
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
3451 && 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
|
3452 && 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
|
3453 && 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
|
3454 && 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
|
3455 && 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
|
3456 strcpy (buf, pwd); |
|
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
3457 else if (getwd (buf) == 0) |
|
9810
c76b3e670eb3
(init_buffer): Fix error message syntax.
Richard M. Stallman <rms@gnu.org>
parents:
9785
diff
changeset
|
3458 fatal ("`getwd' failed: %s\n", buf); |
| 333 | 3459 |
| 3460 #ifndef VMS | |
| 3461 /* Maybe this should really use some standard subroutine | |
| 3462 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
|
3463 rc = strlen (buf); |
|
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
3464 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
|
3465 { |
|
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
3466 buf[rc] = DIRECTORY_SEP; |
|
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
3467 buf[rc + 1] = '\0'; |
|
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
3468 } |
| 333 | 3469 #endif /* not VMS */ |
| 3470 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
|
3471 |
|
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
3472 temp = get_minibuffer (0); |
|
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
3473 XBUFFER (temp)->directory = current_buffer->directory; |
| 333 | 3474 } |
| 3475 | |
| 3476 /* initialize the buffer routines */ | |
| 3477 syms_of_buffer () | |
| 3478 { | |
|
2060
7eea4dfc5133
(syms_of_buffer): Make erase-buffer a disabled command.
Roland McGrath <roland@gnu.org>
parents:
2043
diff
changeset
|
3479 extern Lisp_Object Qdisabled; |
|
7eea4dfc5133
(syms_of_buffer): Make erase-buffer a disabled command.
Roland McGrath <roland@gnu.org>
parents:
2043
diff
changeset
|
3480 |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3481 staticpro (&last_overlay_modification_hooks); |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3482 last_overlay_modification_hooks |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3483 = Fmake_vector (make_number (10), Qnil); |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
3484 |
| 333 | 3485 staticpro (&Vbuffer_defaults); |
| 3486 staticpro (&Vbuffer_local_symbols); | |
| 3487 staticpro (&Qfundamental_mode); | |
| 3488 staticpro (&Qmode_class); | |
| 3489 staticpro (&QSFundamental); | |
| 3490 staticpro (&Vbuffer_alist); | |
| 3491 staticpro (&Qprotected_field); | |
| 3492 staticpro (&Qpermanent_local); | |
| 3493 staticpro (&Qkill_buffer_hook); | |
|
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
3494 Qoverlayp = intern ("overlayp"); |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3495 staticpro (&Qoverlayp); |
| 8839 | 3496 Qevaporate = intern ("evaporate"); |
| 3497 staticpro (&Qevaporate); | |
|
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
3498 Qmodification_hooks = intern ("modification-hooks"); |
|
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
3499 staticpro (&Qmodification_hooks); |
|
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
3500 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
|
3501 staticpro (&Qinsert_in_front_hooks); |
|
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
3502 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
|
3503 staticpro (&Qinsert_behind_hooks); |
|
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
3504 Qget_file_buffer = intern ("get-file-buffer"); |
| 5433 | 3505 staticpro (&Qget_file_buffer); |
|
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3506 Qpriority = intern ("priority"); |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3507 staticpro (&Qpriority); |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3508 Qwindow = intern ("window"); |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3509 staticpro (&Qwindow); |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3510 Qbefore_string = intern ("before-string"); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3511 staticpro (&Qbefore_string); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3512 Qafter_string = intern ("after-string"); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3513 staticpro (&Qafter_string); |
|
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
3514 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
|
3515 staticpro (&Qfirst_change_hook); |
|
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
3516 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
|
3517 staticpro (&Qbefore_change_functions); |
|
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
3518 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
|
3519 staticpro (&Qafter_change_functions); |
| 333 | 3520 |
| 3521 Fput (Qprotected_field, Qerror_conditions, | |
| 3522 Fcons (Qprotected_field, Fcons (Qerror, Qnil))); | |
| 3523 Fput (Qprotected_field, Qerror_message, | |
| 3524 build_string ("Attempt to modify a protected field")); | |
| 3525 | |
| 3526 /* All these use DEFVAR_LISP_NOPRO because the slots in | |
| 3527 buffer_defaults will all be marked via Vbuffer_defaults. */ | |
| 3528 | |
| 3529 DEFVAR_LISP_NOPRO ("default-mode-line-format", | |
| 3530 &buffer_defaults.mode_line_format, | |
| 3531 "Default value of `mode-line-format' for buffers that don't override it.\n\ | |
| 3532 This is the same as (default-value 'mode-line-format)."); | |
| 3533 | |
| 3534 DEFVAR_LISP_NOPRO ("default-abbrev-mode", | |
| 3535 &buffer_defaults.abbrev_mode, | |
| 3536 "Default value of `abbrev-mode' for buffers that do not override it.\n\ | |
| 3537 This is the same as (default-value 'abbrev-mode)."); | |
| 3538 | |
| 3539 DEFVAR_LISP_NOPRO ("default-ctl-arrow", | |
| 3540 &buffer_defaults.ctl_arrow, | |
| 3541 "Default value of `ctl-arrow' for buffers that do not override it.\n\ | |
| 3542 This is the same as (default-value 'ctl-arrow)."); | |
| 3543 | |
| 3544 DEFVAR_LISP_NOPRO ("default-truncate-lines", | |
| 3545 &buffer_defaults.truncate_lines, | |
| 3546 "Default value of `truncate-lines' for buffers that do not override it.\n\ | |
| 3547 This is the same as (default-value 'truncate-lines)."); | |
| 3548 | |
| 3549 DEFVAR_LISP_NOPRO ("default-fill-column", | |
| 3550 &buffer_defaults.fill_column, | |
| 3551 "Default value of `fill-column' for buffers that do not override it.\n\ | |
| 3552 This is the same as (default-value 'fill-column)."); | |
| 3553 | |
| 3554 DEFVAR_LISP_NOPRO ("default-left-margin", | |
| 3555 &buffer_defaults.left_margin, | |
| 3556 "Default value of `left-margin' for buffers that do not override it.\n\ | |
| 3557 This is the same as (default-value 'left-margin)."); | |
| 3558 | |
| 3559 DEFVAR_LISP_NOPRO ("default-tab-width", | |
| 3560 &buffer_defaults.tab_width, | |
| 3561 "Default value of `tab-width' for buffers that do not override it.\n\ | |
| 3562 This is the same as (default-value 'tab-width)."); | |
| 3563 | |
| 3564 DEFVAR_LISP_NOPRO ("default-case-fold-search", | |
| 3565 &buffer_defaults.case_fold_search, | |
| 3566 "Default value of `case-fold-search' for buffers that don't override it.\n\ | |
| 3567 This is the same as (default-value 'case-fold-search)."); | |
| 3568 | |
|
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
3569 #ifdef DOS_NT |
|
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
3570 DEFVAR_LISP_NOPRO ("default-buffer-file-type", |
|
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
3571 &buffer_defaults.buffer_file_type, |
|
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
3572 "Default file type for buffers that do not override it.\n\ |
|
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
3573 This is the same as (default-value 'buffer-file-type).\n\ |
|
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
3574 The file type is nil for text, t for binary."); |
|
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
3575 #endif |
|
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
3576 |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3577 DEFVAR_PER_BUFFER ("mode-line-format", ¤t_buffer->mode_line_format, |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3578 Qnil, 0); |
| 333 | 3579 |
| 3580 /* This doc string is too long for cpp; cpp dies if it isn't in a comment. | |
| 3581 But make-docfile finds it! | |
| 3582 DEFVAR_PER_BUFFER ("mode-line-format", ¤t_buffer->mode_line_format, | |
|
1985
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
3583 Qnil, |
| 333 | 3584 "Template for displaying mode line for current buffer.\n\ |
| 3585 Each buffer has its own value of this variable.\n\ | |
| 3586 Value may be a string, a symbol or a list or cons cell.\n\ | |
| 3587 For a symbol, its value is used (but it is ignored if t or nil).\n\ | |
| 3588 A string appearing directly as the value of a symbol is processed verbatim\n\ | |
| 3589 in that the %-constructs below are not recognized.\n\ | |
| 3590 For a list whose car is a symbol, the symbol's value is taken,\n\ | |
| 3591 and if that is non-nil, the cadr of the list is processed recursively.\n\ | |
| 3592 Otherwise, the caddr of the list (if there is one) is processed.\n\ | |
| 3593 For a list whose car is a string or list, each element is processed\n\ | |
| 3594 recursively and the results are effectively concatenated.\n\ | |
| 3595 For a list whose car is an integer, the cdr of the list is processed\n\ | |
| 3596 and padded (if the number is positive) or truncated (if negative)\n\ | |
| 3597 to the width specified by that number.\n\ | |
| 3598 A string is printed verbatim in the mode line except for %-constructs:\n\ | |
| 3599 (%-constructs are allowed when the string is the entire mode-line-format\n\ | |
| 3600 or when it is found in a cons-cell or a list)\n\ | |
| 3601 %b -- print buffer name. %f -- print visited file name.\n\ | |
|
8125
3941618b4c2b
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8123
diff
changeset
|
3602 %* -- print %, * or hyphen. %+ -- print *, % or hyphen.\n\ |
|
3941618b4c2b
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8123
diff
changeset
|
3603 % means buffer is read-only and * means it is modified.\n\ |
|
3941618b4c2b
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8123
diff
changeset
|
3604 For a modified read-only buffer, %* gives % and %+ gives *.\n\ |
|
2578
f694fc6cdd33
(Qmode-line-format): Describe %l in the doc string.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2508
diff
changeset
|
3605 %s -- print process status. %l -- print the current line number.\n\ |
|
15032
0d32c8a2ae39
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14506
diff
changeset
|
3606 %c -- print the current column number (this makes editing slower).\n\ |
|
5904
7f95b8e1ec44
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5873
diff
changeset
|
3607 %p -- print percent of buffer above top of window, or Top, Bot or All.\n\ |
|
7295
3f9ea1ad1c65
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7270
diff
changeset
|
3608 %P -- print percent of buffer above bottom of window, perhaps plus Top,\n\ |
|
5904
7f95b8e1ec44
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5873
diff
changeset
|
3609 or print Bottom or All.\n\ |
| 333 | 3610 %n -- print Narrow if appropriate.\n\ |
|
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
3611 %t -- print T if files is text, B if binary.\n\ |
| 333 | 3612 %[ -- print one [ for each recursive editing level. %] similar.\n\ |
| 3613 %% -- print %. %- -- print infinitely many dashes.\n\ | |
| 3614 Decimal digits after the % specify field width to which to pad."); | |
| 3615 */ | |
| 3616 | |
| 3617 DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode, | |
| 3618 "*Major mode for new buffers. Defaults to `fundamental-mode'.\n\ | |
| 3619 nil here means use current buffer's major mode."); | |
| 3620 | |
| 3621 DEFVAR_PER_BUFFER ("major-mode", ¤t_buffer->major_mode, | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3622 make_number (Lisp_Symbol), |
| 333 | 3623 "Symbol for current buffer's major mode."); |
| 3624 | |
| 3625 DEFVAR_PER_BUFFER ("mode-name", ¤t_buffer->mode_name, | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3626 make_number (Lisp_String), |
| 333 | 3627 "Pretty name of current buffer's major mode (a string)."); |
| 3628 | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3629 DEFVAR_PER_BUFFER ("abbrev-mode", ¤t_buffer->abbrev_mode, Qnil, |
| 333 | 3630 "Non-nil turns on automatic expansion of abbrevs as they are inserted.\n\ |
| 3631 Automatically becomes buffer-local when set in any fashion."); | |
| 3632 | |
| 3633 DEFVAR_PER_BUFFER ("case-fold-search", ¤t_buffer->case_fold_search, | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3634 Qnil, |
| 333 | 3635 "*Non-nil if searches should ignore case.\n\ |
| 3636 Automatically becomes buffer-local when set in any fashion."); | |
| 3637 | |
| 3638 DEFVAR_PER_BUFFER ("fill-column", ¤t_buffer->fill_column, | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3639 make_number (Lisp_Int), |
| 333 | 3640 "*Column beyond which automatic line-wrapping should happen.\n\ |
| 3641 Automatically becomes buffer-local when set in any fashion."); | |
| 3642 | |
| 3643 DEFVAR_PER_BUFFER ("left-margin", ¤t_buffer->left_margin, | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3644 make_number (Lisp_Int), |
| 333 | 3645 "*Column for the default indent-line-function to indent to.\n\ |
| 3646 Linefeed indents to this column in Fundamental mode.\n\ | |
| 3647 Automatically becomes buffer-local when set in any fashion."); | |
| 3648 | |
| 3649 DEFVAR_PER_BUFFER ("tab-width", ¤t_buffer->tab_width, | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3650 make_number (Lisp_Int), |
| 333 | 3651 "*Distance between tab stops (for display of tab characters), in columns.\n\ |
| 3652 Automatically becomes buffer-local when set in any fashion."); | |
| 3653 | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3654 DEFVAR_PER_BUFFER ("ctl-arrow", ¤t_buffer->ctl_arrow, Qnil, |
| 333 | 3655 "*Non-nil means display control chars with uparrow.\n\ |
| 3656 Nil means use backslash and octal digits.\n\ | |
| 3657 Automatically becomes buffer-local when set in any fashion.\n\ | |
| 3658 This variable does not apply to characters whose display is specified\n\ | |
| 3659 in the current display table (if there is one)."); | |
| 3660 | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3661 DEFVAR_PER_BUFFER ("truncate-lines", ¤t_buffer->truncate_lines, Qnil, |
| 333 | 3662 "*Non-nil means do not display continuation lines;\n\ |
| 3663 give each line of text one screen line.\n\ | |
| 3664 Automatically becomes buffer-local when set in any fashion.\n\ | |
| 3665 \n\ | |
| 3666 Note that this is overridden by the variable\n\ | |
| 3667 `truncate-partial-width-windows' if that variable is non-nil\n\ | |
| 764 | 3668 and this buffer is not full-frame width."); |
| 333 | 3669 |
|
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
3670 #ifdef DOS_NT |
|
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
3671 DEFVAR_PER_BUFFER ("buffer-file-type", ¤t_buffer->buffer_file_type, |
|
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
3672 Qnil, |
|
10253
4aa245b5eb83
(syms_of_buffer): Doc fix for buffer-file-type.
Richard M. Stallman <rms@gnu.org>
parents:
10210
diff
changeset
|
3673 "Non-nil if the visited file is a binary file.\n\ |
|
4aa245b5eb83
(syms_of_buffer): Doc fix for buffer-file-type.
Richard M. Stallman <rms@gnu.org>
parents:
10210
diff
changeset
|
3674 This variable is meaningful on MS-DOG and Windows NT.\n\ |
|
4aa245b5eb83
(syms_of_buffer): Doc fix for buffer-file-type.
Richard M. Stallman <rms@gnu.org>
parents:
10210
diff
changeset
|
3675 On those systems, it is automatically local in every buffer.\n\ |
|
10505
4f7f9b9ff513
(syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents:
10443
diff
changeset
|
3676 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
|
3677 #endif |
|
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
3678 |
| 333 | 3679 DEFVAR_PER_BUFFER ("default-directory", ¤t_buffer->directory, |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3680 make_number (Lisp_String), |
| 333 | 3681 "Name of default directory of current buffer. Should end with slash.\n\ |
| 3682 Each buffer has its own value of this variable."); | |
| 3683 | |
| 3684 DEFVAR_PER_BUFFER ("auto-fill-function", ¤t_buffer->auto_fill_function, | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3685 Qnil, |
| 333 | 3686 "Function called (if non-nil) to perform auto-fill.\n\ |
| 3687 It is called after self-inserting a space at a column beyond `fill-column'.\n\ | |
| 3688 Each buffer has its own value of this variable.\n\ | |
| 3689 NOTE: This variable is not an ordinary hook;\n\ | |
| 3690 It may not be a list of functions."); | |
| 3691 | |
| 3692 DEFVAR_PER_BUFFER ("buffer-file-name", ¤t_buffer->filename, | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3693 make_number (Lisp_String), |
| 333 | 3694 "Name of file visited in current buffer, or nil if not visiting a file.\n\ |
| 3695 Each buffer has its own value of this variable."); | |
| 3696 | |
|
10751
dea8f022819d
(syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents:
10668
diff
changeset
|
3697 DEFVAR_PER_BUFFER ("buffer-file-truename", ¤t_buffer->file_truename, |
|
dea8f022819d
(syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents:
10668
diff
changeset
|
3698 make_number (Lisp_String), |
|
12354
dfcab1d5249d
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
12214
diff
changeset
|
3699 "Abbreviated truename of file visited in current buffer, or nil if none.\n\ |
|
11823
51194e0d2967
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11693
diff
changeset
|
3700 The truename of a file is calculated by `file-truename'\n\ |
|
51194e0d2967
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11693
diff
changeset
|
3701 and then abbreviated with `abbreviate-file-name'.\n\ |
|
10751
dea8f022819d
(syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents:
10668
diff
changeset
|
3702 Each buffer has its own value of this variable."); |
|
dea8f022819d
(syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents:
10668
diff
changeset
|
3703 |
| 333 | 3704 DEFVAR_PER_BUFFER ("buffer-auto-save-file-name", |
| 1041 | 3705 ¤t_buffer->auto_save_file_name, |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3706 make_number (Lisp_String), |
| 333 | 3707 "Name of file for auto-saving current buffer,\n\ |
| 3708 or nil if buffer should not be auto-saved.\n\ | |
| 3709 Each buffer has its own value of this variable."); | |
| 3710 | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3711 DEFVAR_PER_BUFFER ("buffer-read-only", ¤t_buffer->read_only, Qnil, |
| 333 | 3712 "Non-nil if this buffer is read-only.\n\ |
| 3713 Each buffer has its own value of this variable."); | |
| 3714 | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3715 DEFVAR_PER_BUFFER ("buffer-backed-up", ¤t_buffer->backed_up, Qnil, |
| 333 | 3716 "Non-nil if this buffer's file has been backed up.\n\ |
| 3717 Backing up is done before the first time the file is saved.\n\ | |
| 3718 Each buffer has its own value of this variable."); | |
| 3719 | |
| 3720 DEFVAR_PER_BUFFER ("buffer-saved-size", ¤t_buffer->save_length, | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3721 make_number (Lisp_Int), |
| 333 | 3722 "Length of current buffer when last read in, saved or auto-saved.\n\ |
| 3723 0 initially.\n\ | |
| 3724 Each buffer has its own value of this variable."); | |
| 3725 | |
| 3726 DEFVAR_PER_BUFFER ("selective-display", ¤t_buffer->selective_display, | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3727 Qnil, |
| 333 | 3728 "Non-nil enables selective display:\n\ |
| 3729 Integer N as value means display only lines\n\ | |
| 3730 that start with less than n columns of space.\n\ | |
| 3731 A value of t means, after a ^M, all the rest of the line is invisible.\n\ | |
| 3732 Then ^M's in the file are written into files as newlines.\n\n\ | |
| 3733 Automatically becomes buffer-local when set in any fashion."); | |
| 3734 | |
| 3735 #ifndef old | |
| 3736 DEFVAR_PER_BUFFER ("selective-display-ellipses", | |
| 3737 ¤t_buffer->selective_display_ellipses, | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3738 Qnil, |
| 333 | 3739 "t means display ... on previous line when a line is invisible.\n\ |
| 3740 Automatically becomes buffer-local when set in any fashion."); | |
| 3741 #endif | |
| 3742 | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
3743 DEFVAR_PER_BUFFER ("overwrite-mode", ¤t_buffer->overwrite_mode, Qnil, |
| 333 | 3744 "Non-nil if self-insertion should replace existing text.\n\ |
|
10611
eafe5efc009b
(syms_of_buffer): overwrite-mode doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10561
diff
changeset
|
3745 The value should be one of `overwrite-mode-textual',\n\ |
|
eafe5efc009b
(syms_of_buffer): overwrite-mode doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10561
diff
changeset
|
3746 `overwrite-mode-binary', or nil.\n\ |
|
eafe5efc009b
(syms_of_buffer): overwrite-mode doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10561
diff
changeset
|
3747 If it is `overwrite-mode-textual', self-insertion still\n\ |
|
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2060
diff
changeset
|
3748 inserts at the end of a line, and inserts when point is before a tab,\n\ |
| 2217 | 3749 until the tab is filled in.\n\ |
|
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2060
diff
changeset
|
3750 If `overwrite-mode-binary', self-insertion replaces newlines and tabs too.\n\ |
| 333 | 3751 Automatically becomes buffer-local when set in any fashion."); |
| 3752 | |
|
4226
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
3753 #if 0 /* The doc string is too long for some compilers, |
|
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
3754 but make-docfile can find it in this comment. */ |
| 333 | 3755 DEFVAR_PER_BUFFER ("buffer-display-table", ¤t_buffer->display_table, |
|
1038
59fa7697bb14
(syms_of_buffer): Made buffer-display-table,
Richard M. Stallman <rms@gnu.org>
parents:
1001
diff
changeset
|
3756 Qnil, |
| 333 | 3757 "Display table that controls display of the contents of current buffer.\n\ |
| 3758 Automatically becomes buffer-local when set in any fashion.\n\ | |
|
13169
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
3759 The display table is a char-table created with `make-display-table'.\n\ |
|
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
3760 The ordinary char-table elements control how to display each possible text\n\ |
|
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
3761 character. Each value should be a vector of characters or nil;\n\ |
| 333 | 3762 nil means display the character in the default fashion.\n\ |
|
13169
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
3763 There are six extra slots to control the display of\n\ |
|
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
3764 the end of a truncated screen line (extra-slot 0, a single character);\n\ |
|
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
3765 the end of a continued line (extra-slot 1, a single character);\n\ |
|
2645
b0462d46afff
* buffer.c (syms_of_buffer): Doc fix for buffer-display-table.
Jim Blandy <jimb@redhat.com>
parents:
2578
diff
changeset
|
3766 the escape character used to display character codes in octal\n\ |
|
13169
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
3767 (extra-slot 2, a single character);\n\ |
|
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
3768 the character used as an arrow for control characters (extra-slot 3,\n\ |
|
2645
b0462d46afff
* buffer.c (syms_of_buffer): Doc fix for buffer-display-table.
Jim Blandy <jimb@redhat.com>
parents:
2578
diff
changeset
|
3769 a single character);\n\ |
|
13169
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
3770 the decoration indicating the presence of invisible lines (extra-slot 4,\n\ |
|
8919
644f69fe736e
Add a new element to display tables controlling side-by-side
Jim Blandy <jimb@redhat.com>
parents:
8873
diff
changeset
|
3771 a vector of characters);\n\ |
|
644f69fe736e
Add a new element to display tables controlling side-by-side
Jim Blandy <jimb@redhat.com>
parents:
8873
diff
changeset
|
3772 the character used to draw the border between side-by-side windows\n\ |
|
13169
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
3773 (extra-slot 5, a single character).\n\ |
|
d72f18f068a8
(buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents:
13151
diff
changeset
|
3774 See also the functions `display-table-slot' and `set-display-table-slot'.\n\ |
| 333 | 3775 If this variable is nil, the value of `standard-display-table' is used.\n\ |
| 3776 Each window can have its own, overriding display table."); | |
|
4226
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
3777 #endif |
|
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
3778 DEFVAR_PER_BUFFER ("buffer-display-table", ¤t_buffer->display_table, |
|
6348
f5a437637850
(buffer-display-table, buffer-undo-list): Delete docstring of second version
Karl Heuer <kwzh@gnu.org>
parents:
6205
diff
changeset
|
3779 Qnil, 0); |
| 333 | 3780 |
| 3781 /*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol, | |
| 3782 "Don't ask."); | |
| 3783 */ | |
| 392 | 3784 DEFVAR_LISP ("before-change-function", &Vbefore_change_function, |
| 333 | 3785 "Function to call before each text change.\n\ |
| 3786 Two arguments are passed to the function: the positions of\n\ | |
| 3787 the beginning and end of the range of old text to be changed.\n\ | |
| 3788 \(For an insertion, the beginning and end are at the same place.)\n\ | |
| 3789 No information is given about the length of the text after the change.\n\ | |
| 3790 \n\ | |
|
6785
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3791 Buffer changes made while executing the `before-change-function'\n\ |
|
7434
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
3792 don't call any before-change or after-change functions.\n\ |
|
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
3793 That's because these variables are temporarily set to nil.\n\ |
|
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
3794 As a result, a hook function cannot straightforwardly alter the value of\n\ |
|
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
3795 these variables. See the Emacs Lisp manual for a way of\n\ |
|
7455
35657813817c
(Frename_buffer): Reject empty string as new name.
Richard M. Stallman <rms@gnu.org>
parents:
7434
diff
changeset
|
3796 accomplishing an equivalent result by using other variables."); |
| 333 | 3797 Vbefore_change_function = Qnil; |
| 3798 | |
| 3799 DEFVAR_LISP ("after-change-function", &Vafter_change_function, | |
| 3800 "Function to call after each text change.\n\ | |
| 3801 Three arguments are passed to the function: the positions of\n\ | |
| 3802 the beginning and end of the range of changed text,\n\ | |
| 3803 and the length of the pre-change text replaced by that range.\n\ | |
| 3804 \(For an insertion, the pre-change length is zero;\n\ | |
| 3805 for a deletion, that length is the number of characters deleted,\n\ | |
| 3806 and the post-change beginning and end are at the same place.)\n\ | |
| 3807 \n\ | |
|
6785
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3808 Buffer changes made while executing the `after-change-function'\n\ |
|
7434
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
3809 don't call any before-change or after-change functions.\n\ |
|
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
3810 That's because these variables are temporarily set to nil.\n\ |
|
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
3811 As a result, a hook function cannot straightforwardly alter the value of\n\ |
|
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
3812 these variables. See the Emacs Lisp manual for a way of\n\ |
|
7455
35657813817c
(Frename_buffer): Reject empty string as new name.
Richard M. Stallman <rms@gnu.org>
parents:
7434
diff
changeset
|
3813 accomplishing an equivalent result by using other variables."); |
| 333 | 3814 Vafter_change_function = Qnil; |
| 3815 | |
|
6785
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3816 DEFVAR_LISP ("before-change-functions", &Vbefore_change_functions, |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3817 "List of functions to call before each text change.\n\ |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3818 Two arguments are passed to each function: the positions of\n\ |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3819 the beginning and end of the range of old text to be changed.\n\ |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3820 \(For an insertion, the beginning and end are at the same place.)\n\ |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3821 No information is given about the length of the text after the change.\n\ |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3822 \n\ |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3823 Buffer changes made while executing the `before-change-functions'\n\ |
|
7434
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
3824 don't call any before-change or after-change functions.\n\ |
|
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
3825 That's because these variables are temporarily set to nil.\n\ |
|
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
3826 As a result, a hook function cannot straightforwardly alter the value of\n\ |
|
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
3827 these variables. See the Emacs Lisp manual for a way of\n\ |
|
7455
35657813817c
(Frename_buffer): Reject empty string as new name.
Richard M. Stallman <rms@gnu.org>
parents:
7434
diff
changeset
|
3828 accomplishing an equivalent result by using other variables."); |
|
6785
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3829 Vbefore_change_functions = Qnil; |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3830 |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3831 DEFVAR_LISP ("after-change-functions", &Vafter_change_functions, |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3832 "List of function to call after each text change.\n\ |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3833 Three arguments are passed to each function: the positions of\n\ |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3834 the beginning and end of the range of changed text,\n\ |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3835 and the length of the pre-change text replaced by that range.\n\ |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3836 \(For an insertion, the pre-change length is zero;\n\ |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3837 for a deletion, that length is the number of characters deleted,\n\ |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3838 and the post-change beginning and end are at the same place.)\n\ |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3839 \n\ |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3840 Buffer changes made while executing the `after-change-functions'\n\ |
|
7434
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
3841 don't call any before-change or after-change functions.\n\ |
|
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
3842 That's because these variables are temporarily set to nil.\n\ |
|
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
3843 As a result, a hook function cannot straightforwardly alter the value of\n\ |
|
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
3844 these variables. See the Emacs Lisp manual for a way of\n\ |
|
7455
35657813817c
(Frename_buffer): Reject empty string as new name.
Richard M. Stallman <rms@gnu.org>
parents:
7434
diff
changeset
|
3845 accomplishing an equivalent result by using other variables."); |
|
7434
7b5d67590d57
(Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents:
7295
diff
changeset
|
3846 |
|
6785
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3847 Vafter_change_functions = Qnil; |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
3848 |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
3849 DEFVAR_LISP ("first-change-hook", &Vfirst_change_hook, |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
3850 "A list of functions to call before changing a buffer which is unmodified.\n\ |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
3851 The functions are run using the `run-hooks' function."); |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
3852 Vfirst_change_hook = Qnil; |
| 333 | 3853 |
|
4226
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
3854 #if 0 /* The doc string is too long for some compilers, |
|
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
3855 but make-docfile can find it in this comment. */ |
| 1041 | 3856 DEFVAR_PER_BUFFER ("buffer-undo-list", ¤t_buffer->undo_list, Qnil, |
| 333 | 3857 "List of undo entries in current buffer.\n\ |
| 3858 Recent changes come first; older changes follow newer.\n\ | |
| 3859 \n\ | |
| 12101 | 3860 An entry (BEG . END) represents an insertion which begins at\n\ |
| 3861 position BEG and ends at position END.\n\ | |
| 333 | 3862 \n\ |
| 3863 An entry (TEXT . POSITION) represents the deletion of the string TEXT\n\ | |
| 3864 from (abs POSITION). If POSITION is positive, point was at the front\n\ | |
| 3865 of the text being deleted; if negative, point was at the end.\n\ | |
| 3866 \n\ | |
|
10365
3a50d7d3ae47
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10314
diff
changeset
|
3867 An entry (t HIGH . LOW) indicates that the buffer previously had\n\ |
|
3a50d7d3ae47
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10314
diff
changeset
|
3868 \"unmodified\" status. HIGH and LOW are the high and low 16-bit portions\n\ |
|
3a50d7d3ae47
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10314
diff
changeset
|
3869 of the visited file's modification time, as of that time. If the\n\ |
|
3a50d7d3ae47
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10314
diff
changeset
|
3870 modification time of the most recent save is different, this entry is\n\ |
| 333 | 3871 obsolete.\n\ |
| 3872 \n\ | |
|
10365
3a50d7d3ae47
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10314
diff
changeset
|
3873 An entry (nil PROPERTY VALUE BEG . END) indicates that a text property\n\ |
|
3a50d7d3ae47
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10314
diff
changeset
|
3874 was modified between BEG and END. PROPERTY is the property name,\n\ |
|
3a50d7d3ae47
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10314
diff
changeset
|
3875 and VALUE is the old value.\n\ |
|
1952
b0ec61f76511
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
1909
diff
changeset
|
3876 \n\ |
|
14481
9785f1180901
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14396
diff
changeset
|
3877 An entry (MARKER . DISTANCE) indicates that the marker MARKER\n\ |
|
9785f1180901
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14396
diff
changeset
|
3878 was adjusted in position by the offset DISTANCE (an integer).\n\ |
|
9785f1180901
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
14396
diff
changeset
|
3879 \n\ |
|
1985
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
3880 An entry of the form POSITION indicates that point was at the buffer\n\ |
|
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
3881 location given by the integer. Undoing an entry of this form places\n\ |
|
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
3882 point at POSITION.\n\ |
|
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
3883 \n\ |
| 333 | 3884 nil marks undo boundaries. The undo command treats the changes\n\ |
| 3885 between two undo boundaries as a single step to be undone.\n\ | |
| 3886 \n\ | |
|
1985
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
3887 If the value of the variable is t, undo information is not recorded."); |
|
4226
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
3888 #endif |
|
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
3889 DEFVAR_PER_BUFFER ("buffer-undo-list", ¤t_buffer->undo_list, Qnil, |
|
6348
f5a437637850
(buffer-display-table, buffer-undo-list): Delete docstring of second version
Karl Heuer <kwzh@gnu.org>
parents:
6205
diff
changeset
|
3890 0); |
| 333 | 3891 |
|
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
3892 DEFVAR_PER_BUFFER ("mark-active", ¤t_buffer->mark_active, Qnil, |
|
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
3893 "Non-nil means the mark and region are currently active in this buffer.\n\ |
|
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
3894 Automatically local in all buffers."); |
|
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
3895 |
|
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
3896 DEFVAR_PER_BUFFER ("cache-long-line-scans", ¤t_buffer->cache_long_line_scans, Qnil, |
|
9419
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3897 "Non-nil means that Emacs should use caches to handle long lines more quickly.\n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3898 This variable is buffer-local, in all buffers.\n\ |
|
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
3899 \n\ |
|
9419
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3900 Normally, the line-motion functions work by scanning the buffer for\n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3901 newlines. Columnar operations (like move-to-column and\n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3902 compute-motion) also work by scanning the buffer, summing character\n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3903 widths as they go. This works well for ordinary text, but if the\n\ |
|
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
3904 buffer's lines are very long (say, more than 500 characters), these\n\ |
|
9419
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3905 motion functions will take longer to execute. Emacs may also take\n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3906 longer to update the display.\n\ |
|
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
3907 \n\ |
|
9419
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3908 If cache-long-line-scans is non-nil, these motion functions cache the\n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3909 results of their scans, and consult the cache to avoid rescanning\n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3910 regions of the buffer until the text is modified. The caches are most\n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3911 beneficial when they prevent the most searching---that is, when the\n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3912 buffer contains long lines and large regions of characters with the\n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3913 same, fixed screen width.\n\ |
|
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
3914 \n\ |
|
9419
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3915 When cache-long-line-scans is non-nil, processing short lines will\n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3916 become slightly slower (because of the overhead of consulting the\n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3917 cache), and the caches will use memory roughly proportional to the\n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3918 number of newlines and characters whose screen width varies.\n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3919 \n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3920 The caches require no explicit maintenance; their accuracy is\n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3921 maintained internally by the Emacs primitives. Enabling or disabling\n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3922 the cache should not affect the behavior of any of the motion\n\ |
|
b429144f6ace
(syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents:
9403
diff
changeset
|
3923 functions; it should only affect their performance."); |
|
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
3924 |
|
10561
53f34c870201
(init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
10505
diff
changeset
|
3925 DEFVAR_PER_BUFFER ("point-before-scroll", ¤t_buffer->point_before_scroll, Qnil, |
|
53f34c870201
(init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
10505
diff
changeset
|
3926 "Value of point before the last series of scroll operations, or nil."); |
|
53f34c870201
(init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
10505
diff
changeset
|
3927 |
|
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
|
3928 DEFVAR_PER_BUFFER ("buffer-file-format", ¤t_buffer->file_format, Qnil, |
|
35664a2851e7
(reset_buffer): Reset file_format element too.(init_buffer_once): Define file_format flag; reset file_format.
Boris Goldowsky <boris@gnu.org>
parents:
11000
diff
changeset
|
3929 "List of formats to use when saving this buffer.\n\ |
|
35664a2851e7
(reset_buffer): Reset file_format element too.(init_buffer_once): Define file_format flag; reset file_format.
Boris Goldowsky <boris@gnu.org>
parents:
11000
diff
changeset
|
3930 Formats are defined by `format-alist'. This variable is\n\ |
|
35664a2851e7
(reset_buffer): Reset file_format element too.(init_buffer_once): Define file_format flag; reset file_format.
Boris Goldowsky <boris@gnu.org>
parents:
11000
diff
changeset
|
3931 set when a file is visited. Automatically local in all buffers."); |
|
35664a2851e7
(reset_buffer): Reset file_format element too.(init_buffer_once): Define file_format flag; reset file_format.
Boris Goldowsky <boris@gnu.org>
parents:
11000
diff
changeset
|
3932 |
|
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
3933 DEFVAR_PER_BUFFER ("buffer-invisibility-spec", |
|
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
3934 ¤t_buffer->invisibility_spec, Qnil, |
|
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
3935 "Invisibility spec of this buffer.\n\ |
|
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
3936 The default is t, which means that text is invisible\n\ |
|
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
3937 if it has a non-nil `invisible' property.\n\ |
|
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
3938 If the value is a list, a text character is invisible if its `invisible'\n\ |
|
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
3939 property is an element in that list.\n\ |
| 11112 | 3940 If an element is a cons cell of the form (PROP . ELLIPSIS),\n\ |
| 3941 then characters with property value PROP are invisible,\n\ | |
|
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
3942 and they have an ellipsis as well if ELLIPSIS is non-nil."); |
|
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
3943 |
|
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
3944 DEFVAR_LISP ("transient-mark-mode", &Vtransient_mark_mode, |
|
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
3945 "*Non-nil means deactivate the mark when the buffer contents change."); |
|
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
3946 Vtransient_mark_mode = Qnil; |
|
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
3947 |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3948 DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only, |
|
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
3949 "*Non-nil means disregard read-only status of buffers or characters.\n\ |
|
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
3950 If the value is t, disregard `buffer-read-only' and all `read-only'\n\ |
|
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
3951 text properties. If the value is a list, disregard `buffer-read-only'\n\ |
|
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
3952 and disregard a `read-only' text property if the property value\n\ |
|
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
3953 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
|
3954 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
|
3955 |
|
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
3956 DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions, |
|
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
3957 "List of functions called with no args to query before killing a buffer."); |
|
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
3958 Vkill_buffer_query_functions = Qnil; |
|
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
3959 |
|
14506
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
3960 defsubr (&Sbuffer_live_p); |
| 333 | 3961 defsubr (&Sbuffer_list); |
| 3962 defsubr (&Sget_buffer); | |
| 3963 defsubr (&Sget_file_buffer); | |
| 3964 defsubr (&Sget_buffer_create); | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
3965 defsubr (&Smake_indirect_buffer); |
| 392 | 3966 defsubr (&Sgenerate_new_buffer_name); |
| 333 | 3967 defsubr (&Sbuffer_name); |
| 3968 /*defsubr (&Sbuffer_number);*/ | |
| 3969 defsubr (&Sbuffer_file_name); | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
3970 defsubr (&Sbuffer_base_buffer); |
| 333 | 3971 defsubr (&Sbuffer_local_variables); |
| 3972 defsubr (&Sbuffer_modified_p); | |
| 3973 defsubr (&Sset_buffer_modified_p); | |
| 3974 defsubr (&Sbuffer_modified_tick); | |
| 3975 defsubr (&Srename_buffer); | |
| 3976 defsubr (&Sother_buffer); | |
| 3977 defsubr (&Sbuffer_disable_undo); | |
| 3978 defsubr (&Sbuffer_enable_undo); | |
| 3979 defsubr (&Skill_buffer); | |
| 3980 defsubr (&Serase_buffer); | |
|
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
3981 defsubr (&Sset_buffer_major_mode); |
| 333 | 3982 defsubr (&Sswitch_to_buffer); |
| 3983 defsubr (&Spop_to_buffer); | |
| 3984 defsubr (&Scurrent_buffer); | |
| 3985 defsubr (&Sset_buffer); | |
| 3986 defsubr (&Sbarf_if_buffer_read_only); | |
| 3987 defsubr (&Sbury_buffer); | |
| 3988 defsubr (&Skill_all_local_variables); | |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3989 |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3990 defsubr (&Soverlayp); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3991 defsubr (&Smake_overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3992 defsubr (&Sdelete_overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3993 defsubr (&Smove_overlay); |
|
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3994 defsubr (&Soverlay_start); |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3995 defsubr (&Soverlay_end); |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3996 defsubr (&Soverlay_buffer); |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3997 defsubr (&Soverlay_properties); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3998 defsubr (&Soverlays_at); |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3999 defsubr (&Soverlays_in); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4000 defsubr (&Snext_overlay_change); |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4001 defsubr (&Sprevious_overlay_change); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4002 defsubr (&Soverlay_recenter); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4003 defsubr (&Soverlay_lists); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4004 defsubr (&Soverlay_get); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4005 defsubr (&Soverlay_put); |
| 333 | 4006 } |
| 4007 | |
| 4008 keys_of_buffer () | |
| 4009 { | |
| 4010 initial_define_key (control_x_map, 'b', "switch-to-buffer"); | |
| 4011 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
|
4012 |
|
2c5f3537a1cc
(syms_of_buffer): Don't do (put 'erase-buffer 'disabled t) here.
Roland McGrath <roland@gnu.org>
parents:
5502
diff
changeset
|
4013 /* 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
|
4014 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
|
4015 Fput (intern ("erase-buffer"), Qdisabled, Qt); |
| 333 | 4016 } |
