Mercurial > emacs
annotate src/buffer.c @ 104425:4d608806c00b
cedet/semantic/symref/idutils.el: Fix require statement.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sat, 29 Aug 2009 22:14:05 +0000 |
parents | 52ff955e0cc5 |
children | e5f506a6a59d |
rev | line source |
---|---|
333 | 1 /* Buffer manipulation primitives for GNU Emacs. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64572
diff
changeset
|
2 Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, |
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64572
diff
changeset
|
3 1995, 1997, 1998, 1999, 2000, 2001, 2002, |
100951 | 4 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
79759 | 5 Free Software Foundation, Inc. |
333 | 6 |
7 This file is part of GNU Emacs. | |
8 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94249
diff
changeset
|
9 GNU Emacs is free software: you can redistribute it and/or modify |
333 | 10 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94249
diff
changeset
|
11 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94249
diff
changeset
|
12 (at your option) any later version. |
333 | 13 |
14 GNU Emacs is distributed in the hope that it will be useful, | |
15 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 GNU General Public License for more details. | |
18 | |
19 You should have received a copy of the GNU General Public License | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94249
diff
changeset
|
20 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
333 | 21 |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26056
diff
changeset
|
22 #include <config.h> |
333 | 23 |
1563
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
24 #include <sys/types.h> |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
25 #include <sys/stat.h> |
333 | 26 #include <sys/param.h> |
19581 | 27 #include <errno.h> |
31886 | 28 #include <stdio.h> |
19581 | 29 |
31102
6a0caa788013
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30911
diff
changeset
|
30 #ifndef USE_CRT_DLL |
19581 | 31 extern int errno; |
31102
6a0caa788013
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30911
diff
changeset
|
32 #endif |
333 | 33 |
34 | |
21514 | 35 #ifdef HAVE_UNISTD_H |
36 #include <unistd.h> | |
37 #endif | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
38 |
333 | 39 #include "lisp.h" |
1308
2660a7053836
* buffer.c: #include intervals.h.
Joseph Arceneaux <jla@gnu.org>
parents:
1291
diff
changeset
|
40 #include "intervals.h" |
333 | 41 #include "window.h" |
42 #include "commands.h" | |
43 #include "buffer.h" | |
88354
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
44 #include "character.h" |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
45 #include "region-cache.h" |
333 | 46 #include "indent.h" |
2480 | 47 #include "blockinput.h" |
31102
6a0caa788013
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30911
diff
changeset
|
48 #include "keyboard.h" |
39748
42b7a798ff79
Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39581
diff
changeset
|
49 #include "keymap.h" |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
50 #include "frame.h" |
333 | 51 |
52 struct buffer *current_buffer; /* the current buffer */ | |
53 | |
54 /* First buffer in chain of all buffers (in reverse order of creation). | |
55 Threaded through ->next. */ | |
56 | |
57 struct buffer *all_buffers; | |
58 | |
59 /* This structure holds the default values of the buffer-local variables | |
60 defined with DEFVAR_PER_BUFFER, that have special slots in each buffer. | |
61 The default value occupies the same slot in this structure | |
62 as an individual buffer's value occupies in that buffer. | |
63 Setting the default value also goes through the alist of buffers | |
64 and stores into each buffer that does not say it has a local value. */ | |
65 | |
53655
4f64423a6040
(buffer_defaults, buffer_local_symbols): Use DECL_ALIGN.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53602
diff
changeset
|
66 DECL_ALIGN (struct buffer, buffer_defaults); |
333 | 67 |
68 /* A Lisp_Object pointer to the above, used for staticpro */ | |
69 | |
70 static Lisp_Object Vbuffer_defaults; | |
71 | |
72 /* This structure marks which slots in a buffer have corresponding | |
73 default values in buffer_defaults. | |
74 Each such slot has a nonzero value in this structure. | |
75 The value has only one nonzero bit. | |
76 | |
77 When a buffer has its own local value for a slot, | |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
78 the entry for that slot (found in the same slot in this structure) |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
79 is turned on in the buffer's local_flags array. |
333 | 80 |
81 If a slot in this structure is -1, then even though there may | |
82 be a DEFVAR_PER_BUFFER for the slot, there is no default value for it; | |
83 and the corresponding slot in buffer_defaults is not used. | |
84 | |
85 If a slot is -2, then there is no DEFVAR_PER_BUFFER for it, | |
86 but there is a default value which is copied into each buffer. | |
87 | |
88 If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is | |
89 zero, that is a bug */ | |
90 | |
91 struct buffer buffer_local_flags; | |
92 | |
93 /* This structure holds the names of symbols whose values may be | |
94 buffer-local. It is indexed and accessed in the same way as the above. */ | |
95 | |
53655
4f64423a6040
(buffer_defaults, buffer_local_symbols): Use DECL_ALIGN.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53602
diff
changeset
|
96 DECL_ALIGN (struct buffer, buffer_local_symbols); |
4f64423a6040
(buffer_defaults, buffer_local_symbols): Use DECL_ALIGN.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53602
diff
changeset
|
97 |
333 | 98 /* A Lisp_Object pointer to the above, used for staticpro */ |
99 static Lisp_Object Vbuffer_local_symbols; | |
100 | |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
101 /* Flags indicating which built-in buffer-local variables |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
102 are permanent locals. */ |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
103 static char buffer_permanent_local_flags[MAX_PER_BUFFER_VARS]; |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
104 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
105 /* Number of per-buffer variables used. */ |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
106 |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
107 int last_per_buffer_idx; |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
108 |
87218
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
109 EXFUN (Fset_buffer, 1); |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
110 void set_buffer_internal P_ ((struct buffer *b)); |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
111 void set_buffer_internal_1 P_ ((struct buffer *b)); |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
112 static void call_overlay_mod_hooks P_ ((Lisp_Object list, Lisp_Object overlay, |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
113 int after, Lisp_Object arg1, |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
114 Lisp_Object arg2, Lisp_Object arg3)); |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
115 static void swap_out_buffer_local_variables P_ ((struct buffer *b)); |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
116 static void reset_buffer_local_variables P_ ((struct buffer *b, int permanent_too)); |
333 | 117 |
118 /* Alist of all buffer names vs the buffers. */ | |
119 /* This used to be a variable, but is no longer, | |
120 to prevent lossage due to user rplac'ing this alist or its elements. */ | |
121 Lisp_Object Vbuffer_alist; | |
122 | |
123 /* Functions to call before and after each text change. */ | |
6785
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
124 Lisp_Object Vbefore_change_functions; |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
125 Lisp_Object Vafter_change_functions; |
333 | 126 |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
127 Lisp_Object Vtransient_mark_mode; |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
128 |
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
129 /* 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
|
130 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
|
131 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
|
132 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
|
133 |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
134 /* 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
|
135 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
|
136 Lisp_Object Vkill_buffer_query_functions; |
50014
3b2576528809
(Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents:
49974
diff
changeset
|
137 Lisp_Object Qkill_buffer_query_functions; |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
138 |
72299
e97bfa736263
* buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents:
71968
diff
changeset
|
139 /* Hook run before changing a major mode. */ |
e97bfa736263
* buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents:
71968
diff
changeset
|
140 Lisp_Object Vchange_major_mode_hook, Qchange_major_mode_hook; |
e97bfa736263
* buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents:
71968
diff
changeset
|
141 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
142 /* 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
|
143 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
|
144 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
145 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
|
146 Lisp_Object Qbefore_change_functions; |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
147 Lisp_Object Qafter_change_functions; |
48635 | 148 Lisp_Object Qucs_set_table_for_input; |
333 | 149 |
23399
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
150 /* If nonzero, all modification hooks are suppressed. */ |
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
151 int inhibit_modification_hooks; |
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
152 |
333 | 153 Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; |
87977
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
154 Lisp_Object Qpermanent_local_hook; |
333 | 155 |
156 Lisp_Object Qprotected_field; | |
157 | |
158 Lisp_Object QSFundamental; /* A string "Fundamental" */ | |
159 | |
160 Lisp_Object Qkill_buffer_hook; | |
161 | |
5433 | 162 Lisp_Object Qget_file_buffer; |
163 | |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
164 Lisp_Object Qoverlayp; |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
165 |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
166 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
|
167 |
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
168 Lisp_Object Qmodification_hooks; |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
169 Lisp_Object Qinsert_in_front_hooks; |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
170 Lisp_Object Qinsert_behind_hooks; |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
171 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
172 static void alloc_buffer_text P_ ((struct buffer *, size_t)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
173 static void free_buffer_text P_ ((struct buffer *b)); |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
174 static struct Lisp_Overlay * copy_overlays P_ ((struct buffer *, struct Lisp_Overlay *)); |
51867
6713947da36f
(modify_overlay): Update prototype.
Andreas Schwab <schwab@suse.de>
parents:
51853
diff
changeset
|
175 static void modify_overlay P_ ((struct buffer *, EMACS_INT, EMACS_INT)); |
60683
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
176 static Lisp_Object buffer_lisp_local_variables P_ ((struct buffer *)); |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
177 |
88547 | 178 extern char * emacs_strerror P_ ((int)); |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
179 |
333 | 180 /* For debugging; temporary. See set_buffer_internal. */ |
181 /* Lisp_Object Qlisp_mode, Vcheck_symbol; */ | |
182 | |
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
183 void |
333 | 184 nsberror (spec) |
185 Lisp_Object spec; | |
186 { | |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
187 if (STRINGP (spec)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
188 error ("No buffer named %s", SDATA (spec)); |
333 | 189 error ("Invalid buffer argument"); |
190 } | |
191 | |
14506
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
192 DEFUN ("buffer-live-p", Fbuffer_live_p, Sbuffer_live_p, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
193 doc: /* Return non-nil if OBJECT is a buffer which has not been killed. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
194 Value is nil if OBJECT is not a buffer or if it has been killed. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
195 (object) |
14506
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
196 Lisp_Object object; |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
197 { |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
198 return ((BUFFERP (object) && ! NILP (XBUFFER (object)->name)) |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
199 ? Qt : Qnil); |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
200 } |
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
201 |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
202 DEFUN ("buffer-list", Fbuffer_list, Sbuffer_list, 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
203 doc: /* Return a list of all existing live buffers. |
46599
44651cb24a24
(Fbuffer_list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
46588
diff
changeset
|
204 If the optional arg FRAME is a frame, we return the buffer list |
44651cb24a24
(Fbuffer_list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
46588
diff
changeset
|
205 in the proper order for that frame: the buffers in FRAME's `buffer-list' |
44651cb24a24
(Fbuffer_list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
46588
diff
changeset
|
206 frame parameter come first, followed by the rest of the buffers. */) |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
207 (frame) |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
208 Lisp_Object frame; |
333 | 209 { |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
210 Lisp_Object general; |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
211 general = Fmapcar (Qcdr, Vbuffer_alist); |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
212 |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
213 if (FRAMEP (frame)) |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
214 { |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
215 Lisp_Object framelist, prevlist, tail; |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
216 Lisp_Object args[3]; |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
217 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
218 CHECK_FRAME (frame); |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
219 |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
220 framelist = Fcopy_sequence (XFRAME (frame)->buffer_list); |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
221 prevlist = Fnreverse (Fcopy_sequence (XFRAME (frame)->buried_buffer_list)); |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
222 |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
223 /* Remove from GENERAL any buffer that duplicates one in |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
224 FRAMELIST or PREVLIST. */ |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
225 tail = framelist; |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
226 while (CONSP (tail)) |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
227 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
228 general = Fdelq (XCAR (tail), general); |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
229 tail = XCDR (tail); |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
230 } |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
231 tail = prevlist; |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
232 while (CONSP (tail)) |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
233 { |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
234 general = Fdelq (XCAR (tail), general); |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
235 tail = XCDR (tail); |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
236 } |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
237 |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
238 args[0] = framelist; |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
239 args[1] = general; |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
240 args[2] = prevlist; |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
241 return Fnconc (3, args); |
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
242 } |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
243 |
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
244 return general; |
333 | 245 } |
246 | |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
247 /* 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
|
248 (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
|
249 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
|
250 |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
251 static Lisp_Object |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
252 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
|
253 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
|
254 Lisp_Object list; |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
255 { |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
256 register Lisp_Object tail; |
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
257 for (tail = list; CONSP (tail); tail = XCDR (tail)) |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
258 { |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
259 register Lisp_Object elt, tem; |
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
260 elt = XCAR (tail); |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
261 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
|
262 if (!NILP (tem)) |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
263 return elt; |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
264 } |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
265 return Qnil; |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
266 } |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
267 |
333 | 268 DEFUN ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0, |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
269 doc: /* Return the buffer named BUFFER-OR-NAME. |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
270 BUFFER-OR-NAME must be either a string or a buffer. If BUFFER-OR-NAME |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
271 is a string and there is no buffer with that name, return nil. If |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
272 BUFFER-OR-NAME is a buffer, return it as given. */) |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
273 (buffer_or_name) |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
274 register Lisp_Object buffer_or_name; |
333 | 275 { |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
276 if (BUFFERP (buffer_or_name)) |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
277 return buffer_or_name; |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
278 CHECK_STRING (buffer_or_name); |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
279 |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
280 return Fcdr (assoc_ignore_text_properties (buffer_or_name, Vbuffer_alist)); |
333 | 281 } |
282 | |
283 DEFUN ("get-file-buffer", Fget_file_buffer, Sget_file_buffer, 1, 1, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
284 doc: /* Return the buffer visiting file FILENAME (a string). |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
285 The buffer's `buffer-file-name' must match exactly the expansion of FILENAME. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
286 If there is no such live buffer, return nil. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
287 See also `find-buffer-visiting'. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
288 (filename) |
333 | 289 register Lisp_Object filename; |
290 { | |
291 register Lisp_Object tail, buf, tem; | |
5433 | 292 Lisp_Object handler; |
293 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
294 CHECK_STRING (filename); |
333 | 295 filename = Fexpand_file_name (filename, Qnil); |
296 | |
5433 | 297 /* If the file name has special constructs in it, |
298 call the corresponding file handler. */ | |
7028
6915bf781a38
Pass operation to Ffind_file_name_handler.
Karl Heuer <kwzh@gnu.org>
parents:
6785
diff
changeset
|
299 handler = Ffind_file_name_handler (filename, Qget_file_buffer); |
5433 | 300 if (!NILP (handler)) |
301 return call2 (handler, Qget_file_buffer, filename); | |
302 | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
303 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
333 | 304 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
305 buf = Fcdr (XCAR (tail)); |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
306 if (!BUFFERP (buf)) continue; |
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
307 if (!STRINGP (XBUFFER (buf)->filename)) continue; |
333 | 308 tem = Fstring_equal (XBUFFER (buf)->filename, filename); |
485 | 309 if (!NILP (tem)) |
333 | 310 return buf; |
311 } | |
312 return Qnil; | |
313 } | |
314 | |
12810
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
315 Lisp_Object |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
316 get_truename_buffer (filename) |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
317 register Lisp_Object filename; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
318 { |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
319 register Lisp_Object tail, buf, tem; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
320 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
321 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
12810
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
322 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
323 buf = Fcdr (XCAR (tail)); |
12810
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
324 if (!BUFFERP (buf)) continue; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
325 if (!STRINGP (XBUFFER (buf)->file_truename)) continue; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
326 tem = Fstring_equal (XBUFFER (buf)->file_truename, filename); |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
327 if (!NILP (tem)) |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
328 return buf; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
329 } |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
330 return Qnil; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
331 } |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
332 |
333 | 333 /* Incremented for each buffer created, to assign the buffer number. */ |
334 int buffer_count; | |
335 | |
336 DEFUN ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0, | |
99080
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
337 doc: /* Return the buffer specified by BUFFER-OR-NAME, creating a new one if needed. |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
338 If BUFFER-OR-NAME is a string and a live buffer with that name exists, |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
339 return that buffer. If no such buffer exists, create a new buffer with |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
340 that name and return it. If BUFFER-OR-NAME starts with a space, the new |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
341 buffer does not keep undo information. |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
342 |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
343 If BUFFER-OR-NAME is a buffer instead of a string, return it as given, |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
344 even if it is dead. The return value is never nil. */) |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
345 (buffer_or_name) |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
346 register Lisp_Object buffer_or_name; |
333 | 347 { |
99080
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
348 register Lisp_Object buffer, name; |
333 | 349 register struct buffer *b; |
350 | |
99080
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
351 buffer = Fget_buffer (buffer_or_name); |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
352 if (!NILP (buffer)) |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
353 return buffer; |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
354 |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
355 if (SCHARS (buffer_or_name) == 0) |
6697
28e36f59e856
(Fget_buffer_create): Disallow empty string.
Karl Heuer <kwzh@gnu.org>
parents:
6675
diff
changeset
|
356 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
|
357 |
86561
13041217da4b
(Fget_buffer_create, Fmake_indirect_buffer): Don't cast redundantly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86285
diff
changeset
|
358 b = allocate_buffer (); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
359 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
360 /* 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
|
361 b->text = &b->own_text; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
362 b->base_buffer = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
363 |
333 | 364 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
|
365 BLOCK_INPUT; |
17022 | 366 /* We allocate extra 1-byte at the tail and keep it always '\0' for |
367 anchoring a search. */ | |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
368 alloc_buffer_text (b, BUF_GAP_SIZE (b) + 1); |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
369 UNBLOCK_INPUT; |
333 | 370 if (! BUF_BEG_ADDR (b)) |
10668
acbd9fab366a
(Fget_buffer_create): Call buffer_memory_full.
Richard M. Stallman <rms@gnu.org>
parents:
10611
diff
changeset
|
371 buffer_memory_full (); |
333 | 372 |
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
373 BUF_PT (b) = BEG; |
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
374 BUF_GPT (b) = BEG; |
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
375 BUF_BEGV (b) = BEG; |
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
376 BUF_ZV (b) = BEG; |
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
377 BUF_Z (b) = BEG; |
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
378 BUF_PT_BYTE (b) = BEG_BYTE; |
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
379 BUF_GPT_BYTE (b) = BEG_BYTE; |
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
380 BUF_BEGV_BYTE (b) = BEG_BYTE; |
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
381 BUF_ZV_BYTE (b) = BEG_BYTE; |
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
382 BUF_Z_BYTE (b) = BEG_BYTE; |
333 | 383 BUF_MODIFF (b) = 1; |
72592
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
384 BUF_CHARS_MODIFF (b) = 1; |
16213
3b8851bebc76
(Fget_buffer_create): Initialize BUF_OVERLAY_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents:
16193
diff
changeset
|
385 BUF_OVERLAY_MODIFF (b) = 1; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
386 BUF_SAVE_MODIFF (b) = 1; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
387 BUF_INTERVALS (b) = 0; |
25368
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
388 BUF_UNCHANGED_MODIFIED (b) = 1; |
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
389 BUF_OVERLAY_UNCHANGED_MODIFIED (b) = 1; |
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
390 BUF_END_UNCHANGED (b) = 0; |
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
391 BUF_BEG_UNCHANGED (b) = 0; |
17022 | 392 *(BUF_GPT_ADDR (b)) = *(BUF_Z_ADDR (b)) = 0; /* Put an anchor '\0'. */ |
333 | 393 |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
394 b->newline_cache = 0; |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
395 b->width_run_cache = 0; |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
396 b->width_table = Qnil; |
25368
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
397 b->prevent_redisplay_optimizations_p = 1; |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
398 |
333 | 399 /* Put this on the chain of all buffers including killed ones. */ |
400 b->next = all_buffers; | |
401 all_buffers = b; | |
402 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
403 /* An ordinary buffer normally doesn't need markers |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
404 to handle BEGV and ZV. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
405 b->pt_marker = Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
406 b->begv_marker = Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
407 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
|
408 |
99080
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
409 name = Fcopy_sequence (buffer_or_name); |
46378
ef7dc46ecd0b
* buffer.c (Fget_buffer_create, Fmake_indirect_buffer): Use it.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
410 STRING_SET_INTERVALS (name, NULL_INTERVAL); |
333 | 411 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
|
412 |
85328
d0d527210b0c
* lisp.h (enum Lisp_Misc_Type): Del Lisp_Misc_Some_Buffer_Local_Value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85296
diff
changeset
|
413 b->undo_list = (SREF (name, 0) != ' ') ? Qnil : Qt; |
333 | 414 |
415 reset_buffer (b); | |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
416 reset_buffer_local_variables (b, 1); |
333 | 417 |
48776
67a496befc04
(Fget_buffer_create): Call Qucs_set_table_for_input as the last thing.
Richard M. Stallman <rms@gnu.org>
parents:
48635
diff
changeset
|
418 b->mark = Fmake_marker (); |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
419 BUF_MARKERS (b) = NULL; |
48776
67a496befc04
(Fget_buffer_create): Call Qucs_set_table_for_input as the last thing.
Richard M. Stallman <rms@gnu.org>
parents:
48635
diff
changeset
|
420 b->name = name; |
67a496befc04
(Fget_buffer_create): Call Qucs_set_table_for_input as the last thing.
Richard M. Stallman <rms@gnu.org>
parents:
48635
diff
changeset
|
421 |
333 | 422 /* Put this in the alist of all live buffers. */ |
99080
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
423 XSETBUFFER (buffer, b); |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
424 Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buffer), Qnil)); |
333 | 425 |
75784 | 426 /* An error in calling the function here (should someone redefine it) |
51318 | 427 can lead to infinite regress until you run out of stack. rms |
428 says that's not worth protecting against. */ | |
48635 | 429 if (!NILP (Ffboundp (Qucs_set_table_for_input))) |
99080
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
430 /* buffer is on buffer-alist, so no gcpro. */ |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
431 call1 (Qucs_set_table_for_input, buffer); |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
432 |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
433 return buffer; |
333 | 434 } |
435 | |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
436 |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
437 /* Return a list of overlays which is a copy of the overlay list |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
438 LIST, but for buffer B. */ |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
439 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
440 static struct Lisp_Overlay * |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
441 copy_overlays (b, list) |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
442 struct buffer *b; |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
443 struct Lisp_Overlay *list; |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
444 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
445 Lisp_Object buffer; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
446 struct Lisp_Overlay *result = NULL, *tail = NULL; |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
447 |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
448 XSETBUFFER (buffer, b); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
449 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
450 for (; list; list = list->next) |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
451 { |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
452 Lisp_Object overlay, start, end, old_overlay; |
51939
d38453fdf2a0
(copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51867
diff
changeset
|
453 EMACS_INT charpos; |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
454 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
455 XSETMISC (old_overlay, list); |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
456 charpos = marker_position (OVERLAY_START (old_overlay)); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
457 start = Fmake_marker (); |
37950
f01f454ea6bf
(copy_overlays): Make ENABLE_CHECKING happy.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37752
diff
changeset
|
458 Fset_marker (start, make_number (charpos), buffer); |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
459 XMARKER (start)->insertion_type |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
460 = XMARKER (OVERLAY_START (old_overlay))->insertion_type; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
461 |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
462 charpos = marker_position (OVERLAY_END (old_overlay)); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
463 end = Fmake_marker (); |
37950
f01f454ea6bf
(copy_overlays): Make ENABLE_CHECKING happy.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37752
diff
changeset
|
464 Fset_marker (end, make_number (charpos), buffer); |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
465 XMARKER (end)->insertion_type |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
466 = XMARKER (OVERLAY_END (old_overlay))->insertion_type; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
467 |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
468 overlay = allocate_misc (); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
469 XMISCTYPE (overlay) = Lisp_Misc_Overlay; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
470 OVERLAY_START (overlay) = start; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
471 OVERLAY_END (overlay) = end; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
472 OVERLAY_PLIST (overlay) = Fcopy_sequence (OVERLAY_PLIST (old_overlay)); |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
473 XOVERLAY (overlay)->next = NULL; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
474 |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
475 if (tail) |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
476 tail = tail->next = XOVERLAY (overlay); |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
477 else |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
478 result = tail = XOVERLAY (overlay); |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
479 } |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
480 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
481 return result; |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
482 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
483 |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
484 |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
485 /* Clone per-buffer values of buffer FROM. |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
486 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
487 Buffer TO gets the same per-buffer values as FROM, with the |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
488 following exceptions: (1) TO's name is left untouched, (2) markers |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
489 are copied and made to refer to TO, and (3) overlay lists are |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
490 copied. */ |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
491 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
492 static void |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
493 clone_per_buffer_values (from, to) |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
494 struct buffer *from, *to; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
495 { |
66233
e93aafd2c52b
(clone_per_buffer_values): Remove unused var tem.
Kim F. Storm <storm@cua.dk>
parents:
66043
diff
changeset
|
496 Lisp_Object to_buffer; |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
497 int offset; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
498 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
499 XSETBUFFER (to_buffer, to); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
500 |
91781
a6047ef14f4c
(clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91711
diff
changeset
|
501 /* buffer-local Lisp variables start at `undo_list', |
a6047ef14f4c
(clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91711
diff
changeset
|
502 tho only the ones from `name' on are GC'd normally. */ |
95826
54e76878a8c0
(clone_per_buffer_values): Skip `name'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
503 for (offset = PER_BUFFER_VAR_OFFSET (undo_list); |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
504 offset < sizeof *to; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
505 offset += sizeof (Lisp_Object)) |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
506 { |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
507 Lisp_Object obj; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
508 |
95826
54e76878a8c0
(clone_per_buffer_values): Skip `name'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
509 /* Don't touch the `name' which should be unique for every buffer. */ |
54e76878a8c0
(clone_per_buffer_values): Skip `name'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
510 if (offset == PER_BUFFER_VAR_OFFSET (name)) |
54e76878a8c0
(clone_per_buffer_values): Skip `name'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
511 continue; |
54e76878a8c0
(clone_per_buffer_values): Skip `name'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
512 |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
513 obj = PER_BUFFER_VALUE (from, offset); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
514 if (MARKERP (obj)) |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
515 { |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
516 struct Lisp_Marker *m = XMARKER (obj); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
517 obj = Fmake_marker (); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
518 XMARKER (obj)->insertion_type = m->insertion_type; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
519 set_marker_both (obj, to_buffer, m->charpos, m->bytepos); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
520 } |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
521 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
522 PER_BUFFER_VALUE (to, offset) = obj; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
523 } |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
524 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
525 bcopy (from->local_flags, to->local_flags, sizeof to->local_flags); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
526 |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
527 to->overlays_before = copy_overlays (to, from->overlays_before); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
528 to->overlays_after = copy_overlays (to, from->overlays_after); |
55744
dc4797dbcccd
(clone_per_buffer_values): Copy the alist of local vars,
Richard M. Stallman <rms@gnu.org>
parents:
55270
diff
changeset
|
529 |
60683
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
530 /* Get (a copy of) the alist of Lisp-level local variables of FROM |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
531 and install that in TO. */ |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
532 to->local_var_alist = buffer_lisp_local_variables (from); |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
533 } |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
534 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
535 DEFUN ("make-indirect-buffer", Fmake_indirect_buffer, Smake_indirect_buffer, |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
536 2, 3, |
11838
92a61e91ec05
(Fmake_indirect_buffer): Fix interactive spec.
Karl Heuer <kwzh@gnu.org>
parents:
11823
diff
changeset
|
537 "bMake indirect buffer (to buffer): \nBName of indirect buffer: ", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
538 doc: /* Create and return an indirect buffer for buffer BASE-BUFFER, named NAME. |
54834
9533e29b87e8
(Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents:
54819
diff
changeset
|
539 BASE-BUFFER should be a live buffer, or the name of an existing buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
540 NAME should be a string which is not the name of an existing buffer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
541 Optional argument CLONE non-nil means preserve BASE-BUFFER's state, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
542 such as major and minor modes, in the indirect buffer. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
543 CLONE nil means the indirect buffer's state is reset to default values. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
544 (base_buffer, name, clone) |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
545 Lisp_Object base_buffer, name, clone; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
546 { |
54834
9533e29b87e8
(Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents:
54819
diff
changeset
|
547 Lisp_Object buf, tem; |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
548 struct buffer *b; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
549 |
54819
8df5ed349fc2
(Fmake_indirect_buffer): Check that NAME is a string.
Andreas Schwab <schwab@suse.de>
parents:
54786
diff
changeset
|
550 CHECK_STRING (name); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
551 buf = Fget_buffer (name); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
552 if (!NILP (buf)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
553 error ("Buffer name `%s' is in use", SDATA (name)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
554 |
54834
9533e29b87e8
(Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents:
54819
diff
changeset
|
555 tem = base_buffer; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
556 base_buffer = Fget_buffer (base_buffer); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
557 if (NILP (base_buffer)) |
54834
9533e29b87e8
(Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents:
54819
diff
changeset
|
558 error ("No such buffer: `%s'", SDATA (tem)); |
9533e29b87e8
(Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents:
54819
diff
changeset
|
559 if (NILP (XBUFFER (base_buffer)->name)) |
9533e29b87e8
(Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents:
54819
diff
changeset
|
560 error ("Base buffer has been killed"); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
561 |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
562 if (SCHARS (name) == 0) |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
563 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
|
564 |
86561
13041217da4b
(Fget_buffer_create, Fmake_indirect_buffer): Don't cast redundantly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86285
diff
changeset
|
565 b = allocate_buffer (); |
85328
d0d527210b0c
* lisp.h (enum Lisp_Misc_Type): Del Lisp_Misc_Some_Buffer_Local_Value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85296
diff
changeset
|
566 |
d0d527210b0c
* lisp.h (enum Lisp_Misc_Type): Del Lisp_Misc_Some_Buffer_Local_Value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85296
diff
changeset
|
567 b->base_buffer = (XBUFFER (base_buffer)->base_buffer |
d0d527210b0c
* lisp.h (enum Lisp_Misc_Type): Del Lisp_Misc_Some_Buffer_Local_Value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85296
diff
changeset
|
568 ? XBUFFER (base_buffer)->base_buffer |
d0d527210b0c
* lisp.h (enum Lisp_Misc_Type): Del Lisp_Misc_Some_Buffer_Local_Value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85296
diff
changeset
|
569 : XBUFFER (base_buffer)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
570 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
571 /* Use the base buffer's text object. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
572 b->text = b->base_buffer->text; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
573 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
574 BUF_BEGV (b) = BUF_BEGV (b->base_buffer); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
575 BUF_ZV (b) = BUF_ZV (b->base_buffer); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
576 BUF_PT (b) = BUF_PT (b->base_buffer); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
577 BUF_BEGV_BYTE (b) = BUF_BEGV_BYTE (b->base_buffer); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
578 BUF_ZV_BYTE (b) = BUF_ZV_BYTE (b->base_buffer); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
579 BUF_PT_BYTE (b) = BUF_PT_BYTE (b->base_buffer); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
580 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
581 b->newline_cache = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
582 b->width_run_cache = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
583 b->width_table = Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
584 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
585 /* 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
|
586 b->next = all_buffers; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
587 all_buffers = b; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
588 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
589 name = Fcopy_sequence (name); |
46378
ef7dc46ecd0b
* buffer.c (Fget_buffer_create, Fmake_indirect_buffer): Use it.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
590 STRING_SET_INTERVALS (name, NULL_INTERVAL); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
591 b->name = name; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
592 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
593 reset_buffer (b); |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
594 reset_buffer_local_variables (b, 1); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
595 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
596 /* 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
|
597 XSETBUFFER (buf, b); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
598 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
|
599 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
600 b->mark = Fmake_marker (); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
601 b->name = name; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
602 |
24604
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
603 /* The multibyte status belongs to the base buffer. */ |
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
604 b->enable_multibyte_characters = b->base_buffer->enable_multibyte_characters; |
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
605 |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
606 /* 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
|
607 if (NILP (b->base_buffer->pt_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
608 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
609 b->base_buffer->pt_marker = Fmake_marker (); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
610 set_marker_both (b->base_buffer->pt_marker, base_buffer, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
611 BUF_PT (b->base_buffer), |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
612 BUF_PT_BYTE (b->base_buffer)); |
10314
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 (NILP (b->base_buffer->begv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
615 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
616 b->base_buffer->begv_marker = Fmake_marker (); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
617 set_marker_both (b->base_buffer->begv_marker, base_buffer, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
618 BUF_BEGV (b->base_buffer), |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
619 BUF_BEGV_BYTE (b->base_buffer)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
620 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
621 if (NILP (b->base_buffer->zv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
622 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
623 b->base_buffer->zv_marker = Fmake_marker (); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
624 set_marker_both (b->base_buffer->zv_marker, base_buffer, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
625 BUF_ZV (b->base_buffer), |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
626 BUF_ZV_BYTE (b->base_buffer)); |
12998
404ae27d5148
(Fmake_indirect_buffer): Set the insertion_type of the zv_marker markers to 1.
Richard M. Stallman <rms@gnu.org>
parents:
12810
diff
changeset
|
627 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
|
628 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
629 |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
630 if (NILP (clone)) |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
631 { |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
632 /* Give the indirect buffer markers for its narrowing. */ |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
633 b->pt_marker = Fmake_marker (); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
634 set_marker_both (b->pt_marker, buf, BUF_PT (b), BUF_PT_BYTE (b)); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
635 b->begv_marker = Fmake_marker (); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
636 set_marker_both (b->begv_marker, buf, BUF_BEGV (b), BUF_BEGV_BYTE (b)); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
637 b->zv_marker = Fmake_marker (); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
638 set_marker_both (b->zv_marker, buf, BUF_ZV (b), BUF_ZV_BYTE (b)); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
639 XMARKER (b->zv_marker)->insertion_type = 1; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
640 } |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
641 else |
61445
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
642 { |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
643 struct buffer *old_b = current_buffer; |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
644 |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
645 clone_per_buffer_values (b->base_buffer, b); |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
646 b->filename = Qnil; |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
647 b->file_truename = Qnil; |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
648 b->display_count = make_number (0); |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
649 b->backed_up = Qnil; |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
650 b->auto_save_file_name = Qnil; |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
651 set_buffer_internal_1 (b); |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
652 Fset (intern ("buffer-save-without-query"), Qnil); |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
653 Fset (intern ("buffer-file-number"), Qnil); |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
654 Fset (intern ("buffer-stale-function"), Qnil); |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
655 set_buffer_internal_1 (old_b); |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
656 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
657 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
658 return buf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
659 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
660 |
52012
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
661 void |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
662 delete_all_overlays (b) |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
663 struct buffer *b; |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
664 { |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
665 Lisp_Object overlay; |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
666 |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
667 /* `reset_buffer' blindly sets the list of overlays to NULL, so we |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
668 have to empty the list, otherwise we end up with overlays that |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
669 think they belong to this buffer while the buffer doesn't know about |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
670 them any more. */ |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
671 while (b->overlays_before) |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
672 { |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
673 XSETMISC (overlay, b->overlays_before); |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
674 Fdelete_overlay (overlay); |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
675 } |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
676 while (b->overlays_after) |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
677 { |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
678 XSETMISC (overlay, b->overlays_after); |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
679 Fdelete_overlay (overlay); |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
680 } |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
681 eassert (b->overlays_before == NULL); |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
682 eassert (b->overlays_after == NULL); |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
683 } |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
684 |
8873
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
685 /* Reinitialize everything about a buffer except its name and contents |
54834
9533e29b87e8
(Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents:
54819
diff
changeset
|
686 and local variables. |
52012
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
687 If called on an already-initialized buffer, the list of overlays |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
688 should be deleted before calling this function, otherwise we end up |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
689 with overlays that claim to belong to the buffer but the buffer |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
690 claims it doesn't belong to it. */ |
333 | 691 |
692 void | |
693 reset_buffer (b) | |
694 register struct buffer *b; | |
695 { | |
696 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
|
697 b->file_truename = Qnil; |
333 | 698 b->directory = (current_buffer) ? current_buffer->directory : Qnil; |
699 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
|
700 XSETFASTINT (b->save_length, 0); |
333 | 701 b->last_window_start = 1; |
17566
7ed40081342f
(reset_buffer): Initialize clip_changed field.
Richard M. Stallman <rms@gnu.org>
parents:
17238
diff
changeset
|
702 /* It is more conservative to start out "changed" than "unchanged". */ |
25368
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
703 b->clip_changed = 0; |
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
704 b->prevent_redisplay_optimizations_p = 1; |
333 | 705 b->backed_up = Qnil; |
706 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
|
707 b->auto_save_failure_time = -1; |
333 | 708 b->auto_save_file_name = Qnil; |
709 b->read_only = Qnil; | |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
710 b->overlays_before = NULL; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
711 b->overlays_after = NULL; |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
712 b->overlay_center = BEG; |
3242
f873e6b9af52
(reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents:
3226
diff
changeset
|
713 b->mark_active = Qnil; |
10561
53f34c870201
(init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
10505
diff
changeset
|
714 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
|
715 b->file_format = Qnil; |
56976
b3aa8cb4c381
(reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56669
diff
changeset
|
716 b->auto_save_file_format = Qt; |
16067
5c9f298c9875
(reset_buffer): Initialize last_selected_window slot.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
717 b->last_selected_window = Qnil; |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
718 XSETINT (b->display_count, 0); |
22150
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
719 b->display_time = Qnil; |
20995
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
720 b->enable_multibyte_characters = buffer_defaults.enable_multibyte_characters; |
28322
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
721 b->cursor_type = buffer_defaults.cursor_type; |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
722 b->extra_line_spacing = buffer_defaults.extra_line_spacing; |
42088
11a505aa1322
(reset_buffer): Initialize `display_error_modiff'.
Richard M. Stallman <rms@gnu.org>
parents:
41524
diff
changeset
|
723 |
11a505aa1322
(reset_buffer): Initialize `display_error_modiff'.
Richard M. Stallman <rms@gnu.org>
parents:
41524
diff
changeset
|
724 b->display_error_modiff = 0; |
333 | 725 } |
726 | |
8873
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
727 /* 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
|
728 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
|
729 it does not treat permanent locals consistently. |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
730 Instead, use Fkill_all_local_variables. |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
731 |
87218
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
732 If PERMANENT_TOO is 1, then we reset permanent |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
733 buffer-local variables. If PERMANENT_TOO is 0, |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
734 we preserve those. */ |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
735 |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
736 static void |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
737 reset_buffer_local_variables (b, permanent_too) |
333 | 738 register struct buffer *b; |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
739 int permanent_too; |
333 | 740 { |
741 register int offset; | |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
742 int i; |
333 | 743 |
744 /* Reset the major mode to Fundamental, together with all the | |
745 things that depend on the major mode. | |
746 default-major-mode is handled at a higher level. | |
747 We ignore it here. */ | |
748 b->major_mode = Qfundamental_mode; | |
749 b->keymap = Qnil; | |
750 b->mode_name = QSFundamental; | |
751 b->minor_modes = Qnil; | |
13270
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
752 |
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
753 /* 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
|
754 fix up its insides first. */ |
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
755 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
|
756 && 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
|
757 && 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
|
758 Fset_standard_case_table (Vascii_downcase_table); |
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
759 |
333 | 760 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
|
761 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
|
762 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
|
763 b->case_eqv_table = XCHAR_TABLE (Vascii_downcase_table)->extras[2]; |
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
764 b->invisibility_spec = Qt; |
15786
f2d0e8928d57
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15776
diff
changeset
|
765 #ifndef DOS_NT |
f2d0e8928d57
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15776
diff
changeset
|
766 b->buffer_file_type = Qnil; |
f2d0e8928d57
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15776
diff
changeset
|
767 #endif |
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
768 |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
769 /* Reset all (or most) per-buffer variables to their defaults. */ |
87218
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
770 if (permanent_too) |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
771 b->local_var_alist = Qnil; |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
772 else |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
773 { |
87977
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
774 Lisp_Object tmp, prop, last = Qnil; |
87218
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
775 for (tmp = b->local_var_alist; CONSP (tmp); tmp = XCDR (tmp)) |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
776 if (CONSP (XCAR (tmp)) |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
777 && SYMBOLP (XCAR (XCAR (tmp))) |
87977
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
778 && !NILP (prop = Fget (XCAR (XCAR (tmp)), Qpermanent_local))) |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
779 { |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
780 /* If permanent-local, keep it. */ |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
781 last = tmp; |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
782 if (EQ (prop, Qpermanent_local_hook)) |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
783 { |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
784 /* This is a partially permanent hook variable. |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
785 Preserve only the elements that want to be preserved. */ |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
786 Lisp_Object list, newlist; |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
787 list = XCDR (XCAR (tmp)); |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
788 if (!CONSP (list)) |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
789 newlist = list; |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
790 else |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
791 for (newlist = Qnil; CONSP (list); list = XCDR (list)) |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
792 { |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
793 Lisp_Object elt = XCAR (list); |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
794 /* Preserve element ELT if it's t, |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
795 if it is a function with a `permanent-local-hook' property, |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
796 or if it's not a symbol. */ |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
797 if (! SYMBOLP (elt) |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
798 || EQ (elt, Qt) |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
799 || !NILP (Fget (elt, Qpermanent_local_hook))) |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
800 newlist = Fcons (elt, newlist); |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
801 } |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
802 XSETCDR (XCAR (tmp), Fnreverse (newlist)); |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
803 } |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
804 } |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
805 /* Delete this local variable. */ |
87218
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
806 else if (NILP (last)) |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
807 b->local_var_alist = XCDR (tmp); |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
808 else |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
809 XSETCDR (last, XCDR (tmp)); |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
810 } |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
811 |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
812 for (i = 0; i < last_per_buffer_idx; ++i) |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
813 if (permanent_too || buffer_permanent_local_flags[i] == 0) |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
814 SET_PER_BUFFER_VALUE_P (b, i, 0); |
333 | 815 |
816 /* For each slot that has a default value, | |
817 copy that into the slot. */ | |
818 | |
91781
a6047ef14f4c
(clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91711
diff
changeset
|
819 /* buffer-local Lisp variables start at `undo_list', |
a6047ef14f4c
(clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91711
diff
changeset
|
820 tho only the ones from `name' on are GC'd normally. */ |
a6047ef14f4c
(clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91711
diff
changeset
|
821 for (offset = PER_BUFFER_VAR_OFFSET (undo_list); |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
822 offset < sizeof *b; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
823 offset += sizeof (Lisp_Object)) |
9362
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
824 { |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
825 int idx = PER_BUFFER_IDX (offset); |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
826 if ((idx > 0 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
827 && (permanent_too |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
828 || buffer_permanent_local_flags[idx] == 0)) |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
829 /* Is -2 used anywhere? */ |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
830 || idx == -2) |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
831 PER_BUFFER_VALUE (b, offset) = PER_BUFFER_DEFAULT (offset); |
9362
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
832 } |
333 | 833 } |
834 | |
392 | 835 /* We split this away from generate-new-buffer, because rename-buffer |
836 and set-visited-file-name ought to be able to use this to really | |
837 rename the buffer properly. */ | |
838 | |
839 DEFUN ("generate-new-buffer-name", Fgenerate_new_buffer_name, Sgenerate_new_buffer_name, | |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
840 1, 2, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
841 doc: /* Return a string that is the name of no existing buffer based on NAME. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
842 If there is no live buffer named NAME, then return NAME. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
843 Otherwise modify name by appending `<NUMBER>', incrementing NUMBER |
54786
870b7a6bffb8
(Fgenerate_new_buffer_name): Return NAME argument if IGNORE argument
Luc Teirlinck <teirllm@auburn.edu>
parents:
54772
diff
changeset
|
844 \(starting at 2) until an unused name is found, and then return that name. |
75784 | 845 Optional second argument IGNORE specifies a name that is okay to use (if |
846 it is in the sequence to be tried) even if a buffer with that name exists. */) | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
847 (name, ignore) |
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
848 register Lisp_Object name, ignore; |
333 | 849 { |
850 register Lisp_Object gentemp, tem; | |
851 int count; | |
852 char number[10]; | |
853 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
854 CHECK_STRING (name); |
333 | 855 |
54786
870b7a6bffb8
(Fgenerate_new_buffer_name): Return NAME argument if IGNORE argument
Luc Teirlinck <teirllm@auburn.edu>
parents:
54772
diff
changeset
|
856 tem = Fstring_equal (name, ignore); |
870b7a6bffb8
(Fgenerate_new_buffer_name): Return NAME argument if IGNORE argument
Luc Teirlinck <teirllm@auburn.edu>
parents:
54772
diff
changeset
|
857 if (!NILP (tem)) |
870b7a6bffb8
(Fgenerate_new_buffer_name): Return NAME argument if IGNORE argument
Luc Teirlinck <teirllm@auburn.edu>
parents:
54772
diff
changeset
|
858 return name; |
333 | 859 tem = Fget_buffer (name); |
485 | 860 if (NILP (tem)) |
392 | 861 return name; |
333 | 862 |
863 count = 1; | |
864 while (1) | |
865 { | |
866 sprintf (number, "<%d>", ++count); | |
867 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
|
868 tem = Fstring_equal (gentemp, ignore); |
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
869 if (!NILP (tem)) |
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
870 return gentemp; |
333 | 871 tem = Fget_buffer (gentemp); |
485 | 872 if (NILP (tem)) |
392 | 873 return gentemp; |
333 | 874 } |
875 } | |
876 | |
877 | |
878 DEFUN ("buffer-name", Fbuffer_name, Sbuffer_name, 0, 1, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
879 doc: /* Return the name of BUFFER, as a string. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
880 With no argument or nil as argument, return the name of the current buffer. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
881 (buffer) |
333 | 882 register Lisp_Object buffer; |
883 { | |
485 | 884 if (NILP (buffer)) |
333 | 885 return current_buffer->name; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
886 CHECK_BUFFER (buffer); |
333 | 887 return XBUFFER (buffer)->name; |
888 } | |
889 | |
890 DEFUN ("buffer-file-name", Fbuffer_file_name, Sbuffer_file_name, 0, 1, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
891 doc: /* Return name of file BUFFER is visiting, or nil if none. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
892 No argument or nil as argument means use the current buffer. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
893 (buffer) |
333 | 894 register Lisp_Object buffer; |
895 { | |
485 | 896 if (NILP (buffer)) |
333 | 897 return current_buffer->filename; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
898 CHECK_BUFFER (buffer); |
333 | 899 return XBUFFER (buffer)->filename; |
900 } | |
901 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
902 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
|
903 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
904 doc: /* Return the base buffer of indirect buffer BUFFER. |
54949
95d283fb2215
(Fbuffer_base_buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54834
diff
changeset
|
905 If BUFFER is not indirect, return nil. |
95d283fb2215
(Fbuffer_base_buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54834
diff
changeset
|
906 BUFFER defaults to the current buffer. */) |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
907 (buffer) |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
908 register Lisp_Object buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
909 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
910 struct buffer *base; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
911 Lisp_Object base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
912 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
913 if (NILP (buffer)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
914 base = current_buffer->base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
915 else |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
916 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
917 CHECK_BUFFER (buffer); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
918 base = XBUFFER (buffer)->base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
919 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
920 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
921 if (! base) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
922 return Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
923 XSETBUFFER (base_buffer, base); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
924 return base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
925 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
926 |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
927 DEFUN ("buffer-local-value", Fbuffer_local_value, |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
928 Sbuffer_local_value, 2, 2, 0, |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
929 doc: /* Return the value of VARIABLE in BUFFER. |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
930 If VARIABLE does not have a buffer-local binding in BUFFER, the value |
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
931 is the default binding of the variable. */) |
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
932 (variable, buffer) |
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
933 register Lisp_Object variable; |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
934 register Lisp_Object buffer; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
935 { |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
936 register struct buffer *buf; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
937 register Lisp_Object result; |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
938 struct Lisp_Symbol *sym; |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
939 |
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
940 CHECK_SYMBOL (variable); |
40735
d3065bec433f
(Fbuffer_local_value): Remove extra args from CHECK_SYMBOL and CHECK_BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
40725
diff
changeset
|
941 CHECK_BUFFER (buffer); |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
942 buf = XBUFFER (buffer); |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
943 |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
944 sym = indirect_variable (XSYMBOL (variable)); |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
945 XSETSYMBOL (variable, sym); |
62855
5ef5c45c0187
(Fbuffer_local_value): Call indirect_variable.
Richard M. Stallman <rms@gnu.org>
parents:
62793
diff
changeset
|
946 |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
947 /* Look in local_var_list */ |
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
948 result = Fassoc (variable, buf->local_var_alist); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
949 if (NILP (result)) |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
950 { |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
951 int offset, idx; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
952 int found = 0; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
953 |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
954 /* Look in special slots */ |
91781
a6047ef14f4c
(clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91711
diff
changeset
|
955 /* buffer-local Lisp variables start at `undo_list', |
a6047ef14f4c
(clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91711
diff
changeset
|
956 tho only the ones from `name' on are GC'd normally. */ |
a6047ef14f4c
(clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91711
diff
changeset
|
957 for (offset = PER_BUFFER_VAR_OFFSET (undo_list); |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
958 offset < sizeof (struct buffer); |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
959 /* sizeof EMACS_INT == sizeof Lisp_Object */ |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
960 offset += (sizeof (EMACS_INT))) |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
961 { |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
962 idx = PER_BUFFER_IDX (offset); |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
963 if ((idx == -1 || PER_BUFFER_VALUE_P (buf, idx)) |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
964 && SYMBOLP (PER_BUFFER_SYMBOL (offset)) |
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
965 && EQ (PER_BUFFER_SYMBOL (offset), variable)) |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
966 { |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
967 result = PER_BUFFER_VALUE (buf, offset); |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
968 found = 1; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
969 break; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
970 } |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
971 } |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
972 |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
973 if (!found) |
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
974 result = Fdefault_value (variable); |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
975 } |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
976 else |
46199
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
977 { |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
978 Lisp_Object valcontents; |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
979 Lisp_Object current_alist_element; |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
980 |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
981 /* What binding is loaded right now? */ |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
982 valcontents = sym->value; |
46199
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
983 current_alist_element |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
984 = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr); |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
985 |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
986 /* The value of the currently loaded binding is not |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
987 stored in it, but rather in the realvalue slot. |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
988 Store that value into the binding it belongs to |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
989 in case that is the one we are about to use. */ |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
990 |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
991 Fsetcdr (current_alist_element, |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
992 do_symval_forwarding (XBUFFER_LOCAL_VALUE (valcontents)->realvalue)); |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
993 |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
994 /* Now get the (perhaps updated) value out of the binding. */ |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
995 result = XCDR (result); |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
996 } |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
997 |
71968
b0505e901bff
(Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents:
70931
diff
changeset
|
998 if (!EQ (result, Qunbound)) |
b0505e901bff
(Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents:
70931
diff
changeset
|
999 return result; |
b0505e901bff
(Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents:
70931
diff
changeset
|
1000 |
b0505e901bff
(Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents:
70931
diff
changeset
|
1001 xsignal1 (Qvoid_variable, variable); |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1002 } |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1003 |
60683
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1004 /* Return an alist of the Lisp-level buffer-local bindings of |
61445
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
1005 buffer BUF. That is, don't include the variables maintained |
60683
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1006 in special slots in the buffer object. */ |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1007 |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1008 static Lisp_Object |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1009 buffer_lisp_local_variables (buf) |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1010 struct buffer *buf; |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1011 { |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1012 Lisp_Object result = Qnil; |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1013 register Lisp_Object tail; |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1014 for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail)) |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1015 { |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1016 Lisp_Object val, elt; |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1017 |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1018 elt = XCAR (tail); |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1019 |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1020 /* Reference each variable in the alist in buf. |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1021 If inquiring about the current buffer, this gets the current values, |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1022 so store them into the alist so the alist is up to date. |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1023 If inquiring about some other buffer, this swaps out any values |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1024 for that buffer, making the alist up to date automatically. */ |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1025 val = find_symbol_value (XCAR (elt)); |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1026 /* Use the current buffer value only if buf is the current buffer. */ |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1027 if (buf != current_buffer) |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1028 val = XCDR (elt); |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1029 |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1030 /* If symbol is unbound, put just the symbol in the list. */ |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1031 if (EQ (val, Qunbound)) |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1032 result = Fcons (XCAR (elt), result); |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1033 /* Otherwise, put (symbol . value) in the list. */ |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1034 else |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1035 result = Fcons (Fcons (XCAR (elt), val), result); |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1036 } |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1037 |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1038 return result; |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1039 } |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1040 |
333 | 1041 DEFUN ("buffer-local-variables", Fbuffer_local_variables, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
1042 Sbuffer_local_variables, 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1043 doc: /* Return an alist of variables that are buffer-local in BUFFER. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1044 Most elements look like (SYMBOL . VALUE), describing one variable. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1045 For a symbol that is locally unbound, just the symbol appears in the value. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1046 Note that storing new VALUEs in these elements doesn't change the variables. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1047 No argument or nil as argument means use current buffer as BUFFER. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1048 (buffer) |
333 | 1049 register Lisp_Object buffer; |
1050 { | |
1051 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
|
1052 register Lisp_Object result; |
333 | 1053 |
485 | 1054 if (NILP (buffer)) |
333 | 1055 buf = current_buffer; |
1056 else | |
1057 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
1058 CHECK_BUFFER (buffer); |
333 | 1059 buf = XBUFFER (buffer); |
1060 } | |
1061 | |
60683
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1062 result = buffer_lisp_local_variables (buf); |
333 | 1063 |
1064 /* Add on all the variables stored in special slots. */ | |
1065 { | |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
1066 int offset, idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
1067 |
91781
a6047ef14f4c
(clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91711
diff
changeset
|
1068 /* buffer-local Lisp variables start at `undo_list', |
a6047ef14f4c
(clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91711
diff
changeset
|
1069 tho only the ones from `name' on are GC'd normally. */ |
a6047ef14f4c
(clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91711
diff
changeset
|
1070 for (offset = PER_BUFFER_VAR_OFFSET (undo_list); |
333 | 1071 offset < sizeof (struct buffer); |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
1072 /* sizeof EMACS_INT == sizeof Lisp_Object */ |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
1073 offset += (sizeof (EMACS_INT))) |
333 | 1074 { |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
1075 idx = PER_BUFFER_IDX (offset); |
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
1076 if ((idx == -1 || PER_BUFFER_VALUE_P (buf, idx)) |
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
1077 && SYMBOLP (PER_BUFFER_SYMBOL (offset))) |
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
1078 result = Fcons (Fcons (PER_BUFFER_SYMBOL (offset), |
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
1079 PER_BUFFER_VALUE (buf, offset)), |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
1080 result); |
333 | 1081 } |
1082 } | |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
1083 |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
1084 return result; |
333 | 1085 } |
1086 | |
1087 DEFUN ("buffer-modified-p", Fbuffer_modified_p, Sbuffer_modified_p, | |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
1088 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1089 doc: /* Return t if BUFFER was modified since its file was last read or saved. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1090 No argument or nil as argument means use current buffer as BUFFER. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1091 (buffer) |
333 | 1092 register Lisp_Object buffer; |
1093 { | |
1094 register struct buffer *buf; | |
485 | 1095 if (NILP (buffer)) |
333 | 1096 buf = current_buffer; |
1097 else | |
1098 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
1099 CHECK_BUFFER (buffer); |
333 | 1100 buf = XBUFFER (buffer); |
1101 } | |
1102 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1103 return BUF_SAVE_MODIFF (buf) < BUF_MODIFF (buf) ? Qt : Qnil; |
333 | 1104 } |
1105 | |
1106 DEFUN ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p, | |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
1107 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1108 doc: /* Mark current buffer as modified or unmodified according to FLAG. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1109 A non-nil FLAG means mark the buffer modified. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1110 (flag) |
333 | 1111 register Lisp_Object flag; |
1112 { | |
1113 register int already; | |
1114 register Lisp_Object fn; | |
28207
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1115 Lisp_Object buffer, window; |
333 | 1116 |
1117 #ifdef CLASH_DETECTION | |
1118 /* If buffer becoming modified, lock the file. | |
1119 If buffer becoming unmodified, unlock the file. */ | |
1120 | |
11659
f9b6e65774e7
(Fset_buffer_modified_p): Use the truename for locking.
Richard M. Stallman <rms@gnu.org>
parents:
11473
diff
changeset
|
1121 fn = current_buffer->file_truename; |
24520
e8b7cb3fac8c
(Fset_buffer_modified_p): Don't lock or unlock
Karl Heuer <kwzh@gnu.org>
parents:
24434
diff
changeset
|
1122 /* Test buffer-file-name so that binding it to nil is effective. */ |
e8b7cb3fac8c
(Fset_buffer_modified_p): Don't lock or unlock
Karl Heuer <kwzh@gnu.org>
parents:
24434
diff
changeset
|
1123 if (!NILP (fn) && ! NILP (current_buffer->filename)) |
333 | 1124 { |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1125 already = SAVE_MODIFF < MODIFF; |
485 | 1126 if (!already && !NILP (flag)) |
333 | 1127 lock_file (fn); |
485 | 1128 else if (already && NILP (flag)) |
333 | 1129 unlock_file (fn); |
1130 } | |
1131 #endif /* CLASH_DETECTION */ | |
1132 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1133 SAVE_MODIFF = NILP (flag) ? MODIFF : 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1134 |
28207
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1135 /* Set update_mode_lines only if buffer is displayed in some window. |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1136 Packages like jit-lock or lazy-lock preserve a buffer's modified |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1137 state by recording/restoring the state around blocks of code. |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1138 Setting update_mode_lines makes redisplay consider all windows |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1139 (on all frames). Stealth fontification of buffers not displayed |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1140 would incur additional redisplay costs if we'd set |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1141 update_modes_lines unconditionally. |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1142 |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1143 Ideally, I think there should be another mechanism for fontifying |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1144 buffers without "modifying" buffers, or redisplay should be |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1145 smarter about updating the `*' in mode lines. --gerd */ |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1146 XSETBUFFER (buffer, current_buffer); |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1147 window = Fget_buffer_window (buffer, Qt); |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1148 if (WINDOWP (window)) |
35339
e5e6579e8308
(Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents:
34488
diff
changeset
|
1149 { |
e5e6579e8308
(Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents:
34488
diff
changeset
|
1150 ++update_mode_lines; |
e5e6579e8308
(Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents:
34488
diff
changeset
|
1151 current_buffer->prevent_redisplay_optimizations_p = 1; |
e5e6579e8308
(Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents:
34488
diff
changeset
|
1152 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1153 |
333 | 1154 return flag; |
1155 } | |
1156 | |
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1157 DEFUN ("restore-buffer-modified-p", Frestore_buffer_modified_p, |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1158 Srestore_buffer_modified_p, 1, 1, 0, |
56669
126be634e20a
(Frestore_buffer_modified_p): Doc fix.
John Paul Wallington <jpw@pobox.com>
parents:
56452
diff
changeset
|
1159 doc: /* Like `set-buffer-modified-p', with a difference concerning redisplay. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1160 It is not ensured that mode lines will be updated to show the modified |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1161 state of the current buffer. Use with care. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1162 (flag) |
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1163 Lisp_Object flag; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1164 { |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1165 #ifdef CLASH_DETECTION |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1166 Lisp_Object fn; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1167 |
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1168 /* If buffer becoming modified, lock the file. |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1169 If buffer becoming unmodified, unlock the file. */ |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1170 |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1171 fn = current_buffer->file_truename; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1172 /* Test buffer-file-name so that binding it to nil is effective. */ |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1173 if (!NILP (fn) && ! NILP (current_buffer->filename)) |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1174 { |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1175 int already = SAVE_MODIFF < MODIFF; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1176 if (!already && !NILP (flag)) |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1177 lock_file (fn); |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1178 else if (already && NILP (flag)) |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1179 unlock_file (fn); |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1180 } |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1181 #endif /* CLASH_DETECTION */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1182 |
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1183 SAVE_MODIFF = NILP (flag) ? MODIFF : 0; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1184 return flag; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1185 } |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1186 |
333 | 1187 DEFUN ("buffer-modified-tick", Fbuffer_modified_tick, Sbuffer_modified_tick, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
1188 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1189 doc: /* Return BUFFER's tick counter, incremented for each change in text. |
75784 | 1190 Each buffer has a tick counter which is incremented each time the |
1191 text in that buffer is changed. It wraps around occasionally. | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1192 No argument or nil as argument means use current buffer as BUFFER. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1193 (buffer) |
333 | 1194 register Lisp_Object buffer; |
1195 { | |
1196 register struct buffer *buf; | |
485 | 1197 if (NILP (buffer)) |
333 | 1198 buf = current_buffer; |
1199 else | |
1200 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
1201 CHECK_BUFFER (buffer); |
333 | 1202 buf = XBUFFER (buffer); |
1203 } | |
1204 | |
1205 return make_number (BUF_MODIFF (buf)); | |
1206 } | |
72592
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1207 |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1208 DEFUN ("buffer-chars-modified-tick", Fbuffer_chars_modified_tick, |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1209 Sbuffer_chars_modified_tick, 0, 1, 0, |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1210 doc: /* Return BUFFER's character-change tick counter. |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1211 Each buffer has a character-change tick counter, which is set to the |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1212 value of the buffer's tick counter \(see `buffer-modified-tick'), each |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1213 time text in that buffer is inserted or deleted. By comparing the |
72596 | 1214 values returned by two individual calls of `buffer-chars-modified-tick', |
72592
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1215 you can tell whether a character change occurred in that buffer in |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1216 between these calls. No argument or nil as argument means use current |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1217 buffer as BUFFER. */) |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1218 (buffer) |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1219 register Lisp_Object buffer; |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1220 { |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1221 register struct buffer *buf; |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1222 if (NILP (buffer)) |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1223 buf = current_buffer; |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1224 else |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1225 { |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1226 CHECK_BUFFER (buffer); |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1227 buf = XBUFFER (buffer); |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1228 } |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1229 |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1230 return make_number (BUF_CHARS_MODIFF (buf)); |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1231 } |
333 | 1232 |
392 | 1233 DEFUN ("rename-buffer", Frename_buffer, Srename_buffer, 1, 2, |
87265
40dcde0eb331
(Frename_buffer): In interactive spec replace
Juri Linkov <juri@jurta.org>
parents:
87218
diff
changeset
|
1234 "(list (read-string \"Rename buffer (to new name): \" \ |
40dcde0eb331
(Frename_buffer): In interactive spec replace
Juri Linkov <juri@jurta.org>
parents:
87218
diff
changeset
|
1235 nil 'buffer-name-history (buffer-name (current-buffer))) \ |
40dcde0eb331
(Frename_buffer): In interactive spec replace
Juri Linkov <juri@jurta.org>
parents:
87218
diff
changeset
|
1236 current-prefix-arg)", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1237 doc: /* Change current buffer's name to NEWNAME (a string). |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1238 If second arg UNIQUE is nil or omitted, it is an error if a |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1239 buffer named NEWNAME already exists. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1240 If UNIQUE is non-nil, come up with a new name using |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1241 `generate-new-buffer-name'. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1242 Interactively, you can set UNIQUE with a prefix argument. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1243 We return the name we actually gave the buffer. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1244 This does not change the name of the visited file (if any). */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1245 (newname, unique) |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1246 register Lisp_Object newname, unique; |
333 | 1247 { |
1248 register Lisp_Object tem, buf; | |
1249 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
1250 CHECK_STRING (newname); |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1251 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1252 if (SCHARS (newname) == 0) |
7455
35657813817c
(Frename_buffer): Reject empty string as new name.
Richard M. Stallman <rms@gnu.org>
parents:
7434
diff
changeset
|
1253 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
|
1254 |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1255 tem = Fget_buffer (newname); |
485 | 1256 if (!NILP (tem)) |
392 | 1257 { |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
1258 /* Don't short-circuit if UNIQUE is t. That is a useful way to |
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
1259 rename the buffer automatically so you can create another |
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
1260 with the original name. It makes UNIQUE equivalent to |
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
1261 (rename-buffer (generate-new-buffer-name NEWNAME)). */ |
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
1262 if (NILP (unique) && XBUFFER (tem) == current_buffer) |
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
1263 return current_buffer->name; |
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
1264 if (!NILP (unique)) |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1265 newname = Fgenerate_new_buffer_name (newname, current_buffer->name); |
392 | 1266 else |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1267 error ("Buffer name `%s' is in use", SDATA (newname)); |
392 | 1268 } |
333 | 1269 |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1270 current_buffer->name = newname; |
1707
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
1271 |
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
1272 /* 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
|
1273 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
|
1274 update_mode_lines++; |
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
1275 |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
1276 XSETBUFFER (buf, current_buffer); |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1277 Fsetcar (Frassq (buf, Vbuffer_alist), newname); |
8599
cf3233d70e94
(Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents:
8550
diff
changeset
|
1278 if (NILP (current_buffer->filename) |
cf3233d70e94
(Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents:
8550
diff
changeset
|
1279 && !NILP (current_buffer->auto_save_file_name)) |
333 | 1280 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
|
1281 /* 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
|
1282 return current_buffer->name; |
333 | 1283 } |
1284 | |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1285 DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 3, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1286 doc: /* Return most recently selected buffer other than BUFFER. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1287 Buffers not visible in windows are preferred to visible buffers, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1288 unless optional second argument VISIBLE-OK is non-nil. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1289 If the optional third argument FRAME is non-nil, use that frame's |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1290 buffer list instead of the selected frame's buffer list. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1291 If no other buffer exists, the buffer `*scratch*' is returned. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1292 If BUFFER is omitted or nil, some interesting buffer is returned. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1293 (buffer, visible_ok, frame) |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1294 register Lisp_Object buffer, visible_ok, frame; |
333 | 1295 { |
14226
ad275aca6fc5
(Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1296 Lisp_Object Fset_buffer_major_mode (); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1297 register Lisp_Object tail, buf, notsogood, tem, pred, add_ons; |
333 | 1298 notsogood = Qnil; |
1299 | |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1300 if (NILP (frame)) |
25664
832aeb9c3996
(Fother_buffer): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25653
diff
changeset
|
1301 frame = selected_frame; |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1302 |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1303 tail = Vbuffer_alist; |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1304 pred = frame_buffer_predicate (frame); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1305 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1306 /* Consider buffers that have been seen in the selected frame |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1307 before other buffers. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1308 |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1309 tem = frame_buffer_list (frame); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1310 add_ons = Qnil; |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1311 while (CONSP (tem)) |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1312 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1313 if (BUFFERP (XCAR (tem))) |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1314 add_ons = Fcons (Fcons (Qnil, XCAR (tem)), add_ons); |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1315 tem = XCDR (tem); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1316 } |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1317 tail = nconc2 (Fnreverse (add_ons), tail); |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1318 |
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
1319 for (; CONSP (tail); tail = XCDR (tail)) |
333 | 1320 { |
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
1321 buf = Fcdr (XCAR (tail)); |
333 | 1322 if (EQ (buf, buffer)) |
1323 continue; | |
53350
89a24e997838
(Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents:
52459
diff
changeset
|
1324 if (NILP (buf)) |
89a24e997838
(Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents:
52459
diff
changeset
|
1325 continue; |
89a24e997838
(Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents:
52459
diff
changeset
|
1326 if (NILP (XBUFFER (buf)->name)) |
89a24e997838
(Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents:
52459
diff
changeset
|
1327 continue; |
46419
46ff766afaaf
* buffer.c (Fother_buffer): Use SREF when retrieving a byte from
Ken Raeburn <raeburn@raeburn.org>
parents:
46378
diff
changeset
|
1328 if (SREF (XBUFFER (buf)->name, 0) == ' ') |
333 | 1329 continue; |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1330 /* 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
|
1331 disregard buffers that don't fit the predicate. */ |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1332 if (!NILP (pred)) |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1333 { |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1334 tem = call1 (pred, buf); |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1335 if (NILP (tem)) |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1336 continue; |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1337 } |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1338 |
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
1339 if (NILP (visible_ok)) |
31395
d0f522cf422b
(Fother_buffer): Consider buffers as invisible when
Gerd Moellmann <gerd@gnu.org>
parents:
31128
diff
changeset
|
1340 tem = Fget_buffer_window (buf, Qvisible); |
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
1341 else |
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
1342 tem = Qnil; |
485 | 1343 if (NILP (tem)) |
333 | 1344 return buf; |
485 | 1345 if (NILP (notsogood)) |
333 | 1346 notsogood = buf; |
1347 } | |
485 | 1348 if (!NILP (notsogood)) |
333 | 1349 return notsogood; |
27480
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1350 buf = Fget_buffer (build_string ("*scratch*")); |
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1351 if (NILP (buf)) |
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1352 { |
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1353 buf = Fget_buffer_create (build_string ("*scratch*")); |
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1354 Fset_buffer_major_mode (buf); |
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1355 } |
14226
ad275aca6fc5
(Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1356 return buf; |
333 | 1357 } |
1358 | |
1359 DEFUN ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo, | |
1360 0, 1, "", | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1361 doc: /* Start keeping undo information for buffer BUFFER. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1362 No argument or nil as argument means do this for the current buffer. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1363 (buffer) |
648 | 1364 register Lisp_Object buffer; |
333 | 1365 { |
648 | 1366 Lisp_Object real_buffer; |
333 | 1367 |
648 | 1368 if (NILP (buffer)) |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
1369 XSETBUFFER (real_buffer, current_buffer); |
333 | 1370 else |
1371 { | |
648 | 1372 real_buffer = Fget_buffer (buffer); |
1373 if (NILP (real_buffer)) | |
1374 nsberror (buffer); | |
333 | 1375 } |
1376 | |
648 | 1377 if (EQ (XBUFFER (real_buffer)->undo_list, Qt)) |
1378 XBUFFER (real_buffer)->undo_list = Qnil; | |
333 | 1379 |
1380 return Qnil; | |
1381 } | |
1382 | |
1383 /* | |
1384 DEFVAR_LISP ("kill-buffer-hook", no_cell, "\ | |
1385 Hook to be run (by `run-hooks', which see) when a buffer is killed.\n\ | |
1386 The buffer being killed will be current while the hook is running.\n\ | |
1387 See `kill-buffer'." | |
1388 */ | |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1389 DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 0, 1, "bKill buffer: ", |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1390 doc: /* Kill buffer BUFFER-OR-NAME. |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1391 The argument may be a buffer or the name of an existing buffer. |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1392 Argument nil or omitted means kill the current buffer. Return t if the |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1393 buffer is actually killed, nil otherwise. |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1394 |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1395 This function calls `replace-buffer-in-windows' for cleaning up all |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1396 windows currently displaying the buffer to be killed. The functions in |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1397 `kill-buffer-query-functions' are called with the buffer to be killed as |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1398 the current buffer. If any of them returns nil, the buffer is not |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1399 killed. The hook `kill-buffer-hook' is run before the buffer is |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1400 actually killed. The buffer being killed will be current while the hook |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1401 is running. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1402 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1403 Any processes that have this buffer as the `process-buffer' are killed |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1404 with SIGHUP. */) |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1405 (buffer_or_name) |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1406 Lisp_Object buffer_or_name; |
333 | 1407 { |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1408 Lisp_Object buffer; |
333 | 1409 register struct buffer *b; |
1410 register Lisp_Object tem; | |
1411 register struct Lisp_Marker *m; | |
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
1412 struct gcpro gcpro1; |
333 | 1413 |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1414 if (NILP (buffer_or_name)) |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1415 buffer = Fcurrent_buffer (); |
333 | 1416 else |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1417 buffer = Fget_buffer (buffer_or_name); |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1418 if (NILP (buffer)) |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1419 nsberror (buffer_or_name); |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1420 |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1421 b = XBUFFER (buffer); |
333 | 1422 |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1423 /* Avoid trouble for buffer already dead. */ |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1424 if (NILP (b->name)) |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1425 return Qnil; |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1426 |
333 | 1427 /* Query if the buffer is still modified. */ |
485 | 1428 if (INTERACTIVE && !NILP (b->filename) |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1429 && BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) |
333 | 1430 { |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1431 GCPRO1 (buffer); |
49444
a80513b20297
(Fkill_buffer): Call format2 instead of format1.
Richard M. Stallman <rms@gnu.org>
parents:
49057
diff
changeset
|
1432 tem = do_yes_or_no_p (format2 ("Buffer %s modified; kill anyway? ", |
a80513b20297
(Fkill_buffer): Call format2 instead of format1.
Richard M. Stallman <rms@gnu.org>
parents:
49057
diff
changeset
|
1433 b->name, make_number (0))); |
333 | 1434 UNGCPRO; |
485 | 1435 if (NILP (tem)) |
333 | 1436 return Qnil; |
1437 } | |
1438 | |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1439 /* Run hooks with the buffer to be killed the current buffer. */ |
333 | 1440 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46199
diff
changeset
|
1441 int count = SPECPDL_INDEX (); |
50014
3b2576528809
(Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents:
49974
diff
changeset
|
1442 Lisp_Object arglist[1]; |
333 | 1443 |
1444 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
1445 set_buffer_internal (b); | |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1446 |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1447 /* 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
|
1448 don't kill the buffer. */ |
50014
3b2576528809
(Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents:
49974
diff
changeset
|
1449 arglist[0] = Qkill_buffer_query_functions; |
67335
a4a1c5b73301
(Fkill_buffer): Avoid dangerous side effects in NILP argument.
Ken Raeburn <raeburn@raeburn.org>
parents:
67220
diff
changeset
|
1450 tem = Frun_hook_with_args_until_failure (1, arglist); |
a4a1c5b73301
(Fkill_buffer): Avoid dangerous side effects in NILP argument.
Ken Raeburn <raeburn@raeburn.org>
parents:
67220
diff
changeset
|
1451 if (NILP (tem)) |
50014
3b2576528809
(Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents:
49974
diff
changeset
|
1452 return unbind_to (count, Qnil); |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1453 |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1454 /* Then run the hooks. */ |
41524
095a45698793
(Fkill_buffer): Use Frun_hooks, not Vrun_hooks.
Richard M. Stallman <rms@gnu.org>
parents:
41027
diff
changeset
|
1455 Frun_hooks (1, &Qkill_buffer_hook); |
333 | 1456 unbind_to (count, Qnil); |
1457 } | |
1458 | |
1459 /* We have no more questions to ask. Verify that it is valid | |
1460 to kill the buffer. This must be done after the questions | |
1461 since anything can happen within do_yes_or_no_p. */ | |
1462 | |
1463 /* Don't kill the minibuffer now current. */ | |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1464 if (EQ (buffer, XWINDOW (minibuf_window)->buffer)) |
333 | 1465 return Qnil; |
1466 | |
485 | 1467 if (NILP (b->name)) |
333 | 1468 return Qnil; |
1469 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1470 /* 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
|
1471 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
|
1472 ask questions or their hooks get errors. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1473 if (! b->base_buffer) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1474 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1475 struct buffer *other; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1476 |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1477 GCPRO1 (buffer); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1478 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1479 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
|
1480 /* all_buffers contains dead buffers too; |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1481 don't re-kill them. */ |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1482 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
|
1483 { |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1484 Lisp_Object buffer; |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1485 XSETBUFFER (buffer, other); |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1486 Fkill_buffer (buffer); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1487 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1488 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1489 UNGCPRO; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1490 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1491 |
333 | 1492 /* Make this buffer not be current. |
1493 In the process, notice if this is the sole visible buffer | |
1494 and give up if so. */ | |
1495 if (b == current_buffer) | |
1496 { | |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1497 tem = Fother_buffer (buffer, Qnil, Qnil); |
333 | 1498 Fset_buffer (tem); |
1499 if (b == current_buffer) | |
1500 return Qnil; | |
1501 } | |
1502 | |
33698
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1503 /* Notice if the buffer to kill is the sole visible buffer |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1504 when we're currently in the mini-buffer, and give up if so. */ |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1505 XSETBUFFER (tem, current_buffer); |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1506 if (EQ (tem, XWINDOW (minibuf_window)->buffer)) |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1507 { |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1508 tem = Fother_buffer (buffer, Qnil, Qnil); |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1509 if (EQ (buffer, tem)) |
33698
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1510 return Qnil; |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1511 } |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1512 |
333 | 1513 /* Now there is no question: we can kill the buffer. */ |
1514 | |
1515 #ifdef CLASH_DETECTION | |
1516 /* Unlock this buffer's file, if it is locked. */ | |
1517 unlock_buffer (b); | |
1518 #endif /* CLASH_DETECTION */ | |
1519 | |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1520 GCPRO1 (buffer); |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1521 kill_buffer_processes (buffer); |
77176
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1522 UNGCPRO; |
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1523 |
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1524 /* Killing buffer processes may run sentinels which may |
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1525 have called kill-buffer. */ |
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1526 |
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1527 if (NILP (b->name)) |
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1528 return Qnil; |
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1529 |
51782
3b58843e8f3f
(Fkill_buffer): Clear charpos cache if necessary.
Kenichi Handa <handa@m17n.org>
parents:
51669
diff
changeset
|
1530 clear_charpos_cache (b); |
333 | 1531 |
1532 tem = Vinhibit_quit; | |
1533 Vinhibit_quit = Qt; | |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1534 replace_buffer_in_all_windows (buffer); |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1535 Vbuffer_alist = Fdelq (Frassq (buffer, Vbuffer_alist), Vbuffer_alist); |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1536 frames_discard_buffer (buffer); |
333 | 1537 Vinhibit_quit = tem; |
1538 | |
40760
aa9b081b3a0d
(Fkill_buffer): Don't delete auto save file if buffer is modified.
Richard M. Stallman <rms@gnu.org>
parents:
40735
diff
changeset
|
1539 /* Delete any auto-save file, if we saved it in this session. |
aa9b081b3a0d
(Fkill_buffer): Don't delete auto save file if buffer is modified.
Richard M. Stallman <rms@gnu.org>
parents:
40735
diff
changeset
|
1540 But not if the buffer is modified. */ |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1541 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
|
1542 && b->auto_save_modified != 0 |
40760
aa9b081b3a0d
(Fkill_buffer): Don't delete auto save file if buffer is modified.
Richard M. Stallman <rms@gnu.org>
parents:
40735
diff
changeset
|
1543 && BUF_SAVE_MODIFF (b) < b->auto_save_modified |
53350
89a24e997838
(Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents:
52459
diff
changeset
|
1544 && BUF_SAVE_MODIFF (b) < BUF_MODIFF (b) |
89a24e997838
(Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents:
52459
diff
changeset
|
1545 && NILP (Fsymbol_value (intern ("auto-save-visited-file-name")))) |
333 | 1546 { |
1547 Lisp_Object tem; | |
1548 tem = Fsymbol_value (intern ("delete-auto-save-files")); | |
485 | 1549 if (! NILP (tem)) |
10082
8d3a71736423
(Fkill_buffer): Use internal_delete_file.
Richard M. Stallman <rms@gnu.org>
parents:
9950
diff
changeset
|
1550 internal_delete_file (b->auto_save_file_name); |
333 | 1551 } |
1552 | |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1553 if (b->base_buffer) |
333 | 1554 { |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1555 /* 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
|
1556 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
|
1557 or its other indirect buffers. */ |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1558 for (m = BUF_MARKERS (b); m; ) |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1559 { |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1560 struct Lisp_Marker *next = m->next; |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1561 if (m->buffer == b) |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1562 unchain_marker (m); |
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1563 m = next; |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1564 } |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1565 } |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1566 else |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1567 { |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1568 /* 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
|
1569 and leave them pointing nowhere. */ |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1570 for (m = BUF_MARKERS (b); m; ) |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1571 { |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1572 struct Lisp_Marker *next = m->next; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1573 m->buffer = 0; |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1574 m->next = NULL; |
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1575 m = next; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1576 } |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1577 BUF_MARKERS (b) = NULL; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1578 BUF_INTERVALS (b) = NULL_INTERVAL; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1579 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1580 /* Perhaps we should explicitly free the interval tree here... */ |
333 | 1581 } |
1291
7c32612174c3
* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents:
1281
diff
changeset
|
1582 |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1583 /* 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
|
1584 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
|
1585 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
|
1586 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
|
1587 swap_out_buffer_local_variables (b); |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
1588 reset_buffer_local_variables (b, 1); |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1589 |
333 | 1590 b->name = Qnil; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1591 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
1592 BLOCK_INPUT; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1593 if (! b->base_buffer) |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
1594 free_buffer_text (b); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1595 |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1596 if (b->newline_cache) |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1597 { |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1598 free_region_cache (b->newline_cache); |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1599 b->newline_cache = 0; |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1600 } |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1601 if (b->width_run_cache) |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1602 { |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1603 free_region_cache (b->width_run_cache); |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1604 b->width_run_cache = 0; |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1605 } |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1606 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
|
1607 UNBLOCK_INPUT; |
333 | 1608 b->undo_list = Qnil; |
1609 | |
1610 return Qt; | |
1611 } | |
1612 | |
550 | 1613 /* Move the assoc for buffer BUF to the front of buffer-alist. Since |
1614 we do this each time BUF is selected visibly, the more recently | |
1615 selected buffers are always closer to the front of the list. This | |
1616 means that other_buffer is more likely to choose a relevant buffer. */ | |
333 | 1617 |
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
1618 void |
333 | 1619 record_buffer (buf) |
1620 Lisp_Object buf; | |
1621 { | |
1622 register Lisp_Object link, prev; | |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1623 Lisp_Object frame; |
25664
832aeb9c3996
(Fother_buffer): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25653
diff
changeset
|
1624 frame = selected_frame; |
333 | 1625 |
1626 prev = Qnil; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1627 for (link = Vbuffer_alist; CONSP (link); link = XCDR (link)) |
333 | 1628 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1629 if (EQ (XCDR (XCAR (link)), buf)) |
333 | 1630 break; |
1631 prev = link; | |
1632 } | |
1633 | |
550 | 1634 /* Effectively do Vbuffer_alist = Fdelq (link, Vbuffer_alist); |
1635 we cannot use Fdelq itself here because it allows quitting. */ | |
333 | 1636 |
485 | 1637 if (NILP (prev)) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1638 Vbuffer_alist = XCDR (Vbuffer_alist); |
333 | 1639 else |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
1640 XSETCDR (prev, XCDR (XCDR (prev))); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1641 |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
1642 XSETCDR (link, Vbuffer_alist); |
333 | 1643 Vbuffer_alist = link; |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1644 |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1645 /* Effectively do a delq on buried_buffer_list. */ |
92975
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
1646 |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1647 prev = Qnil; |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1648 for (link = XFRAME (frame)->buried_buffer_list; CONSP (link); |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1649 link = XCDR (link)) |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1650 { |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1651 if (EQ (XCAR (link), buf)) |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1652 { |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1653 if (NILP (prev)) |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1654 XFRAME (frame)->buried_buffer_list = XCDR (link); |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1655 else |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1656 XSETCDR (prev, XCDR (XCDR (prev))); |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1657 break; |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1658 } |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1659 prev = link; |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1660 } |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1661 |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1662 /* Now move this buffer to the front of frame_buffer_list also. */ |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1663 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1664 prev = Qnil; |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1665 for (link = frame_buffer_list (frame); CONSP (link); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1666 link = XCDR (link)) |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1667 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1668 if (EQ (XCAR (link), buf)) |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1669 break; |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1670 prev = link; |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1671 } |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1672 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1673 /* Effectively do delq. */ |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1674 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1675 if (CONSP (link)) |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1676 { |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1677 if (NILP (prev)) |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1678 set_frame_buffer_list (frame, |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1679 XCDR (frame_buffer_list (frame))); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1680 else |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
1681 XSETCDR (prev, XCDR (XCDR (prev))); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1682 |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
1683 XSETCDR (link, frame_buffer_list (frame)); |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1684 set_frame_buffer_list (frame, link); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1685 } |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1686 else |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1687 set_frame_buffer_list (frame, Fcons (buf, frame_buffer_list (frame))); |
333 | 1688 } |
1689 | |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1690 DEFUN ("set-buffer-major-mode", Fset_buffer_major_mode, Sset_buffer_major_mode, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1691 doc: /* Set an appropriate major mode for BUFFER. |
40605 | 1692 For the *scratch* buffer, use `initial-major-mode', otherwise choose a mode |
39974
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1693 according to `default-major-mode'. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1694 Use this function before selecting the buffer, since it may need to inspect |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1695 the current buffer's major mode. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1696 (buffer) |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1697 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
|
1698 { |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1699 int count; |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1700 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
|
1701 |
76791
6ef15c3befe4
(Fset_buffer_major_mode): Check that BUFFER is valid.
Juanma Barranquero <lekktu@gmail.com>
parents:
76557
diff
changeset
|
1702 CHECK_BUFFER (buffer); |
6ef15c3befe4
(Fset_buffer_major_mode): Check that BUFFER is valid.
Juanma Barranquero <lekktu@gmail.com>
parents:
76557
diff
changeset
|
1703 |
39974
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1704 if (STRINGP (XBUFFER (buffer)->name) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1705 && strcmp (SDATA (XBUFFER (buffer)->name), "*scratch*") == 0) |
39974
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1706 function = find_symbol_value (intern ("initial-major-mode")); |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1707 else |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1708 { |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1709 function = buffer_defaults.major_mode; |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1710 if (NILP (function) |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1711 && NILP (Fget (current_buffer->major_mode, Qmode_class))) |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1712 function = current_buffer->major_mode; |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1713 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1714 |
48635 | 1715 if (NILP (function) || EQ (function, Qfundamental_mode)) |
1716 return Qnil; | |
1717 | |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46199
diff
changeset
|
1718 count = SPECPDL_INDEX (); |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1719 |
48635 | 1720 /* To select a nonfundamental mode, |
1721 select the buffer temporarily and then call the mode function. */ | |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1722 |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1723 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
|
1724 |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1725 Fset_buffer (buffer); |
48635 | 1726 call0 (function); |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1727 |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1728 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
|
1729 } |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1730 |
25181
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1731 /* Switch to buffer BUFFER in the selected window. |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1732 If NORECORD is non-nil, don't call record_buffer. */ |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1733 |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1734 Lisp_Object |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1735 switch_to_buffer_1 (buffer_or_name, norecord) |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1736 Lisp_Object buffer_or_name, norecord; |
333 | 1737 { |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1738 register Lisp_Object buffer; |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1739 |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1740 if (NILP (buffer_or_name)) |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1741 buffer = Fother_buffer (Fcurrent_buffer (), Qnil, Qnil); |
333 | 1742 else |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1743 { |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1744 buffer = Fget_buffer (buffer_or_name); |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1745 if (NILP (buffer)) |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1746 { |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1747 buffer = Fget_buffer_create (buffer_or_name); |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1748 Fset_buffer_major_mode (buffer); |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1749 } |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1750 } |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1751 Fset_buffer (buffer); |
485 | 1752 if (NILP (norecord)) |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1753 record_buffer (buffer); |
333 | 1754 |
1755 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
|
1756 ? 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
|
1757 : selected_window, |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1758 buffer, Qnil); |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1759 |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1760 return buffer; |
333 | 1761 } |
1762 | |
94249
982b68f17589
(Fswitch_to_buffer): Change interactive spec to call
Juri Linkov <juri@jurta.org>
parents:
93544
diff
changeset
|
1763 DEFUN ("switch-to-buffer", Fswitch_to_buffer, Sswitch_to_buffer, 1, 2, |
982b68f17589
(Fswitch_to_buffer): Change interactive spec to call
Juri Linkov <juri@jurta.org>
parents:
93544
diff
changeset
|
1764 "(list (read-buffer-to-switch \"Switch to buffer: \"))", |
99791
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1765 doc: /* Make BUFFER-OR-NAME current and display it in selected window. |
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1766 BUFFER-OR-NAME may be a buffer, a string \(a buffer name), or |
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1767 nil. Return the buffer switched to. |
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1768 |
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1769 If BUFFER-OR-NAME is a string and does not identify an existing |
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1770 buffer, create a new buffer with that name. Interactively, if |
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1771 `confirm-nonexistent-file-or-buffer' is non-nil, request |
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1772 confirmation before creating a new buffer. If BUFFER-OR-NAME is |
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1773 nil, switch to buffer returned by `other-buffer'. |
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1774 |
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1775 Optional second arg NORECORD non-nil means do not put this buffer |
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1776 at the front of the list of recently selected ones. This |
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1777 function returns the buffer it switched to as a Lisp object. |
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1778 |
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1779 If the selected window is the minibuffer window or dedicated to |
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1780 its buffer, use `pop-to-buffer' for displaying the buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1781 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1782 WARNING: This is NOT the way to work on another buffer temporarily |
99791
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1783 within a Lisp program! Use `set-buffer' instead. That avoids |
5ed566a3bada
(Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents:
99757
diff
changeset
|
1784 messing with the window-buffer correspondences. */) |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1785 (buffer_or_name, norecord) |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1786 Lisp_Object buffer_or_name, norecord; |
25181
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1787 { |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1788 char *err; |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1789 |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1790 if (EQ (buffer_or_name, Fwindow_buffer (selected_window))) |
72503
6ccb18aa8a5d
(Fswitch_to_buffer): Move buffer to front of
Nick Roberts <nickrob@snap.net.nz>
parents:
72486
diff
changeset
|
1791 { |
72524
49a6e184d20a
(Fswitch_to_buffer): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
72503
diff
changeset
|
1792 /* Basically a NOP. Avoid signalling an error in the case where |
49a6e184d20a
(Fswitch_to_buffer): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
72503
diff
changeset
|
1793 the selected window is dedicated, or a minibuffer. */ |
49a6e184d20a
(Fswitch_to_buffer): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
72503
diff
changeset
|
1794 |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1795 /* But do put this buffer at the front of the buffer list, unless |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1796 that has been inhibited. Note that even if BUFFER-OR-NAME is |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1797 at the front of the main buffer-list already, we still want to |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1798 move it to the front of the frame's buffer list. */ |
72524
49a6e184d20a
(Fswitch_to_buffer): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
72503
diff
changeset
|
1799 if (NILP (norecord)) |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1800 record_buffer (buffer_or_name); |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1801 return Fset_buffer (buffer_or_name); |
72503
6ccb18aa8a5d
(Fswitch_to_buffer): Move buffer to front of
Nick Roberts <nickrob@snap.net.nz>
parents:
72486
diff
changeset
|
1802 } |
102466
13c12974c2f0
(Fswitch_to_buffer): Revert part of 2008-10-21's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100951
diff
changeset
|
1803 else if (EQ (minibuf_window, selected_window) |
13c12974c2f0
(Fswitch_to_buffer): Revert part of 2008-10-21's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100951
diff
changeset
|
1804 /* If `dedicated' is neither nil nor t, it means it's |
13c12974c2f0
(Fswitch_to_buffer): Revert part of 2008-10-21's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100951
diff
changeset
|
1805 dedicatedness can be overridden by an explicit request |
13c12974c2f0
(Fswitch_to_buffer): Revert part of 2008-10-21's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100951
diff
changeset
|
1806 such as a call to switch-to-buffer. */ |
13c12974c2f0
(Fswitch_to_buffer): Revert part of 2008-10-21's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100951
diff
changeset
|
1807 || EQ (Fwindow_dedicated_p (selected_window), Qt)) |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1808 /* We can't use the selected window so let `pop-to-buffer' try some |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1809 other window. */ |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1810 return call3 (intern ("pop-to-buffer"), buffer_or_name, Qnil, norecord); |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1811 else |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
1812 return switch_to_buffer_1 (buffer_or_name, norecord); |
25181
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1813 } |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1814 |
333 | 1815 DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1816 doc: /* Return the current buffer as a Lisp object. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1817 () |
333 | 1818 { |
1819 register Lisp_Object buf; | |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
1820 XSETBUFFER (buf, current_buffer); |
333 | 1821 return buf; |
1822 } | |
1823 | |
25491
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1824 /* Set the current buffer to B. |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1825 |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1826 We previously set windows_or_buffers_changed here to invalidate |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1827 global unchanged information in beg_unchanged and end_unchanged. |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1828 This is no longer necessary because we now compute unchanged |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1829 information on a buffer-basis. Every action affecting other |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1830 windows than the selected one requires a select_window at some |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1831 time, and that increments windows_or_buffers_changed. */ |
333 | 1832 |
1833 void | |
1834 set_buffer_internal (b) | |
1835 register struct buffer *b; | |
1836 { | |
25368
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
1837 if (current_buffer != b) |
25491
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1838 set_buffer_internal_1 (b); |
11889
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1839 } |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1840 |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1841 /* 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
|
1842 This is used by redisplay. */ |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1843 |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1844 void |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1845 set_buffer_internal_1 (b) |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1846 register struct buffer *b; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1847 { |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1848 register struct buffer *old_buf; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1849 register Lisp_Object tail, valcontents; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1850 Lisp_Object tem; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1851 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
1852 #ifdef USE_MMAP_FOR_BUFFERS |
31416
9b8c5bea5e8d
(set_buffer_internal_1) [REL_ALLOC_MMAP]: If
Gerd Moellmann <gerd@gnu.org>
parents:
31412
diff
changeset
|
1853 if (b->text->beg == NULL) |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
1854 enlarge_buffer_text (b, 0); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
1855 #endif /* USE_MMAP_FOR_BUFFERS */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1856 |
11889
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1857 if (current_buffer == b) |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1858 return; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1859 |
333 | 1860 old_buf = current_buffer; |
1861 current_buffer = b; | |
1862 last_known_column_point = -1; /* invalidate indentation cache */ | |
1863 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1864 if (old_buf) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1865 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1866 /* 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
|
1867 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
|
1868 if (old_buf->base_buffer) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1869 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
|
1870 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1871 /* 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
|
1872 when it is not current, update them now. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1873 if (! NILP (old_buf->pt_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1874 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1875 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1876 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1877 set_marker_both (old_buf->pt_marker, obuf, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1878 BUF_PT (old_buf), BUF_PT_BYTE (old_buf)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1879 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1880 if (! NILP (old_buf->begv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1881 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1882 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1883 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1884 set_marker_both (old_buf->begv_marker, obuf, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1885 BUF_BEGV (old_buf), BUF_BEGV_BYTE (old_buf)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1886 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1887 if (! NILP (old_buf->zv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1888 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1889 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1890 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1891 set_marker_both (old_buf->zv_marker, obuf, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1892 BUF_ZV (old_buf), BUF_ZV_BYTE (old_buf)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1893 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1894 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1895 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1896 /* 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
|
1897 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
|
1898 if (b->base_buffer) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1899 b->undo_list = b->base_buffer->undo_list; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1900 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1901 /* 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
|
1902 when it is not current, fetch them now. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1903 if (! NILP (b->pt_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1904 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1905 BUF_PT (b) = marker_position (b->pt_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1906 BUF_PT_BYTE (b) = marker_byte_position (b->pt_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1907 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1908 if (! NILP (b->begv_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1909 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1910 BUF_BEGV (b) = marker_position (b->begv_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1911 BUF_BEGV_BYTE (b) = marker_byte_position (b->begv_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1912 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1913 if (! NILP (b->zv_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1914 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1915 BUF_ZV (b) = marker_position (b->zv_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1916 BUF_ZV_BYTE (b) = marker_byte_position (b->zv_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1917 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1918 |
333 | 1919 /* Look down buffer's list of local Lisp variables |
1920 to find and update any that forward into C variables. */ | |
1921 | |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1922 for (tail = b->local_var_alist; CONSP (tail); tail = XCDR (tail)) |
333 | 1923 { |
104280
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
1924 if (CONSP (XCAR (tail)) |
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
1925 && SYMBOLP (XCAR (XCAR (tail))) |
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
1926 && (valcontents = SYMBOL_VALUE (XCAR (XCAR (tail))), |
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
1927 (BUFFER_LOCAL_VALUEP (valcontents))) |
21141
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
1928 && (tem = XBUFFER_LOCAL_VALUE (valcontents)->realvalue, |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1929 (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem)))) |
104280
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
1930 /* Just reference the variable to cause it to become set for |
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
1931 this buffer. */ |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1932 Fsymbol_value (XCAR (XCAR (tail))); |
333 | 1933 } |
1934 | |
1935 /* Do the same with any others that were local to the previous buffer */ | |
1936 | |
1937 if (old_buf) | |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1938 for (tail = old_buf->local_var_alist; CONSP (tail); tail = XCDR (tail)) |
333 | 1939 { |
104280
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
1940 if (CONSP (tail) |
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
1941 && SYMBOLP (XCAR (XCAR (tail))) |
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
1942 && (valcontents = SYMBOL_VALUE (XCAR (XCAR (tail))), |
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
1943 (BUFFER_LOCAL_VALUEP (valcontents))) |
21141
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
1944 && (tem = XBUFFER_LOCAL_VALUE (valcontents)->realvalue, |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1945 (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem)))) |
104280
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
1946 /* Just reference the variable to cause it to become set for |
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
1947 this buffer. */ |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1948 Fsymbol_value (XCAR (XCAR (tail))); |
333 | 1949 } |
1950 } | |
1951 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1952 /* 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
|
1953 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
|
1954 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1955 void |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1956 set_buffer_temp (b) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1957 struct buffer *b; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1958 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1959 register struct buffer *old_buf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1960 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1961 if (current_buffer == b) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1962 return; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1963 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1964 old_buf = current_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1965 current_buffer = b; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1966 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1967 if (old_buf) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1968 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1969 /* 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
|
1970 when it is not current, update them now. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1971 if (! NILP (old_buf->pt_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1972 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1973 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1974 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1975 set_marker_both (old_buf->pt_marker, obuf, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1976 BUF_PT (old_buf), BUF_PT_BYTE (old_buf)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1977 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1978 if (! NILP (old_buf->begv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1979 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1980 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1981 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1982 set_marker_both (old_buf->begv_marker, obuf, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1983 BUF_BEGV (old_buf), BUF_BEGV_BYTE (old_buf)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1984 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1985 if (! NILP (old_buf->zv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1986 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1987 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1988 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1989 set_marker_both (old_buf->zv_marker, obuf, |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1990 BUF_ZV (old_buf), BUF_ZV_BYTE (old_buf)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1991 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1992 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1993 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1994 /* 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
|
1995 when it is not current, fetch them now. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1996 if (! NILP (b->pt_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1997 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1998 BUF_PT (b) = marker_position (b->pt_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1999 BUF_PT_BYTE (b) = marker_byte_position (b->pt_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
2000 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
2001 if (! NILP (b->begv_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
2002 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
2003 BUF_BEGV (b) = marker_position (b->begv_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
2004 BUF_BEGV_BYTE (b) = marker_byte_position (b->begv_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
2005 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
2006 if (! NILP (b->zv_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
2007 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
2008 BUF_ZV (b) = marker_position (b->zv_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
2009 BUF_ZV_BYTE (b) = marker_byte_position (b->zv_marker); |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
2010 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
2011 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
2012 |
333 | 2013 DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0, |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2014 doc: /* Make buffer BUFFER-OR-NAME current for editing operations. |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2015 BUFFER-OR-NAME may be a buffer or the name of an existing buffer. See |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2016 also `save-excursion' when you want to make a buffer current |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2017 temporarily. This function does not display the buffer, so its effect |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2018 ends when the current command terminates. Use `switch-to-buffer' or |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2019 `pop-to-buffer' to switch buffers permanently. */) |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2020 (buffer_or_name) |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2021 register Lisp_Object buffer_or_name; |
333 | 2022 { |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2023 register Lisp_Object buffer; |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2024 buffer = Fget_buffer (buffer_or_name); |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2025 if (NILP (buffer)) |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2026 nsberror (buffer_or_name); |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2027 if (NILP (XBUFFER (buffer)->name)) |
333 | 2028 error ("Selecting deleted buffer"); |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2029 set_buffer_internal (XBUFFER (buffer)); |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2030 return buffer; |
333 | 2031 } |
20698
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2032 |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2033 /* Set the current buffer to BUFFER provided it is alive. */ |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2034 |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2035 Lisp_Object |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2036 set_buffer_if_live (buffer) |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2037 Lisp_Object buffer; |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2038 { |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2039 if (! NILP (XBUFFER (buffer)->name)) |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2040 Fset_buffer (buffer); |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2041 return Qnil; |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2042 } |
333 | 2043 |
2044 DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only, | |
2045 Sbarf_if_buffer_read_only, 0, 0, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2046 doc: /* Signal a `buffer-read-only' error if the current buffer is read-only. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2047 () |
333 | 2048 { |
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
2049 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
|
2050 && NILP (Vinhibit_read_only)) |
71968
b0505e901bff
(Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents:
70931
diff
changeset
|
2051 xsignal1 (Qbuffer_read_only, Fcurrent_buffer ()); |
333 | 2052 return Qnil; |
2053 } | |
2054 | |
2055 DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "", | |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2056 doc: /* Put BUFFER-OR-NAME at the end of the list of all buffers. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2057 There it is the least likely candidate for `other-buffer' to return; |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2058 thus, the least likely buffer for \\[switch-to-buffer] to select by |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2059 default. |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2060 |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2061 The argument may be a buffer name or an actual buffer object. If |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2062 BUFFER-OR-NAME is nil or omitted, bury the current buffer and remove it |
99080
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
2063 from the selected window if it is displayed there. If the selected |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
2064 window is dedicated to its buffer, delete that window if there are other |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
2065 windows on the same frame. If the selected window is the only window on |
ccaba4c89996
(Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents:
98982
diff
changeset
|
2066 its frame, iconify that frame. */) |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2067 (buffer_or_name) |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2068 register Lisp_Object buffer_or_name; |
333 | 2069 { |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2070 Lisp_Object buffer; |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2071 |
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
2072 /* Figure out what buffer we're going to bury. */ |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2073 if (NILP (buffer_or_name)) |
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
2074 { |
39802
efbac46c874c
(Fbury_buffer): Don't try to remove the buffer from the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
2075 Lisp_Object tem; |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
2076 XSETBUFFER (buffer, current_buffer); |
18485
d6e8b92585e9
(Fbury_buffer): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18455
diff
changeset
|
2077 |
39802
efbac46c874c
(Fbury_buffer): Don't try to remove the buffer from the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
2078 tem = Fwindow_buffer (selected_window); |
18485
d6e8b92585e9
(Fbury_buffer): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18455
diff
changeset
|
2079 /* If we're burying the current buffer, unshow it. */ |
39802
efbac46c874c
(Fbury_buffer): Don't try to remove the buffer from the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
2080 if (EQ (buffer, tem)) |
40840
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
2081 { |
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
2082 if (NILP (Fwindow_dedicated_p (selected_window))) |
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
2083 Fswitch_to_buffer (Fother_buffer (buffer, Qnil, Qnil), Qnil); |
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
2084 else if (NILP (XWINDOW (selected_window)->parent)) |
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
2085 Ficonify_frame (Fwindow_frame (selected_window)); |
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
2086 else |
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
2087 Fdelete_window (selected_window); |
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
2088 } |
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
2089 } |
333 | 2090 else |
2091 { | |
98982
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2092 buffer = Fget_buffer (buffer_or_name); |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2093 if (NILP (buffer)) |
7ccc521ae6b1
(Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents:
98732
diff
changeset
|
2094 nsberror (buffer_or_name); |
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
2095 } |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
2096 |
28991
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2097 /* Move buffer to the end of the buffer list. Do nothing if the |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2098 buffer is killed. */ |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2099 if (!NILP (XBUFFER (buffer)->name)) |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2100 { |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2101 Lisp_Object aelt, link; |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2102 |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2103 aelt = Frassq (buffer, Vbuffer_alist); |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2104 link = Fmemq (aelt, Vbuffer_alist); |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2105 Vbuffer_alist = Fdelq (aelt, Vbuffer_alist); |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
2106 XSETCDR (link, Qnil); |
28991
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2107 Vbuffer_alist = nconc2 (Vbuffer_alist, link); |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2108 |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
2109 XFRAME (selected_frame)->buffer_list |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
2110 = Fdelq (buffer, XFRAME (selected_frame)->buffer_list); |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
2111 XFRAME (selected_frame)->buried_buffer_list |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
2112 = Fcons (buffer, Fdelq (buffer, XFRAME (selected_frame)->buried_buffer_list)); |
28991
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2113 } |
17234
bda734eef575
(Fbury_buffer): Call frames_bury_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
17220
diff
changeset
|
2114 |
333 | 2115 return Qnil; |
2116 } | |
2117 | |
1953
714df59790af
(Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents:
1952
diff
changeset
|
2118 DEFUN ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, "*", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2119 doc: /* Delete the entire contents of the current buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2120 Any narrowing restriction in effect (see `narrow-to-region') is removed, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2121 so the buffer is truly empty after this. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2122 () |
333 | 2123 { |
2124 Fwiden (); | |
26056
9c4556ef15de
(Fget_buffer_create, Fmake_indirect_buffer, Fkill_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
25744
diff
changeset
|
2125 |
9c4556ef15de
(Fget_buffer_create, Fmake_indirect_buffer, Fkill_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
25744
diff
changeset
|
2126 del_range (BEG, Z); |
25626
acfb741e6e24
(Ferase_buffer): Don't erase the minibuffer prompt.
Richard M. Stallman <rms@gnu.org>
parents:
25546
diff
changeset
|
2127 |
333 | 2128 current_buffer->last_window_start = 1; |
2129 /* Prevent warnings, or suspension of auto saving, that would happen | |
2130 if future size is less than past size. Use of erase-buffer | |
2131 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
|
2132 XSETFASTINT (current_buffer->save_length, 0); |
333 | 2133 return Qnil; |
2134 } | |
2135 | |
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
2136 void |
333 | 2137 validate_region (b, e) |
2138 register Lisp_Object *b, *e; | |
2139 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
2140 CHECK_NUMBER_COERCE_MARKER (*b); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
2141 CHECK_NUMBER_COERCE_MARKER (*e); |
333 | 2142 |
2143 if (XINT (*b) > XINT (*e)) | |
2144 { | |
9335
8cf58b38d244
(validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents:
9296
diff
changeset
|
2145 Lisp_Object tem; |
8cf58b38d244
(validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents:
9296
diff
changeset
|
2146 tem = *b; *b = *e; *e = tem; |
333 | 2147 } |
2148 | |
2149 if (!(BEGV <= XINT (*b) && XINT (*b) <= XINT (*e) | |
2150 && XINT (*e) <= ZV)) | |
2151 args_out_of_range (*b, *e); | |
2152 } | |
2153 | |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2154 /* Advance BYTE_POS up to a character boundary |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2155 and return the adjusted position. */ |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2156 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2157 static int |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2158 advance_to_char_boundary (byte_pos) |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2159 int byte_pos; |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2160 { |
21085
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2161 int c; |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2162 |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2163 if (byte_pos == BEG) |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2164 /* Beginning of buffer is always a character boundary. */ |
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
2165 return BEG; |
21085
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2166 |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2167 c = FETCH_BYTE (byte_pos); |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2168 if (! CHAR_HEAD_P (c)) |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2169 { |
25508 | 2170 /* We should advance BYTE_POS only when C is a constituent of a |
21085
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2171 multibyte sequence. */ |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2172 int orig_byte_pos = byte_pos; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2173 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2174 do |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2175 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2176 byte_pos--; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2177 c = FETCH_BYTE (byte_pos); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2178 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2179 while (! CHAR_HEAD_P (c) && byte_pos > BEG); |
21085
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2180 INC_POS (byte_pos); |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2181 if (byte_pos < orig_byte_pos) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2182 byte_pos = orig_byte_pos; |
21085
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2183 /* If C is a constituent of a multibyte sequence, BYTE_POS was |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2184 surely advance to the correct character boundary. If C is |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2185 not, BYTE_POS was unchanged. */ |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2186 } |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2187 |
20935
2fc5eb0799fe
(advance_to_char_boundary): Make the behaviour
Kenichi Handa <handa@m17n.org>
parents:
20868
diff
changeset
|
2188 return byte_pos; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2189 } |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2190 |
100673
01f68a925d12
* ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents:
100633
diff
changeset
|
2191 #ifdef REL_ALLOC |
100682
5616d3b5b959
(Fbuffer_swap_text): Use POINTER_TYPE.
Jason Rumney <jasonr@gnu.org>
parents:
100673
diff
changeset
|
2192 extern void r_alloc_reset_variable P_ ((POINTER_TYPE *, POINTER_TYPE *)); |
100673
01f68a925d12
* ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents:
100633
diff
changeset
|
2193 #endif /* REL_ALLOC */ |
01f68a925d12
* ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents:
100633
diff
changeset
|
2194 |
92215
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2195 DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text, |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2196 1, 1, 0, |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2197 doc: /* Swap the text between current buffer and BUFFER. */) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2198 (buffer) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2199 Lisp_Object buffer; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2200 { |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2201 struct buffer *other_buffer; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2202 CHECK_BUFFER (buffer); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2203 other_buffer = XBUFFER (buffer); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2204 |
100295
2ddd196a711d
(Fbuffer_swap_text): Signal error if swapping a dead buffer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99791
diff
changeset
|
2205 if (NILP (other_buffer->name)) |
2ddd196a711d
(Fbuffer_swap_text): Signal error if swapping a dead buffer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99791
diff
changeset
|
2206 error ("Cannot swap a dead buffer's text"); |
2ddd196a711d
(Fbuffer_swap_text): Signal error if swapping a dead buffer.
Chong Yidong <cyd@stupidchicken.com>
parents:
99791
diff
changeset
|
2207 |
92215
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2208 /* Actually, it probably works just fine. |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2209 * if (other_buffer == current_buffer) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2210 * error ("Cannot swap a buffer's text with itself"); */ |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2211 |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2212 /* Actually, this may be workable as well, tho probably only if they're |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2213 *both* indirect. */ |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2214 if (other_buffer->base_buffer |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2215 || current_buffer->base_buffer) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2216 error ("Cannot swap indirect buffers's text"); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2217 |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2218 { /* This is probably harder to make work. */ |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2219 struct buffer *other; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2220 for (other = all_buffers; other; other = other->next) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2221 if (other->base_buffer == other_buffer |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2222 || other->base_buffer == current_buffer) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2223 error ("One of the buffers to swap has indirect buffers"); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2224 } |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2225 |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2226 #define swapfield(field, type) \ |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2227 do { \ |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2228 type tmp##field = other_buffer->field; \ |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2229 other_buffer->field = current_buffer->field; \ |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2230 current_buffer->field = tmp##field; \ |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2231 } while (0) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2232 |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2233 swapfield (own_text, struct buffer_text); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2234 eassert (current_buffer->text == ¤t_buffer->own_text); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2235 eassert (other_buffer->text == &other_buffer->own_text); |
100673
01f68a925d12
* ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents:
100633
diff
changeset
|
2236 #ifdef REL_ALLOC |
100682
5616d3b5b959
(Fbuffer_swap_text): Use POINTER_TYPE.
Jason Rumney <jasonr@gnu.org>
parents:
100673
diff
changeset
|
2237 r_alloc_reset_variable ((POINTER_TYPE **) ¤t_buffer->own_text.beg, |
5616d3b5b959
(Fbuffer_swap_text): Use POINTER_TYPE.
Jason Rumney <jasonr@gnu.org>
parents:
100673
diff
changeset
|
2238 (POINTER_TYPE **) &other_buffer->own_text.beg); |
5616d3b5b959
(Fbuffer_swap_text): Use POINTER_TYPE.
Jason Rumney <jasonr@gnu.org>
parents:
100673
diff
changeset
|
2239 r_alloc_reset_variable ((POINTER_TYPE **) &other_buffer->own_text.beg, |
5616d3b5b959
(Fbuffer_swap_text): Use POINTER_TYPE.
Jason Rumney <jasonr@gnu.org>
parents:
100673
diff
changeset
|
2240 (POINTER_TYPE **) ¤t_buffer->own_text.beg); |
100673
01f68a925d12
* ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents:
100633
diff
changeset
|
2241 #endif /* REL_ALLOC */ |
01f68a925d12
* ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents:
100633
diff
changeset
|
2242 |
92215
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2243 swapfield (pt, EMACS_INT); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2244 swapfield (pt_byte, EMACS_INT); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2245 swapfield (begv, EMACS_INT); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2246 swapfield (begv_byte, EMACS_INT); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2247 swapfield (zv, EMACS_INT); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2248 swapfield (zv_byte, EMACS_INT); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2249 eassert (!current_buffer->base_buffer); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2250 eassert (!other_buffer->base_buffer); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2251 current_buffer->clip_changed = 1; other_buffer->clip_changed = 1; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2252 swapfield (newline_cache, struct region_cache *); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2253 swapfield (width_run_cache, struct region_cache *); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2254 current_buffer->prevent_redisplay_optimizations_p = 1; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2255 other_buffer->prevent_redisplay_optimizations_p = 1; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2256 swapfield (overlays_before, struct Lisp_Overlay *); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2257 swapfield (overlays_after, struct Lisp_Overlay *); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2258 swapfield (overlay_center, EMACS_INT); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2259 swapfield (undo_list, Lisp_Object); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2260 swapfield (mark, Lisp_Object); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2261 swapfield (enable_multibyte_characters, Lisp_Object); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2262 /* FIXME: Not sure what we should do with these *_marker fields. |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2263 Hopefully they're just nil anyway. */ |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2264 swapfield (pt_marker, Lisp_Object); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2265 swapfield (begv_marker, Lisp_Object); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2266 swapfield (zv_marker, Lisp_Object); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2267 current_buffer->point_before_scroll = Qnil; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2268 other_buffer->point_before_scroll = Qnil; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2269 |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2270 current_buffer->text->modiff++; other_buffer->text->modiff++; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2271 current_buffer->text->chars_modiff++; other_buffer->text->chars_modiff++; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2272 current_buffer->text->overlay_modiff++; other_buffer->text->overlay_modiff++; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2273 current_buffer->text->beg_unchanged = current_buffer->text->gpt; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2274 current_buffer->text->end_unchanged = current_buffer->text->gpt; |
99757
270d85d8daeb
(Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
99626
diff
changeset
|
2275 other_buffer->text->beg_unchanged = other_buffer->text->gpt; |
270d85d8daeb
(Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
99626
diff
changeset
|
2276 other_buffer->text->end_unchanged = other_buffer->text->gpt; |
92215
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2277 { |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2278 struct Lisp_Marker *m; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2279 for (m = BUF_MARKERS (current_buffer); m; m = m->next) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2280 if (m->buffer == other_buffer) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2281 m->buffer = current_buffer; |
99757
270d85d8daeb
(Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
99626
diff
changeset
|
2282 else |
270d85d8daeb
(Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
99626
diff
changeset
|
2283 /* Since there's no indirect buffer in sight, markers on |
270d85d8daeb
(Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
99626
diff
changeset
|
2284 BUF_MARKERS(buf) should either be for `buf' or dead. */ |
270d85d8daeb
(Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
99626
diff
changeset
|
2285 eassert (!m->buffer); |
92215
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2286 for (m = BUF_MARKERS (other_buffer); m; m = m->next) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2287 if (m->buffer == current_buffer) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2288 m->buffer = other_buffer; |
99757
270d85d8daeb
(Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
99626
diff
changeset
|
2289 else |
270d85d8daeb
(Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
99626
diff
changeset
|
2290 /* Since there's no indirect buffer in sight, markers on |
270d85d8daeb
(Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
99626
diff
changeset
|
2291 BUF_MARKERS(buf) should either be for `buf' or dead. */ |
270d85d8daeb
(Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
99626
diff
changeset
|
2292 eassert (!m->buffer); |
92215
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2293 } |
98070
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2294 { /* Some of the C code expects that w->buffer == w->pointm->buffer. |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2295 So since we just swapped the markers between the two buffers, we need |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2296 to undo the effect of this swap for window markers. */ |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2297 Lisp_Object w = Fselected_window (), ws = Qnil; |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2298 Lisp_Object buf1, buf2; |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2299 XSETBUFFER (buf1, current_buffer); XSETBUFFER (buf2, other_buffer); |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2300 |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2301 while (NILP (Fmemq (w, ws))) |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2302 { |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2303 ws = Fcons (w, ws); |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2304 if (MARKERP (XWINDOW (w)->pointm) |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2305 && (EQ (XWINDOW (w)->buffer, buf1) |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2306 || EQ (XWINDOW (w)->buffer, buf2))) |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2307 Fset_marker (XWINDOW (w)->pointm, |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2308 make_number (BUF_BEGV (XBUFFER (XWINDOW (w)->buffer))), |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2309 XWINDOW (w)->buffer); |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2310 w = Fnext_window (w, Qt, Qt); |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2311 } |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2312 } |
b0d74e2658b7
(Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
97810
diff
changeset
|
2313 |
92215
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2314 if (current_buffer->text->intervals) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2315 (eassert (EQ (current_buffer->text->intervals->up.obj, buffer)), |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2316 XSETBUFFER (current_buffer->text->intervals->up.obj, current_buffer)); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2317 if (other_buffer->text->intervals) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2318 (eassert (EQ (other_buffer->text->intervals->up.obj, Fcurrent_buffer ())), |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2319 XSETBUFFER (other_buffer->text->intervals->up.obj, other_buffer)); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2320 |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2321 return Qnil; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2322 } |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2323 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2324 DEFUN ("set-buffer-multibyte", Fset_buffer_multibyte, Sset_buffer_multibyte, |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2325 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2326 doc: /* Set the multibyte flag of the current buffer to FLAG. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2327 If FLAG is t, this makes the buffer a multibyte buffer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2328 If FLAG is nil, this makes the buffer a single-byte buffer. |
89483 | 2329 In these cases, the buffer contents remain unchanged as a sequence of |
2330 bytes but the contents viewed as characters do change. | |
2331 If FLAG is `to', this makes the buffer a multibyte buffer by changing | |
89909 | 2332 all eight-bit bytes to eight-bit characters. |
53816
0987c11386f1
(Fset_buffer_multibyte): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
53815
diff
changeset
|
2333 If the multibyte flag was really changed, undo information of the |
53815
004f4b57ea3f
(Fset_buffer_multibyte): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
53655
diff
changeset
|
2334 current buffer is cleared. */) |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2335 (flag) |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2336 Lisp_Object flag; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2337 { |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2338 struct Lisp_Marker *tail, *markers; |
24604
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
2339 struct buffer *other; |
51391
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2340 int begv, zv; |
51394
d1641e2dfc5b
(Fset_buffer_multibyte): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
51391
diff
changeset
|
2341 int narrowed = (BEG != BEGV || Z != ZV); |
29456
1aa0c1122f75
(Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents:
29380
diff
changeset
|
2342 int modified_p = !NILP (Fbuffer_modified_p (Qnil)); |
72486
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2343 Lisp_Object old_undo = current_buffer->undo_list; |
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2344 struct gcpro gcpro1; |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2345 |
24240
6ea9058180ec
(Fset_buffer_multibyte): Error if buffer is multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
23760
diff
changeset
|
2346 if (current_buffer->base_buffer) |
6ea9058180ec
(Fset_buffer_multibyte): Error if buffer is multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
23760
diff
changeset
|
2347 error ("Cannot do `set-buffer-multibyte' on an indirect buffer"); |
6ea9058180ec
(Fset_buffer_multibyte): Error if buffer is multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
23760
diff
changeset
|
2348 |
21506
a44f9f59c656
(Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
2349 /* Do nothing if nothing actually changes. */ |
a44f9f59c656
(Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
2350 if (NILP (flag) == NILP (current_buffer->enable_multibyte_characters)) |
a44f9f59c656
(Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
2351 return flag; |
a44f9f59c656
(Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
2352 |
72486
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2353 GCPRO1 (old_undo); |
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2354 |
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2355 /* Don't record these buffer changes. We will put a special undo entry |
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2356 instead. */ |
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2357 current_buffer->undo_list = Qt; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2358 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2359 /* If the cached position is for this buffer, clear it out. */ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2360 clear_charpos_cache (current_buffer); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2361 |
51391
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2362 if (NILP (flag)) |
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2363 begv = BEGV_BYTE, zv = ZV_BYTE; |
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2364 else |
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2365 begv = BEGV, zv = ZV; |
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2366 |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2367 if (narrowed) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2368 Fwiden (); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2369 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2370 if (NILP (flag)) |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2371 { |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2372 int pos, stop; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2373 unsigned char *p; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2374 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2375 /* Do this first, so it can use CHAR_TO_BYTE |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2376 to calculate the old correspondences. */ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2377 set_intervals_multibyte (0); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2378 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2379 current_buffer->enable_multibyte_characters = Qnil; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2380 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2381 Z = Z_BYTE; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2382 BEGV = BEGV_BYTE; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2383 ZV = ZV_BYTE; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2384 GPT = GPT_BYTE; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2385 TEMP_SET_PT_BOTH (PT_BYTE, PT_BYTE); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2386 |
55242
d57364949309
(syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents:
55140
diff
changeset
|
2387 |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2388 for (tail = BUF_MARKERS (current_buffer); tail; tail = tail->next) |
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2389 tail->charpos = tail->bytepos; |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2390 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2391 /* Convert multibyte form of 8-bit characters to unibyte. */ |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2392 pos = BEG; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2393 stop = GPT; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2394 p = BEG_ADDR; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2395 while (1) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2396 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2397 int c, bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2398 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2399 if (pos == stop) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2400 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2401 if (pos == Z) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2402 break; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2403 p = GAP_END_ADDR; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2404 stop = Z; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2405 } |
88354
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2406 if (ASCII_BYTE_P (*p)) |
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2407 p++, pos++; |
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2408 else if (CHAR_BYTE8_HEAD_P (*p)) |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2409 { |
88453
4e78ee207f40
(Fset_buffer_multibyte): Fix 8-bit char handling.
Kenichi Handa <handa@m17n.org>
parents:
88354
diff
changeset
|
2410 c = STRING_CHAR_AND_LENGTH (p, stop - pos, bytes); |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2411 /* Delete all bytes for this 8-bit character but the |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2412 last one, and change the last one to the charcter |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2413 code. */ |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2414 bytes--; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2415 del_range_2 (pos, pos, pos + bytes, pos + bytes, 0); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2416 p = GAP_END_ADDR; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2417 *p++ = c; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2418 pos++; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2419 if (begv > pos) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2420 begv -= bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2421 if (zv > pos) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2422 zv -= bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2423 stop = Z; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2424 } |
89483 | 2425 else |
88354
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2426 { |
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2427 bytes = BYTES_BY_CHAR_HEAD (*p); |
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2428 p += bytes, pos += bytes; |
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2429 } |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2430 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2431 if (narrowed) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2432 Fnarrow_to_region (make_number (begv), make_number (zv)); |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2433 } |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2434 else |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2435 { |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2436 int pt = PT; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2437 int pos, stop; |
88354
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2438 unsigned char *p, *pend; |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2439 |
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2440 /* Be sure not to have a multibyte sequence striding over the GAP. |
88354
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2441 Ex: We change this: "...abc\302 _GAP_ \241def..." |
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2442 to: "...abc _GAP_ \302\241def..." */ |
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2443 |
89483 | 2444 if (EQ (flag, Qt) |
88944
8628701201ae
(Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88547
diff
changeset
|
2445 && GPT_BYTE > 1 && GPT_BYTE < Z_BYTE |
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2446 && ! CHAR_HEAD_P (*(GAP_END_ADDR))) |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2447 { |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2448 unsigned char *p = GPT_ADDR - 1; |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2449 |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2450 while (! CHAR_HEAD_P (*p) && p > BEG_ADDR) p--; |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2451 if (BASE_LEADING_CODE_P (*p)) |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2452 { |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2453 int new_gpt = GPT_BYTE - (GPT_ADDR - p); |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2454 |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2455 move_gap_both (new_gpt, new_gpt); |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2456 } |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2457 } |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2458 |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2459 /* Make the buffer contents valid as multibyte by converting |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2460 8-bit characters to multibyte form. */ |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2461 pos = BEG; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2462 stop = GPT; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2463 p = BEG_ADDR; |
88354
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2464 pend = GPT_ADDR; |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2465 while (1) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2466 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2467 int bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2468 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2469 if (pos == stop) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2470 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2471 if (pos == Z) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2472 break; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2473 p = GAP_END_ADDR; |
88354
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2474 pend = Z_ADDR; |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2475 stop = Z; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2476 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
2477 |
88944
8628701201ae
(Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88547
diff
changeset
|
2478 if (ASCII_BYTE_P (*p)) |
8628701201ae
(Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88547
diff
changeset
|
2479 p++, pos++; |
89483 | 2480 else if (EQ (flag, Qt) && (bytes = MULTIBYTE_LENGTH (p, pend)) > 0) |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2481 p += bytes, pos += bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2482 else |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2483 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2484 unsigned char tmp[MAX_MULTIBYTE_LENGTH]; |
88944
8628701201ae
(Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88547
diff
changeset
|
2485 int c; |
8628701201ae
(Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88547
diff
changeset
|
2486 |
89483 | 2487 c = BYTE8_TO_CHAR (*p); |
88507
e3a506b5f300
(Fset_buffer_multibyte): Convert 8-bit bytes to
Kenichi Handa <handa@m17n.org>
parents:
88453
diff
changeset
|
2488 bytes = CHAR_STRING (c, tmp); |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2489 *p = tmp[0]; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2490 TEMP_SET_PT_BOTH (pos + 1, pos + 1); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2491 bytes--; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2492 insert_1_both (tmp + 1, bytes, bytes, 1, 0, 0); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2493 /* Now the gap is after the just inserted data. */ |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2494 pos = GPT; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2495 p = GAP_END_ADDR; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2496 if (pos <= begv) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2497 begv += bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2498 if (pos <= zv) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2499 zv += bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2500 if (pos <= pt) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2501 pt += bytes; |
88453
4e78ee207f40
(Fset_buffer_multibyte): Fix 8-bit char handling.
Kenichi Handa <handa@m17n.org>
parents:
88354
diff
changeset
|
2502 pend = Z_ADDR; |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2503 stop = Z; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2504 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2505 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2506 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2507 if (pt != PT) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2508 TEMP_SET_PT (pt); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2509 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2510 if (narrowed) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2511 Fnarrow_to_region (make_number (begv), make_number (zv)); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2512 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2513 /* Do this first, so that chars_in_text asks the right question. |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2514 set_intervals_multibyte needs it too. */ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2515 current_buffer->enable_multibyte_characters = Qt; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2516 |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2517 GPT_BYTE = advance_to_char_boundary (GPT_BYTE); |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2518 GPT = chars_in_text (BEG_ADDR, GPT_BYTE - BEG_BYTE) + BEG; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2519 |
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2520 Z = chars_in_text (GAP_END_ADDR, Z_BYTE - GPT_BYTE) + GPT; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2521 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2522 BEGV_BYTE = advance_to_char_boundary (BEGV_BYTE); |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2523 if (BEGV_BYTE > GPT_BYTE) |
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2524 BEGV = chars_in_text (GAP_END_ADDR, BEGV_BYTE - GPT_BYTE) + GPT; |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2525 else |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2526 BEGV = chars_in_text (BEG_ADDR, BEGV_BYTE - BEG_BYTE) + BEG; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2527 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2528 ZV_BYTE = advance_to_char_boundary (ZV_BYTE); |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2529 if (ZV_BYTE > GPT_BYTE) |
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2530 ZV = chars_in_text (GAP_END_ADDR, ZV_BYTE - GPT_BYTE) + GPT; |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2531 else |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2532 ZV = chars_in_text (BEG_ADDR, ZV_BYTE - BEG_BYTE) + BEG; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2533 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2534 { |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2535 int pt_byte = advance_to_char_boundary (PT_BYTE); |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2536 int pt; |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2537 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2538 if (pt_byte > GPT_BYTE) |
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2539 pt = chars_in_text (GAP_END_ADDR, pt_byte - GPT_BYTE) + GPT; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2540 else |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2541 pt = chars_in_text (BEG_ADDR, pt_byte - BEG_BYTE) + BEG; |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2542 TEMP_SET_PT_BOTH (pt, pt_byte); |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2543 } |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2544 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2545 tail = markers = BUF_MARKERS (current_buffer); |
22021 | 2546 |
2547 /* This prevents BYTE_TO_CHAR (that is, buf_bytepos_to_charpos) from | |
2548 getting confused by the markers that have not yet been updated. | |
2549 It is also a signal that it should never create a marker. */ | |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2550 BUF_MARKERS (current_buffer) = NULL; |
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2551 |
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2552 for (; tail; tail = tail->next) |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2553 { |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2554 tail->bytepos = advance_to_char_boundary (tail->bytepos); |
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2555 tail->charpos = BYTE_TO_CHAR (tail->bytepos); |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2556 } |
22023
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2557 |
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2558 /* Make sure no markers were put on the chain |
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2559 while the chain value was incorrect. */ |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2560 if (BUF_MARKERS (current_buffer)) |
22023
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2561 abort (); |
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2562 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2563 BUF_MARKERS (current_buffer) = markers; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2564 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2565 /* Do this last, so it can calculate the new correspondences |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2566 between chars and bytes. */ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2567 set_intervals_multibyte (1); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2568 } |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2569 |
72486
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2570 if (!EQ (old_undo, Qt)) |
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2571 { |
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2572 /* Represent all the above changes by a special undo entry. */ |
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2573 extern Lisp_Object Qapply; |
72532
71e0aa245bce
(Fset_buffer_multibyte): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents:
72524
diff
changeset
|
2574 current_buffer->undo_list = Fcons (list3 (Qapply, |
71e0aa245bce
(Fset_buffer_multibyte): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents:
72524
diff
changeset
|
2575 intern ("set-buffer-multibyte"), |
71e0aa245bce
(Fset_buffer_multibyte): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents:
72524
diff
changeset
|
2576 NILP (flag) ? Qt : Qnil), |
71e0aa245bce
(Fset_buffer_multibyte): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents:
72524
diff
changeset
|
2577 old_undo); |
72486
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2578 } |
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2579 |
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2580 UNGCPRO; |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2581 |
26970
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2582 /* Changing the multibyteness of a buffer means that all windows |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2583 showing that buffer must be updated thoroughly. */ |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2584 current_buffer->prevent_redisplay_optimizations_p = 1; |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2585 ++windows_or_buffers_changed; |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2586 |
24604
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
2587 /* Copy this buffer's new multibyte status |
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
2588 into all of its indirect buffers. */ |
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
2589 for (other = all_buffers; other; other = other->next) |
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
2590 if (other->base_buffer == current_buffer && !NILP (other->name)) |
26970
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2591 { |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2592 other->enable_multibyte_characters |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2593 = current_buffer->enable_multibyte_characters; |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2594 other->prevent_redisplay_optimizations_p = 1; |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2595 } |
24604
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
2596 |
29456
1aa0c1122f75
(Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents:
29380
diff
changeset
|
2597 /* Restore the modifiedness of the buffer. */ |
1aa0c1122f75
(Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents:
29380
diff
changeset
|
2598 if (!modified_p && !NILP (Fbuffer_modified_p (Qnil))) |
1aa0c1122f75
(Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents:
29380
diff
changeset
|
2599 Fset_buffer_modified_p (Qnil); |
1aa0c1122f75
(Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents:
29380
diff
changeset
|
2600 |
49974
3420da3e4b0f
(Fset_buffer_multibyte): Pay attention to the buffer
Kenichi Handa <handa@m17n.org>
parents:
49664
diff
changeset
|
2601 #ifdef subprocesses |
49664
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2602 /* Update coding systems of this buffer's process (if any). */ |
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2603 { |
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2604 Lisp_Object process; |
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2605 |
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2606 process = Fget_buffer_process (Fcurrent_buffer ()); |
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2607 if (PROCESSP (process)) |
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2608 setup_process_coding_systems (process); |
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2609 } |
49974
3420da3e4b0f
(Fset_buffer_multibyte): Pay attention to the buffer
Kenichi Handa <handa@m17n.org>
parents:
49664
diff
changeset
|
2610 #endif /* subprocesses */ |
49664
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2611 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2612 return flag; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2613 } |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2614 |
333 | 2615 DEFUN ("kill-all-local-variables", Fkill_all_local_variables, Skill_all_local_variables, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
2616 0, 0, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2617 doc: /* Switch to Fundamental mode by killing current buffer's local variables. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2618 Most local variable bindings are eliminated so that the default values |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2619 become effective once more. Also, the syntax table is set from |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2620 `standard-syntax-table', the local keymap is set to nil, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2621 and the abbrev table from `fundamental-mode-abbrev-table'. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2622 This function also forces redisplay of the mode line. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2623 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2624 Every function to select a new major mode starts by |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2625 calling this function. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2626 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2627 As a special exception, local variables whose names have |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2628 a non-nil `permanent-local' property are not eliminated by this function. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2629 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2630 The first thing this function does is run |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2631 the normal hook `change-major-mode-hook'. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2632 () |
333 | 2633 { |
6205
88e41d7d1e27
(Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents:
6169
diff
changeset
|
2634 if (!NILP (Vrun_hooks)) |
72299
e97bfa736263
* buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents:
71968
diff
changeset
|
2635 call1 (Vrun_hooks, Qchange_major_mode_hook); |
87218
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
2636 |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
2637 /* Make sure none of the bindings in local_var_alist |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2638 remain swapped in, in their symbols. */ |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2639 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2640 swap_out_buffer_local_variables (current_buffer); |
333 | 2641 |
2642 /* Actually eliminate all local bindings of this buffer. */ | |
2643 | |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
2644 reset_buffer_local_variables (current_buffer, 0); |
333 | 2645 |
2646 /* Force mode-line redisplay. Useful here because all major mode | |
2647 commands call this function. */ | |
2648 update_mode_lines++; | |
2649 | |
2650 return Qnil; | |
2651 } | |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2652 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2653 /* 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
|
2654 for their current values. */ |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2655 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2656 static void |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2657 swap_out_buffer_local_variables (b) |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2658 struct buffer *b; |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2659 { |
104280
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
2660 Lisp_Object oalist, alist, sym, buffer; |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2661 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2662 XSETBUFFER (buffer, b); |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2663 oalist = b->local_var_alist; |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2664 |
85328
d0d527210b0c
* lisp.h (enum Lisp_Misc_Type): Del Lisp_Misc_Some_Buffer_Local_Value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85296
diff
changeset
|
2665 for (alist = oalist; CONSP (alist); alist = XCDR (alist)) |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2666 { |
104280
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
2667 if (CONSP (XCAR (alist)) |
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
2668 && (sym = XCAR (XCAR (alist)), SYMBOLP (sym)) |
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
2669 /* Need not do anything if some other buffer's binding is |
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
2670 now encached. */ |
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
2671 && EQ (XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->buffer, |
52ff955e0cc5
* buffer.c (set_buffer_internal_1)
Chong Yidong <cyd@stupidchicken.com>
parents:
103917
diff
changeset
|
2672 buffer)) |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2673 { |
86230
79043dac5524
(Fbuffer_local_value): Remove redundant test.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85328
diff
changeset
|
2674 /* Symbol is set up for this buffer's old local value: |
79043dac5524
(Fbuffer_local_value): Remove redundant test.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85328
diff
changeset
|
2675 swap it out! */ |
79043dac5524
(Fbuffer_local_value): Remove redundant test.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85328
diff
changeset
|
2676 swap_in_global_binding (sym); |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2677 } |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2678 } |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2679 } |
333 | 2680 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2681 /* Find all the overlays in the current buffer that contain position POS. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
2682 Return the number found, and store them in a vector in *VEC_PTR. |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2683 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
|
2684 Store in *NEXT_PTR the next position after POS where an overlay starts, |
70697
d6f5b85d7429
(Fprevious_overlay_change, Fnext_overlay_change): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
69154
diff
changeset
|
2685 or ZV if there are no more overlays between POS and ZV. |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2686 Store in *PREV_PTR the previous position before POS where an overlay ends, |
25184
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2687 or where an overlay starts which ends at or after POS; |
70697
d6f5b85d7429
(Fprevious_overlay_change, Fnext_overlay_change): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
69154
diff
changeset
|
2688 or BEGV if there are no such overlays from BEGV to POS. |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2689 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
|
2690 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2691 *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
|
2692 when this function is called. |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2693 |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2694 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
|
2695 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
|
2696 and we store only as many overlays as will fit. |
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2697 But we still return the total number of overlays. |
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2698 |
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2699 If CHANGE_REQ is true, then any position written into *PREV_PTR or |
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2700 *NEXT_PTR is guaranteed to be not equal to POS, unless it is the |
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2701 default (BEGV or ZV). */ |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2702 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2703 int |
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2704 overlays_at (pos, extend, vec_ptr, len_ptr, next_ptr, prev_ptr, change_req) |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
2705 EMACS_INT pos; |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2706 int extend; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2707 Lisp_Object **vec_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2708 int *len_ptr; |
92237
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92215
diff
changeset
|
2709 EMACS_INT *next_ptr; |
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92215
diff
changeset
|
2710 EMACS_INT *prev_ptr; |
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2711 int change_req; |
333 | 2712 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2713 Lisp_Object overlay, start, end; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2714 struct Lisp_Overlay *tail; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2715 int idx = 0; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2716 int len = *len_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2717 Lisp_Object *vec = *vec_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2718 int next = ZV; |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2719 int prev = BEGV; |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2720 int inhibit_storing = 0; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2721 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2722 for (tail = current_buffer->overlays_before; tail; tail = tail->next) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2723 { |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2724 int startpos, endpos; |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2725 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2726 XSETMISC (overlay, tail); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2727 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2728 start = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2729 end = OVERLAY_END (overlay); |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2730 endpos = OVERLAY_POSITION (end); |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2731 if (endpos < pos) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2732 { |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2733 if (prev < endpos) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2734 prev = endpos; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2735 break; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2736 } |
25184
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2737 startpos = OVERLAY_POSITION (start); |
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2738 /* This one ends at or after POS |
25205
14269f6d315b
(Fprevious_overlay_change): Just return the answer obtained from overlays_at.
Richard M. Stallman <rms@gnu.org>
parents:
25184
diff
changeset
|
2739 so its start counts for PREV_PTR if it's before POS. */ |
25184
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2740 if (prev < startpos && startpos < pos) |
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2741 prev = startpos; |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2742 if (endpos == pos) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2743 continue; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2744 if (startpos <= pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2745 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2746 if (idx == len) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2747 { |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2748 /* The supplied vector is full. |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2749 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
|
2750 if (extend) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2751 { |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2752 /* Make it work with an initial len == 0. */ |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2753 len *= 2; |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2754 if (len == 0) |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2755 len = 4; |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2756 *len_ptr = len; |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2757 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
|
2758 *vec_ptr = vec; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2759 } |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2760 else |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2761 inhibit_storing = 1; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2762 } |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2763 |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2764 if (!inhibit_storing) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2765 vec[idx] = overlay; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2766 /* 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
|
2767 idx++; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2768 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2769 else if (startpos < next) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2770 next = startpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2771 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2772 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2773 for (tail = current_buffer->overlays_after; tail; tail = tail->next) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2774 { |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2775 int startpos, endpos; |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2776 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2777 XSETMISC (overlay, tail); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2778 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2779 start = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2780 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2781 startpos = OVERLAY_POSITION (start); |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2782 if (pos < startpos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2783 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2784 if (startpos < next) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2785 next = startpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2786 break; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2787 } |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2788 endpos = OVERLAY_POSITION (end); |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2789 if (pos < endpos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2790 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2791 if (idx == len) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2792 { |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2793 if (extend) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2794 { |
46920
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2795 /* Make it work with an initial len == 0. */ |
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2796 len *= 2; |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2797 if (len == 0) |
46920
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2798 len = 4; |
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2799 *len_ptr = len; |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2800 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
|
2801 *vec_ptr = vec; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2802 } |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2803 else |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2804 inhibit_storing = 1; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2805 } |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2806 |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2807 if (!inhibit_storing) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2808 vec[idx] = overlay; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2809 idx++; |
25184
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2810 |
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2811 if (startpos < pos && startpos > prev) |
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2812 prev = startpos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2813 } |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2814 else if (endpos < pos && endpos > prev) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2815 prev = endpos; |
32856
5fe3b3dc5dd9
(overlays_at): Only let CHANGE_REQ inhibit an assignment of startpos to
Miles Bader <miles@gnu.org>
parents:
31886
diff
changeset
|
2816 else if (endpos == pos && startpos > prev |
5fe3b3dc5dd9
(overlays_at): Only let CHANGE_REQ inhibit an assignment of startpos to
Miles Bader <miles@gnu.org>
parents:
31886
diff
changeset
|
2817 && (!change_req || startpos < pos)) |
25184
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2818 prev = startpos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2819 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2820 |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2821 if (next_ptr) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2822 *next_ptr = next; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2823 if (prev_ptr) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2824 *prev_ptr = prev; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2825 return idx; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2826 } |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2827 |
92975
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2828 /* Find all the overlays in the current buffer that overlap the range |
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2829 BEG-END, or are empty at BEG, or are empty at END provided END |
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2830 denotes the position at the end of the current buffer. |
12488
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2831 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
2832 Return the number found, and store them in a vector in *VEC_PTR. |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2833 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
|
2834 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
|
2835 or ZV if there are no more overlays. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2836 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
|
2837 or BEGV if there are no previous overlays. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2838 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
|
2839 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2840 *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
|
2841 when this function is called. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2842 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2843 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
|
2844 If EXTEND is zero, we never extend the vector, |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2845 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
|
2846 But we still return the total number of overlays. */ |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2847 |
50304
d9d826db650f
(overlays_in): Declare static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50014
diff
changeset
|
2848 static int |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2849 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
|
2850 int beg, end; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2851 int extend; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2852 Lisp_Object **vec_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2853 int *len_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2854 int *next_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2855 int *prev_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2856 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2857 Lisp_Object overlay, ostart, oend; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2858 struct Lisp_Overlay *tail; |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2859 int idx = 0; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2860 int len = *len_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2861 Lisp_Object *vec = *vec_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2862 int next = ZV; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2863 int prev = BEGV; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2864 int inhibit_storing = 0; |
92975
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2865 int end_is_Z = end == Z; |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2866 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2867 for (tail = current_buffer->overlays_before; tail; tail = tail->next) |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2868 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2869 int startpos, endpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2870 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2871 XSETMISC (overlay, tail); |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2872 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2873 ostart = OVERLAY_START (overlay); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2874 oend = OVERLAY_END (overlay); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2875 endpos = OVERLAY_POSITION (oend); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2876 if (endpos < beg) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2877 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2878 if (prev < endpos) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2879 prev = endpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2880 break; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2881 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2882 startpos = OVERLAY_POSITION (ostart); |
92975
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2883 /* Count an interval if it overlaps the range, is empty at the |
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2884 start of the range, or is empty at END provided END denotes the |
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2885 end of the buffer. */ |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2886 if ((beg < endpos && startpos < end) |
92975
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2887 || (startpos == endpos |
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2888 && (beg == endpos || (end_is_Z && endpos == end)))) |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2889 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2890 if (idx == len) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2891 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2892 /* The supplied vector is full. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2893 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
|
2894 if (extend) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2895 { |
46920
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2896 /* Make it work with an initial len == 0. */ |
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2897 len *= 2; |
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2898 if (len == 0) |
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2899 len = 4; |
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2900 *len_ptr = len; |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2901 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2902 *vec_ptr = vec; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2903 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2904 else |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2905 inhibit_storing = 1; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2906 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2907 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2908 if (!inhibit_storing) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2909 vec[idx] = overlay; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2910 /* 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
|
2911 idx++; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2912 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2913 else if (startpos < next) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2914 next = startpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2915 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2916 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2917 for (tail = current_buffer->overlays_after; tail; tail = tail->next) |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2918 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2919 int startpos, endpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2920 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2921 XSETMISC (overlay, tail); |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2922 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2923 ostart = OVERLAY_START (overlay); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2924 oend = OVERLAY_END (overlay); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2925 startpos = OVERLAY_POSITION (ostart); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2926 if (end < startpos) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2927 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2928 if (startpos < next) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2929 next = startpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2930 break; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2931 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2932 endpos = OVERLAY_POSITION (oend); |
92975
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2933 /* Count an interval if it overlaps the range, is empty at the |
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2934 start of the range, or is empty at END provided END denotes the |
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2935 end of the buffer. */ |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2936 if ((beg < endpos && startpos < end) |
92975
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2937 || (startpos == endpos |
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2938 && (beg == endpos || (end_is_Z && endpos == end)))) |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2939 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2940 if (idx == len) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2941 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2942 if (extend) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2943 { |
46920
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2944 /* Make it work with an initial len == 0. */ |
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2945 len *= 2; |
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2946 if (len == 0) |
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2947 len = 4; |
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2948 *len_ptr = len; |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2949 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2950 *vec_ptr = vec; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2951 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2952 else |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2953 inhibit_storing = 1; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2954 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2955 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2956 if (!inhibit_storing) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2957 vec[idx] = overlay; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2958 idx++; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2959 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2960 else if (endpos < beg && endpos > prev) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2961 prev = endpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2962 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2963 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2964 if (next_ptr) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2965 *next_ptr = next; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2966 if (prev_ptr) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2967 *prev_ptr = prev; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2968 return idx; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2969 } |
36584
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2970 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2971 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2972 /* Return non-zero if there exists an overlay with a non-nil |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2973 `mouse-face' property overlapping OVERLAY. */ |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2974 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2975 int |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2976 mouse_face_overlay_overlaps (overlay) |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2977 Lisp_Object overlay; |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2978 { |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2979 int start = OVERLAY_POSITION (OVERLAY_START (overlay)); |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2980 int end = OVERLAY_POSITION (OVERLAY_END (overlay)); |
37463
7db9a70334b7
(mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents:
37011
diff
changeset
|
2981 int n, i, size; |
36584
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2982 Lisp_Object *v, tem; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
2983 |
37463
7db9a70334b7
(mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents:
37011
diff
changeset
|
2984 size = 10; |
7db9a70334b7
(mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents:
37011
diff
changeset
|
2985 v = (Lisp_Object *) alloca (size * sizeof *v); |
7db9a70334b7
(mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents:
37011
diff
changeset
|
2986 n = overlays_in (start, end, 0, &v, &size, NULL, NULL); |
7db9a70334b7
(mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents:
37011
diff
changeset
|
2987 if (n > size) |
36584
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2988 { |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2989 v = (Lisp_Object *) alloca (n * sizeof *v); |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2990 overlays_in (start, end, 0, &v, &n, NULL, NULL); |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2991 } |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2992 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2993 for (i = 0; i < n; ++i) |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2994 if (!EQ (v[i], overlay) |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2995 && (tem = Foverlay_get (overlay, Qmouse_face), |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2996 !NILP (tem))) |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2997 break; |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2998 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2999 return i < n; |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
3000 } |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
3001 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
3002 |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3003 |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3004 /* 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
|
3005 int |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3006 overlay_touches_p (pos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3007 int pos; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3008 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3009 Lisp_Object overlay; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3010 struct Lisp_Overlay *tail; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3011 |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3012 for (tail = current_buffer->overlays_before; tail; tail = tail->next) |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3013 { |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3014 int endpos; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3015 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3016 XSETMISC (overlay ,tail); |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90918
diff
changeset
|
3017 if (!OVERLAYP (overlay)) |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3018 abort (); |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3019 |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3020 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3021 if (endpos < pos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3022 break; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3023 if (endpos == pos || OVERLAY_POSITION (OVERLAY_START (overlay)) == pos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3024 return 1; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3025 } |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3026 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3027 for (tail = current_buffer->overlays_after; tail; tail = tail->next) |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3028 { |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3029 int startpos; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3030 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3031 XSETMISC (overlay, tail); |
90970
3371fc48749b
Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
90918
diff
changeset
|
3032 if (!OVERLAYP (overlay)) |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3033 abort (); |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3034 |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3035 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3036 if (pos < startpos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3037 break; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3038 if (startpos == pos || OVERLAY_POSITION (OVERLAY_END (overlay)) == pos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3039 return 1; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3040 } |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3041 return 0; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
3042 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3043 |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3044 struct sortvec |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3045 { |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3046 Lisp_Object overlay; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3047 int beg, end; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3048 int priority; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3049 }; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3050 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3051 static int |
21514 | 3052 compare_overlays (v1, v2) |
3053 const void *v1, *v2; | |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3054 { |
21514 | 3055 const struct sortvec *s1 = (const struct sortvec *) v1; |
3056 const struct sortvec *s2 = (const struct sortvec *) v2; | |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3057 if (s1->priority != s2->priority) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3058 return s1->priority - s2->priority; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3059 if (s1->beg != s2->beg) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3060 return s1->beg - s2->beg; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3061 if (s1->end != s2->end) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3062 return s2->end - s1->end; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3063 return 0; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3064 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3065 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3066 /* 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
|
3067 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
|
3068 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
|
3069 int |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3070 sort_overlays (overlay_vec, noverlays, w) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3071 Lisp_Object *overlay_vec; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3072 int noverlays; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3073 struct window *w; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3074 { |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3075 int i, j; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3076 struct sortvec *sortvec; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3077 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
|
3078 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3079 /* 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
|
3080 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3081 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
|
3082 { |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3083 Lisp_Object tem; |
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3084 Lisp_Object overlay; |
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3085 |
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3086 overlay = overlay_vec[i]; |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3087 if (OVERLAY_VALID (overlay) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3088 && OVERLAY_POSITION (OVERLAY_START (overlay)) > 0 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3089 && OVERLAY_POSITION (OVERLAY_END (overlay)) > 0) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3090 { |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3091 /* 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
|
3092 overlays that are limited to some other window. */ |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3093 if (w) |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3094 { |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3095 Lisp_Object window; |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3096 |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3097 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
|
3098 if (WINDOWP (window) && XWINDOW (window) != w) |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3099 continue; |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3100 } |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3101 |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3102 /* 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
|
3103 sortvec[j].overlay = overlay; |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3104 sortvec[j].beg = OVERLAY_POSITION (OVERLAY_START (overlay)); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3105 sortvec[j].end = OVERLAY_POSITION (OVERLAY_END (overlay)); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3106 tem = Foverlay_get (overlay, Qpriority); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3107 if (INTEGERP (tem)) |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3108 sortvec[j].priority = XINT (tem); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3109 else |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3110 sortvec[j].priority = 0; |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3111 j++; |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3112 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3113 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3114 noverlays = j; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3115 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3116 /* 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
|
3117 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3118 if (noverlays > 1) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3119 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
|
3120 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3121 for (i = 0; i < noverlays; i++) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3122 overlay_vec[i] = sortvec[i].overlay; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3123 return (noverlays); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3124 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3125 |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3126 struct sortstr |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3127 { |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3128 Lisp_Object string, string2; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3129 int size; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3130 int priority; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3131 }; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3132 |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3133 struct sortstrlist |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3134 { |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3135 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
|
3136 int size; /* Allocated length of that array. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3137 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
|
3138 int bytes; /* Total length of the strings in buf. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3139 }; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3140 |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3141 /* Buffers for storing information about the overlays touching a given |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3142 position. These could be automatic variables in overlay_strings, but |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3143 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
|
3144 allocating and freeing it. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3145 static struct sortstrlist overlay_heads, overlay_tails; |
18526
e0d1b341124c
(overlay_str_buf): Declare as unsigned char *.
Richard M. Stallman <rms@gnu.org>
parents:
18495
diff
changeset
|
3146 static unsigned char *overlay_str_buf; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3147 |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3148 /* Allocated length of overlay_str_buf. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3149 static int overlay_str_len; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3150 |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3151 /* A comparison function suitable for passing to qsort. */ |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3152 static int |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3153 cmp_for_strings (as1, as2) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3154 char *as1, *as2; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3155 { |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3156 struct sortstr *s1 = (struct sortstr *)as1; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3157 struct sortstr *s2 = (struct sortstr *)as2; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3158 if (s1->size != s2->size) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3159 return s2->size - s1->size; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3160 if (s1->priority != s2->priority) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3161 return s1->priority - s2->priority; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3162 return 0; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3163 } |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3164 |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3165 static void |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3166 record_overlay_string (ssl, str, str2, pri, size) |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3167 struct sortstrlist *ssl; |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3168 Lisp_Object str, str2, pri; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3169 int size; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3170 { |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3171 int nbytes; |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3172 |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3173 if (ssl->used == ssl->size) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3174 { |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3175 if (ssl->buf) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3176 ssl->size *= 2; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3177 else |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3178 ssl->size = 5; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3179 ssl->buf = ((struct sortstr *) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3180 xrealloc (ssl->buf, ssl->size * sizeof (struct sortstr))); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3181 } |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3182 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
|
3183 ssl->buf[ssl->used].string2 = str2; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3184 ssl->buf[ssl->used].size = size; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3185 ssl->buf[ssl->used].priority = (INTEGERP (pri) ? XINT (pri) : 0); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3186 ssl->used++; |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3187 |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3188 if (NILP (current_buffer->enable_multibyte_characters)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3189 nbytes = SCHARS (str); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3190 else if (! STRING_MULTIBYTE (str)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3191 nbytes = count_size_as_multibyte (SDATA (str), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3192 SBYTES (str)); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3193 else |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3194 nbytes = SBYTES (str); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3195 |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3196 ssl->bytes += nbytes; |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3197 |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3198 if (STRINGP (str2)) |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3199 { |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3200 if (NILP (current_buffer->enable_multibyte_characters)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3201 nbytes = SCHARS (str2); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3202 else if (! STRING_MULTIBYTE (str2)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3203 nbytes = count_size_as_multibyte (SDATA (str2), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3204 SBYTES (str2)); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3205 else |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3206 nbytes = SBYTES (str2); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3207 |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3208 ssl->bytes += nbytes; |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3209 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3210 } |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3211 |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3212 /* 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
|
3213 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
|
3214 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
|
3215 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
|
3216 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
|
3217 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
|
3218 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
|
3219 |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3220 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
|
3221 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
|
3222 subsequent calls. */ |
16243
b311d8755530
(overlay_strings): Declare pstr using unsigned char.
Richard M. Stallman <rms@gnu.org>
parents:
16213
diff
changeset
|
3223 |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3224 int |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3225 overlay_strings (pos, w, pstr) |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3226 EMACS_INT pos; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3227 struct window *w; |
16243
b311d8755530
(overlay_strings): Declare pstr using unsigned char.
Richard M. Stallman <rms@gnu.org>
parents:
16213
diff
changeset
|
3228 unsigned char **pstr; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3229 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3230 Lisp_Object overlay, window, str; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3231 struct Lisp_Overlay *ov; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3232 int startpos, endpos; |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3233 int multibyte = ! NILP (current_buffer->enable_multibyte_characters); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3234 |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3235 overlay_heads.used = overlay_heads.bytes = 0; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3236 overlay_tails.used = overlay_tails.bytes = 0; |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3237 for (ov = current_buffer->overlays_before; ov; ov = ov->next) |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3238 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3239 XSETMISC (overlay, ov); |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3240 eassert (OVERLAYP (overlay)); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3241 |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3242 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3243 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3244 if (endpos < pos) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3245 break; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3246 if (endpos != pos && startpos != pos) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3247 continue; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3248 window = Foverlay_get (overlay, Qwindow); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3249 if (WINDOWP (window) && XWINDOW (window) != w) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3250 continue; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3251 if (startpos == pos |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3252 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3253 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
|
3254 (startpos == endpos |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3255 ? 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
|
3256 : Qnil), |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3257 Foverlay_get (overlay, Qpriority), |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3258 endpos - startpos); |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3259 else if (endpos == pos |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3260 && (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
|
3261 record_overlay_string (&overlay_tails, str, Qnil, |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3262 Foverlay_get (overlay, Qpriority), |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3263 endpos - startpos); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3264 } |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3265 for (ov = current_buffer->overlays_after; ov; ov = ov->next) |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3266 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3267 XSETMISC (overlay, ov); |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3268 eassert (OVERLAYP (overlay)); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3269 |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3270 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3271 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3272 if (startpos > pos) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3273 break; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3274 if (endpos != pos && startpos != pos) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3275 continue; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3276 window = Foverlay_get (overlay, Qwindow); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3277 if (WINDOWP (window) && XWINDOW (window) != w) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3278 continue; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3279 if (startpos == pos |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3280 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3281 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
|
3282 (startpos == endpos |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3283 ? 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
|
3284 : Qnil), |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3285 Foverlay_get (overlay, Qpriority), |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3286 endpos - startpos); |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3287 else if (endpos == pos |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3288 && (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
|
3289 record_overlay_string (&overlay_tails, str, Qnil, |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3290 Foverlay_get (overlay, Qpriority), |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3291 endpos - startpos); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3292 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3293 if (overlay_tails.used > 1) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3294 qsort (overlay_tails.buf, overlay_tails.used, sizeof (struct sortstr), |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3295 cmp_for_strings); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3296 if (overlay_heads.used > 1) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3297 qsort (overlay_heads.buf, overlay_heads.used, sizeof (struct sortstr), |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3298 cmp_for_strings); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3299 if (overlay_heads.bytes || overlay_tails.bytes) |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3300 { |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3301 Lisp_Object tem; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3302 int i; |
18603
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
3303 unsigned char *p; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3304 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
|
3305 |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3306 if (total > overlay_str_len) |
18603
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
3307 { |
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
3308 overlay_str_len = total; |
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
3309 overlay_str_buf = (unsigned char *)xrealloc (overlay_str_buf, |
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
3310 total); |
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
3311 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3312 p = overlay_str_buf; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3313 for (i = overlay_tails.used; --i >= 0;) |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3314 { |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3315 int nbytes; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3316 tem = overlay_tails.buf[i].string; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3317 nbytes = copy_text (SDATA (tem), p, |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3318 SBYTES (tem), |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3319 STRING_MULTIBYTE (tem), multibyte); |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3320 p += nbytes; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3321 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3322 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
|
3323 { |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3324 int nbytes; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3325 tem = overlay_heads.buf[i].string; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3326 nbytes = copy_text (SDATA (tem), p, |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3327 SBYTES (tem), |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3328 STRING_MULTIBYTE (tem), multibyte); |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3329 p += nbytes; |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3330 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
|
3331 if (STRINGP (tem)) |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3332 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3333 nbytes = copy_text (SDATA (tem), p, |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3334 SBYTES (tem), |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3335 STRING_MULTIBYTE (tem), multibyte); |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3336 p += nbytes; |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3337 } |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3338 } |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3339 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
|
3340 abort (); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3341 if (pstr) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3342 *pstr = overlay_str_buf; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3343 return total; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3344 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3345 return 0; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3346 } |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3347 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3348 /* Shift overlays in BUF's overlay lists, to center the lists at POS. */ |
333 | 3349 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3350 void |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3351 recenter_overlay_lists (buf, pos) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3352 struct buffer *buf; |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3353 EMACS_INT pos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3354 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3355 Lisp_Object overlay, beg, end; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3356 struct Lisp_Overlay *prev, *tail, *next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3357 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3358 /* 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
|
3359 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3360 /* 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
|
3361 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
|
3362 with some future change. */ |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3363 prev = NULL; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3364 for (tail = buf->overlays_before; tail; prev = tail, tail = next) |
333 | 3365 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3366 next = tail->next; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3367 XSETMISC (overlay, tail); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3368 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3369 /* 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
|
3370 if (!OVERLAY_VALID (overlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3371 #if 1 |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3372 abort (); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3373 #else |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3374 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3375 /* 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
|
3376 if (!NILP (prev)) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3377 XCDR (prev) = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3378 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3379 buf->overlays_before = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3380 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3381 continue; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3382 } |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3383 #endif |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3384 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3385 beg = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3386 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3387 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3388 if (OVERLAY_POSITION (end) > pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3389 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3390 /* OVERLAY needs to be moved. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3391 int where = OVERLAY_POSITION (beg); |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3392 struct Lisp_Overlay *other, *other_prev; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3393 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3394 /* Splice the cons cell TAIL out of overlays_before. */ |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3395 if (prev) |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3396 prev->next = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3397 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3398 buf->overlays_before = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3399 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3400 /* Search thru overlays_after for where to put it. */ |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3401 other_prev = NULL; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3402 for (other = buf->overlays_after; other; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3403 other_prev = other, other = other->next) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3404 { |
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
3405 Lisp_Object otherbeg, otheroverlay; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3406 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3407 XSETMISC (otheroverlay, other); |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3408 eassert (OVERLAY_VALID (otheroverlay)); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3409 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3410 otherbeg = OVERLAY_START (otheroverlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3411 if (OVERLAY_POSITION (otherbeg) >= where) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3412 break; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3413 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3414 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3415 /* Add TAIL to overlays_after before OTHER. */ |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3416 tail->next = other; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3417 if (other_prev) |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3418 other_prev->next = tail; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3419 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3420 buf->overlays_after = tail; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3421 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3422 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3423 else |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3424 /* 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
|
3425 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
|
3426 so stop now. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3427 break; |
333 | 3428 } |
3429 | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3430 /* See if anything in overlays_after should be in overlays_before. */ |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3431 prev = NULL; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3432 for (tail = buf->overlays_after; tail; prev = tail, tail = next) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3433 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3434 next = tail->next; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3435 XSETMISC (overlay, tail); |
333 | 3436 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3437 /* 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
|
3438 if (!OVERLAY_VALID (overlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3439 #if 1 |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3440 abort (); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3441 #else |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3442 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3443 /* 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
|
3444 if (!NILP (prev)) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
3445 XCDR (prev) = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3446 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3447 buf->overlays_after = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3448 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3449 continue; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3450 } |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3451 #endif |
333 | 3452 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3453 beg = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3454 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3455 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3456 /* Stop looking, when we know that nothing further |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3457 can possibly end before POS. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3458 if (OVERLAY_POSITION (beg) > pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3459 break; |
333 | 3460 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3461 if (OVERLAY_POSITION (end) <= pos) |
333 | 3462 { |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3463 /* OVERLAY needs to be moved. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3464 int where = OVERLAY_POSITION (end); |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3465 struct Lisp_Overlay *other, *other_prev; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3466 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3467 /* Splice the cons cell TAIL out of overlays_after. */ |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3468 if (prev) |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3469 prev->next = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3470 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3471 buf->overlays_after = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3472 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3473 /* Search thru overlays_before for where to put it. */ |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3474 other_prev = NULL; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3475 for (other = buf->overlays_before; other; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3476 other_prev = other, other = other->next) |
333 | 3477 { |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3478 Lisp_Object otherend, otheroverlay; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3479 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3480 XSETMISC (otheroverlay, other); |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3481 eassert (OVERLAY_VALID (otheroverlay)); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3482 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3483 otherend = OVERLAY_END (otheroverlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3484 if (OVERLAY_POSITION (otherend) <= where) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3485 break; |
333 | 3486 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3487 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3488 /* Add TAIL to overlays_before before OTHER. */ |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3489 tail->next = other; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3490 if (other_prev) |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3491 other_prev->next = tail; |
333 | 3492 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3493 buf->overlays_before = tail; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3494 tail = prev; |
333 | 3495 } |
3496 } | |
3497 | |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3498 buf->overlay_center = pos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3499 } |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3500 |
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3501 void |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3502 adjust_overlays_for_insert (pos, length) |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3503 EMACS_INT pos; |
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3504 EMACS_INT length; |
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3505 { |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3506 /* 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
|
3507 but we may need to update the value of the overlay center. */ |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3508 if (current_buffer->overlay_center >= pos) |
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3509 current_buffer->overlay_center += length; |
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3510 } |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3511 |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3512 void |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3513 adjust_overlays_for_delete (pos, length) |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3514 EMACS_INT pos; |
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3515 EMACS_INT length; |
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3516 { |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3517 if (current_buffer->overlay_center < pos) |
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3518 /* 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
|
3519 after-lists are still consistent. */ |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3520 ; |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3521 else if (current_buffer->overlay_center > pos + length) |
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3522 /* 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
|
3523 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
|
3524 given the new value. */ |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3525 current_buffer->overlay_center -= length; |
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3526 else |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3527 /* 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
|
3528 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
|
3529 and also update the center point. */ |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3530 recenter_overlay_lists (current_buffer, pos); |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3531 } |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3532 |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3533 /* 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
|
3534 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
|
3535 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
|
3536 list and reinserted in its proper place. |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3537 Such an overlay might even have negative size at this point. |
54772
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3538 If so, we'll make the overlay empty. */ |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3539 void |
54555
b136a4512609
* insdel.c (adjust_markers_for_insert): Call fix_start_end_in_overlays.
Masatake YAMATO <jet@gyve.org>
parents:
54266
diff
changeset
|
3540 fix_start_end_in_overlays (start, end) |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3541 register int start, end; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3542 { |
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
3543 Lisp_Object overlay; |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3544 struct Lisp_Overlay *before_list, *after_list; |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3545 /* These are either nil, indicating that before_list or after_list |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3546 should be assigned, or the cons cell the cdr of which should be |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3547 assigned. */ |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3548 struct Lisp_Overlay *beforep = NULL, *afterp = NULL; |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3549 /* 'Parent', likewise, indicates a cons cell or |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3550 current_buffer->overlays_before or overlays_after, depending |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3551 which loop we're in. */ |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3552 struct Lisp_Overlay *tail, *parent; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3553 int startpos, endpos; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3554 |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3555 /* 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
|
3556 The loop invariant is that before_list (resp. after_list) is a |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3557 well-formed list except that its last element, the CDR of beforep |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3558 (resp. afterp) if beforep (afterp) isn't nil or before_list |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3559 (after_list) if it is, is still uninitialized. So it's not a bug |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3560 that before_list isn't initialized, although it may look |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3561 strange. */ |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3562 for (parent = NULL, tail = current_buffer->overlays_before; tail;) |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3563 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3564 XSETMISC (overlay, tail); |
54772
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3565 |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3566 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
54772
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3567 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3568 |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3569 /* If the overlay is backwards, make it empty. */ |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3570 if (endpos < startpos) |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3571 { |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3572 startpos = endpos; |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3573 Fset_marker (OVERLAY_START (overlay), make_number (startpos), |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3574 Qnil); |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3575 } |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3576 |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3577 if (endpos < start) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3578 break; |
55242
d57364949309
(syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents:
55140
diff
changeset
|
3579 |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3580 if (endpos < end |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3581 || (startpos >= start && startpos < end)) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3582 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3583 /* 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
|
3584 recenter_overlay_lists will move it to the right place. */ |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3585 if (endpos < current_buffer->overlay_center) |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3586 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3587 if (!afterp) |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3588 after_list = tail; |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3589 else |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3590 afterp->next = tail; |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3591 afterp = tail; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3592 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3593 else |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3594 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3595 if (!beforep) |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3596 before_list = tail; |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3597 else |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3598 beforep->next = tail; |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3599 beforep = tail; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3600 } |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3601 if (!parent) |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3602 current_buffer->overlays_before = tail->next; |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3603 else |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3604 parent->next = tail->next; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3605 tail = tail->next; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3606 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3607 else |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3608 parent = tail, tail = parent->next; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3609 } |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3610 for (parent = NULL, tail = current_buffer->overlays_after; tail;) |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3611 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3612 XSETMISC (overlay, tail); |
54772
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3613 |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3614 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
54772
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3615 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3616 |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3617 /* If the overlay is backwards, make it empty. */ |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3618 if (endpos < startpos) |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3619 { |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3620 startpos = endpos; |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3621 Fset_marker (OVERLAY_START (overlay), make_number (startpos), |
55242
d57364949309
(syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents:
55140
diff
changeset
|
3622 Qnil); |
54772
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3623 } |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3624 |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3625 if (startpos >= end) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3626 break; |
54772
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3627 |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3628 if (startpos >= start |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3629 || (endpos >= start && endpos < end)) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3630 { |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3631 if (endpos < current_buffer->overlay_center) |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3632 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3633 if (!afterp) |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3634 after_list = tail; |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3635 else |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3636 afterp->next = tail; |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3637 afterp = tail; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3638 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3639 else |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3640 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3641 if (!beforep) |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3642 before_list = tail; |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3643 else |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3644 beforep->next = tail; |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3645 beforep = tail; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3646 } |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3647 if (!parent) |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3648 current_buffer->overlays_after = tail->next; |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3649 else |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3650 parent->next = tail->next; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3651 tail = tail->next; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3652 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3653 else |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3654 parent = tail, tail = parent->next; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3655 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3656 |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3657 /* 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
|
3658 and let the recenter function make it sane again. */ |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3659 if (beforep) |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3660 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3661 beforep->next = current_buffer->overlays_before; |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3662 current_buffer->overlays_before = before_list; |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3663 } |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3664 recenter_overlay_lists (current_buffer, current_buffer->overlay_center); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3665 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3666 if (afterp) |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3667 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3668 afterp->next = current_buffer->overlays_after; |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3669 current_buffer->overlays_after = after_list; |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3670 } |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3671 recenter_overlay_lists (current_buffer, current_buffer->overlay_center); |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3672 } |
17022 | 3673 |
3674 /* We have two types of overlay: the one whose ending marker is | |
3675 after-insertion-marker (this is the usual case) and the one whose | |
3676 ending marker is before-insertion-marker. When `overlays_before' | |
3677 contains overlays of the latter type and the former type in this | |
3678 order and both overlays end at inserting position, inserting a text | |
3679 increases only the ending marker of the latter type, which results | |
3680 in incorrect ordering of `overlays_before'. | |
3681 | |
3682 This function fixes ordering of overlays in the slot | |
3683 `overlays_before' of the buffer *BP. Before the insertion, `point' | |
3684 was at PREV, and now is at POS. */ | |
3685 | |
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
3686 void |
17022 | 3687 fix_overlays_before (bp, prev, pos) |
3688 struct buffer *bp; | |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3689 EMACS_INT prev, pos; |
17022 | 3690 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3691 /* If parent is nil, replace overlays_before; otherwise, parent->next. */ |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3692 struct Lisp_Overlay *tail = bp->overlays_before, *parent = NULL, *right_pair; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3693 Lisp_Object tem; |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3694 EMACS_INT end; |
17022 | 3695 |
3696 /* After the insertion, the several overlays may be in incorrect | |
3697 order. The possibility is that, in the list `overlays_before', | |
3698 an overlay which ends at POS appears after an overlay which ends | |
3699 at PREV. Since POS is greater than PREV, we must fix the | |
3700 ordering of these overlays, by moving overlays ends at POS before | |
3701 the overlays ends at PREV. */ | |
3702 | |
3703 /* At first, find a place where disordered overlays should be linked | |
3704 in. It is where an overlay which end before POS exists. (i.e. an | |
3705 overlay whose ending marker is after-insertion-marker if disorder | |
3706 exists). */ | |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3707 while (tail |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3708 && (XSETMISC (tem, tail), |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3709 (end = OVERLAY_POSITION (OVERLAY_END (tem))) >= pos)) |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3710 { |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3711 parent = tail; |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3712 tail = tail->next; |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3713 } |
17022 | 3714 |
3715 /* If we don't find such an overlay, | |
3716 or the found one ends before PREV, | |
3717 or the found one is the last one in the list, | |
3718 we don't have to fix anything. */ | |
51853
fd71e1aaa838
(fix_overlays_before): Fix typo in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51844
diff
changeset
|
3719 if (!tail || end < prev || !tail->next) |
17022 | 3720 return; |
3721 | |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3722 right_pair = parent; |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3723 parent = tail; |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3724 tail = tail->next; |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3725 |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3726 /* Now, end position of overlays in the list TAIL should be before |
17022 | 3727 or equal to PREV. In the loop, an overlay which ends at POS is |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3728 moved ahead to the place indicated by the CDR of RIGHT_PAIR. If |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3729 we found an overlay which ends before PREV, the remaining |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3730 overlays are in correct order. */ |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3731 while (tail) |
17022 | 3732 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3733 XSETMISC (tem, tail); |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3734 end = OVERLAY_POSITION (OVERLAY_END (tem)); |
17022 | 3735 |
3736 if (end == pos) | |
3737 { /* This overlay is disordered. */ | |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3738 struct Lisp_Overlay *found = tail; |
17022 | 3739 |
3740 /* Unlink the found overlay. */ | |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3741 tail = found->next; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3742 parent->next = tail; |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3743 /* Move an overlay at RIGHT_PLACE to the next of the found one, |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3744 and link it into the right place. */ |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3745 if (!right_pair) |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3746 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3747 found->next = bp->overlays_before; |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3748 bp->overlays_before = found; |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3749 } |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3750 else |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3751 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3752 found->next = right_pair->next; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3753 right_pair->next = found; |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3754 } |
17022 | 3755 } |
3756 else if (end == prev) | |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3757 { |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3758 parent = tail; |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3759 tail = tail->next; |
45374
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3760 } |
17022 | 3761 else /* No more disordered overlay. */ |
3762 break; | |
3763 } | |
3764 } | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3765 |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3766 DEFUN ("overlayp", Foverlayp, Soverlayp, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3767 doc: /* Return t if OBJECT is an overlay. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3768 (object) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3769 Lisp_Object object; |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3770 { |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3771 return (OVERLAYP (object) ? Qt : Qnil); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3772 } |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3773 |
13446
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3774 DEFUN ("make-overlay", Fmake_overlay, Smake_overlay, 2, 5, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3775 doc: /* Create a new overlay with range BEG to END in BUFFER. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3776 If omitted, BUFFER defaults to the current buffer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3777 BEG and END may be integers or markers. |
64412
a1807609d4c2
(Fmake_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
3778 The fourth arg FRONT-ADVANCE, if non-nil, makes the marker |
a1807609d4c2
(Fmake_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
3779 for the front of the overlay advance when text is inserted there |
70816
8168db834af2
(syms_of_buffer, Fmake_overlay): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
70697
diff
changeset
|
3780 \(which means the text *is not* included in the overlay). |
64412
a1807609d4c2
(Fmake_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
3781 The fifth arg REAR-ADVANCE, if non-nil, makes the marker |
a1807609d4c2
(Fmake_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
3782 for the rear of the overlay advance when text is inserted there |
70816
8168db834af2
(syms_of_buffer, Fmake_overlay): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
70697
diff
changeset
|
3783 \(which means the text *is* included in the overlay). */) |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3784 (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
|
3785 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
|
3786 Lisp_Object front_advance, rear_advance; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3787 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3788 Lisp_Object overlay; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3789 struct buffer *b; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3790 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3791 if (NILP (buffer)) |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
3792 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
|
3793 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3794 CHECK_BUFFER (buffer); |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3795 if (MARKERP (beg) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3796 && ! 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
|
3797 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
|
3798 if (MARKERP (end) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3799 && ! 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
|
3800 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
|
3801 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3802 CHECK_NUMBER_COERCE_MARKER (beg); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3803 CHECK_NUMBER_COERCE_MARKER (end); |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3804 |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3805 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
|
3806 { |
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3807 Lisp_Object temp; |
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3808 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
|
3809 } |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3810 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3811 b = XBUFFER (buffer); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3812 |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3813 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
|
3814 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
|
3815 |
13446
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3816 if (!NILP (front_advance)) |
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3817 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
|
3818 if (!NILP (rear_advance)) |
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3819 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
|
3820 |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3821 overlay = allocate_misc (); |
11244
f3b11dc9014e
(Fmake_overlay): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11214
diff
changeset
|
3822 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
|
3823 XOVERLAY (overlay)->start = beg; |
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3824 XOVERLAY (overlay)->end = end; |
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3825 XOVERLAY (overlay)->plist = Qnil; |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3826 XOVERLAY (overlay)->next = NULL; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3827 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
3828 /* Put the new overlay on the wrong list. */ |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3829 end = OVERLAY_END (overlay); |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3830 if (OVERLAY_POSITION (end) < b->overlay_center) |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3831 { |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3832 if (b->overlays_after) |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3833 XOVERLAY (overlay)->next = b->overlays_after; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3834 b->overlays_after = XOVERLAY (overlay); |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3835 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3836 else |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3837 { |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3838 if (b->overlays_before) |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3839 XOVERLAY (overlay)->next = b->overlays_before; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3840 b->overlays_before = XOVERLAY (overlay); |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3841 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3842 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3843 /* This puts it in the right list, and in the right order. */ |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3844 recenter_overlay_lists (b, b->overlay_center); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3845 |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3846 /* 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
|
3847 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
|
3848 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3849 return overlay; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3850 } |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3851 |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3852 /* Mark a section of BUF as needing redisplay because of overlays changes. */ |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3853 |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3854 static void |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3855 modify_overlay (buf, start, end) |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3856 struct buffer *buf; |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3857 EMACS_INT start, end; |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3858 { |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3859 if (start > end) |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3860 { |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3861 int temp = start; |
39333
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3862 start = end; |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3863 end = temp; |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3864 } |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3865 |
27012
520f982f3a9a
(modify_overlay): Always compute unchanged info.
Gerd Moellmann <gerd@gnu.org>
parents:
26970
diff
changeset
|
3866 BUF_COMPUTE_UNCHANGED (buf, start, end); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
3867 |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3868 /* If this is a buffer not in the selected window, |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3869 we must do other windows. */ |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3870 if (buf != XBUFFER (XWINDOW (selected_window)->buffer)) |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3871 windows_or_buffers_changed = 1; |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3872 /* If multiple windows show this buffer, we must do other windows. */ |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3873 else if (buffer_shared > 1) |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3874 windows_or_buffers_changed = 1; |
69144
5c9e3eb42568
(modify_overlay): Force redisplay if we modify an
Kim F. Storm <storm@cua.dk>
parents:
69047
diff
changeset
|
3875 /* If we modify an overlay at the end of the buffer, we cannot |
5c9e3eb42568
(modify_overlay): Force redisplay if we modify an
Kim F. Storm <storm@cua.dk>
parents:
69047
diff
changeset
|
3876 be sure that window end is still valid. */ |
5c9e3eb42568
(modify_overlay): Force redisplay if we modify an
Kim F. Storm <storm@cua.dk>
parents:
69047
diff
changeset
|
3877 else if (end >= ZV && start <= ZV) |
5c9e3eb42568
(modify_overlay): Force redisplay if we modify an
Kim F. Storm <storm@cua.dk>
parents:
69047
diff
changeset
|
3878 windows_or_buffers_changed = 1; |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3879 |
19801
7482ad23e430
(modify_overlay): Update overlay_modiff of proper buffer.
Richard M. Stallman <rms@gnu.org>
parents:
19581
diff
changeset
|
3880 ++BUF_OVERLAY_MODIFF (buf); |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3881 } |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3882 |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3883 |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3884 Lisp_Object Fdelete_overlay (); |
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3885 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3886 static struct Lisp_Overlay * |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3887 unchain_overlay (list, overlay) |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3888 struct Lisp_Overlay *list, *overlay; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3889 { |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3890 struct Lisp_Overlay *tmp, *prev; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3891 for (tmp = list, prev = NULL; tmp; prev = tmp, tmp = tmp->next) |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3892 if (tmp == overlay) |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3893 { |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3894 if (prev) |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3895 prev->next = tmp->next; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3896 else |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3897 list = tmp->next; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3898 overlay->next = NULL; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3899 break; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3900 } |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3901 return list; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3902 } |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3903 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3904 DEFUN ("move-overlay", Fmove_overlay, Smove_overlay, 3, 4, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3905 doc: /* Set the endpoints of OVERLAY to BEG and END in BUFFER. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3906 If BUFFER is omitted, leave OVERLAY in the same buffer it inhabits now. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3907 If BUFFER is omitted, and OVERLAY is in no buffer, put it in the current |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3908 buffer. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3909 (overlay, beg, end, buffer) |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3910 Lisp_Object overlay, beg, end, buffer; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3911 { |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3912 struct buffer *b, *ob; |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3913 Lisp_Object obuffer; |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46199
diff
changeset
|
3914 int count = SPECPDL_INDEX (); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3915 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3916 CHECK_OVERLAY (overlay); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3917 if (NILP (buffer)) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3918 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
|
3919 if (NILP (buffer)) |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
3920 XSETBUFFER (buffer, current_buffer); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3921 CHECK_BUFFER (buffer); |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3922 |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3923 if (MARKERP (beg) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3924 && ! 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
|
3925 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
|
3926 if (MARKERP (end) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3927 && ! 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
|
3928 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
|
3929 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3930 CHECK_NUMBER_COERCE_MARKER (beg); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3931 CHECK_NUMBER_COERCE_MARKER (end); |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3932 |
8839 | 3933 if (XINT (beg) == XINT (end) && ! NILP (Foverlay_get (overlay, Qevaporate))) |
3934 return Fdelete_overlay (overlay); | |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3935 |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3936 if (XINT (beg) > XINT (end)) |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3937 { |
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3938 Lisp_Object temp; |
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3939 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
|
3940 } |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3941 |
8839 | 3942 specbind (Qinhibit_quit, Qt); |
3943 | |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3944 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
|
3945 b = XBUFFER (buffer); |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
3946 ob = BUFFERP (obuffer) ? XBUFFER (obuffer) : (struct buffer *) 0; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3947 |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3948 /* 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
|
3949 if (!EQ (buffer, obuffer)) |
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3950 { |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3951 /* Redisplay where the overlay was. */ |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3952 if (!NILP (obuffer)) |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3953 { |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3954 int o_beg; |
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3955 int o_end; |
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3956 |
18105
bc690c1e1950
(Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents:
18009
diff
changeset
|
3957 o_beg = OVERLAY_POSITION (OVERLAY_START (overlay)); |
bc690c1e1950
(Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents:
18009
diff
changeset
|
3958 o_end = OVERLAY_POSITION (OVERLAY_END (overlay)); |
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3959 |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3960 modify_overlay (ob, o_beg, o_end); |
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3961 } |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3962 |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3963 /* Redisplay where the overlay is going to be. */ |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3964 modify_overlay (b, XINT (beg), XINT (end)); |
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3965 } |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3966 else |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3967 /* 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
|
3968 { |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3969 int o_beg, o_end; |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3970 |
18105
bc690c1e1950
(Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents:
18009
diff
changeset
|
3971 o_beg = OVERLAY_POSITION (OVERLAY_START (overlay)); |
bc690c1e1950
(Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents:
18009
diff
changeset
|
3972 o_end = OVERLAY_POSITION (OVERLAY_END (overlay)); |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3973 |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3974 if (o_beg == XINT (beg)) |
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3975 modify_overlay (b, o_end, XINT (end)); |
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3976 else if (o_end == XINT (end)) |
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3977 modify_overlay (b, o_beg, XINT (beg)); |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3978 else |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3979 { |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3980 if (XINT (beg) < o_beg) o_beg = XINT (beg); |
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3981 if (XINT (end) > o_end) o_end = XINT (end); |
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3982 modify_overlay (b, o_beg, o_end); |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3983 } |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3984 } |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3985 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3986 if (!NILP (obuffer)) |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3987 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3988 ob->overlays_before |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3989 = unchain_overlay (ob->overlays_before, XOVERLAY (overlay)); |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3990 ob->overlays_after |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3991 = unchain_overlay (ob->overlays_after, XOVERLAY (overlay)); |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3992 eassert (XOVERLAY (overlay)->next == NULL); |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3993 } |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3994 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3995 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
|
3996 Fset_marker (OVERLAY_END (overlay), end, buffer); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3997 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
3998 /* Put the overlay on the wrong list. */ |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3999 end = OVERLAY_END (overlay); |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
4000 if (OVERLAY_POSITION (end) < b->overlay_center) |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4001 { |
52253
79185e10e92f
(Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents:
52012
diff
changeset
|
4002 XOVERLAY (overlay)->next = b->overlays_after; |
79185e10e92f
(Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents:
52012
diff
changeset
|
4003 b->overlays_after = XOVERLAY (overlay); |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4004 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4005 else |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4006 { |
52253
79185e10e92f
(Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents:
52012
diff
changeset
|
4007 XOVERLAY (overlay)->next = b->overlays_before; |
79185e10e92f
(Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents:
52012
diff
changeset
|
4008 b->overlays_before = XOVERLAY (overlay); |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4009 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4010 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4011 /* This puts it in the right list, and in the right order. */ |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
4012 recenter_overlay_lists (b, b->overlay_center); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4013 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
4014 return unbind_to (count, overlay); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4015 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4016 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4017 DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4018 doc: /* Delete the overlay OVERLAY from its buffer. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4019 (overlay) |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
4020 Lisp_Object overlay; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4021 { |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
4022 Lisp_Object buffer; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
4023 struct buffer *b; |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46199
diff
changeset
|
4024 int count = SPECPDL_INDEX (); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
4025 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4026 CHECK_OVERLAY (overlay); |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
4027 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
4028 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
|
4029 if (NILP (buffer)) |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
4030 return Qnil; |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
4031 |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
4032 b = XBUFFER (buffer); |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
4033 specbind (Qinhibit_quit, Qt); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4034 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4035 b->overlays_before = unchain_overlay (b->overlays_before,XOVERLAY (overlay)); |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4036 b->overlays_after = unchain_overlay (b->overlays_after, XOVERLAY (overlay)); |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4037 eassert (XOVERLAY (overlay)->next == NULL); |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
4038 modify_overlay (b, |
21898 | 4039 marker_position (OVERLAY_START (overlay)), |
4040 marker_position (OVERLAY_END (overlay))); | |
2791
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
4041 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
|
4042 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
|
4043 |
39337 | 4044 /* When deleting an overlay with before or after strings, turn off |
39333
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
4045 display optimizations for the affected buffer, on the basis that |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
4046 these strings may contain newlines. This is easier to do than to |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
4047 check for that situation during redisplay. */ |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
4048 if (!windows_or_buffers_changed |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
4049 && (!NILP (Foverlay_get (overlay, Qbefore_string)) |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
4050 || !NILP (Foverlay_get (overlay, Qafter_string)))) |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
4051 b->prevent_redisplay_optimizations_p = 1; |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
4052 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
4053 return unbind_to (count, Qnil); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4054 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4055 |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4056 /* Overlay dissection functions. */ |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4057 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4058 DEFUN ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4059 doc: /* Return the position at which OVERLAY starts. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4060 (overlay) |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4061 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4062 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4063 CHECK_OVERLAY (overlay); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4064 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4065 return (Fmarker_position (OVERLAY_START (overlay))); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4066 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4067 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4068 DEFUN ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4069 doc: /* Return the position at which OVERLAY ends. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4070 (overlay) |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4071 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4072 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4073 CHECK_OVERLAY (overlay); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4074 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4075 return (Fmarker_position (OVERLAY_END (overlay))); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4076 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4077 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4078 DEFUN ("overlay-buffer", Foverlay_buffer, Soverlay_buffer, 1, 1, 0, |
60217 | 4079 doc: /* Return the buffer OVERLAY belongs to. |
4080 Return nil if OVERLAY has been deleted. */) | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4081 (overlay) |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4082 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4083 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4084 CHECK_OVERLAY (overlay); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4085 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4086 return Fmarker_buffer (OVERLAY_START (overlay)); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4087 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4088 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4089 DEFUN ("overlay-properties", Foverlay_properties, Soverlay_properties, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4090 doc: /* Return a list of the properties on OVERLAY. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
4091 This is a copy of OVERLAY's plist; modifying its conses has no effect on |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4092 OVERLAY. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4093 (overlay) |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4094 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4095 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4096 CHECK_OVERLAY (overlay); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4097 |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
4098 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
|
4099 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4100 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4101 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4102 DEFUN ("overlays-at", Foverlays_at, Soverlays_at, 1, 1, 0, |
78833
1a6e9c3bbc2d
(Foverlays_at): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
78260
diff
changeset
|
4103 doc: /* Return a list of the overlays that contain the character at POS. */) |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4104 (pos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4105 Lisp_Object pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4106 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4107 int noverlays; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4108 Lisp_Object *overlay_vec; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4109 int len; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4110 Lisp_Object result; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4111 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4112 CHECK_NUMBER_COERCE_MARKER (pos); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4113 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4114 len = 10; |
30911
c1de0fc3a34b
(Fget_buffer_create, Fmake_indirect_buffer): Avoid
Dave Love <fx@gnu.org>
parents:
30695
diff
changeset
|
4115 /* We can't use alloca here because overlays_at can call xrealloc. */ |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4116 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
|
4117 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4118 /* 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
|
4119 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
|
4120 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, |
92237
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92215
diff
changeset
|
4121 (EMACS_INT *) 0, (EMACS_INT *) 0, 0); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4122 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4123 /* Make a list of them all. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4124 result = Flist (noverlays, overlay_vec); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4125 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
4126 xfree (overlay_vec); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4127 return result; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4128 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4129 |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4130 DEFUN ("overlays-in", Foverlays_in, Soverlays_in, 2, 2, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4131 doc: /* Return a list of the overlays that overlap the region BEG ... END. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
4132 Overlap means that at least one character is contained within the overlay |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
4133 and also contained within the specified region. |
92975
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
4134 Empty overlays are included in the result if they are located at BEG, |
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
4135 between BEG and END, or at END provided END denotes the position at the |
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
4136 end of the buffer. */) |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4137 (beg, end) |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4138 Lisp_Object beg, end; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4139 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4140 int noverlays; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4141 Lisp_Object *overlay_vec; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4142 int len; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4143 Lisp_Object result; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4144 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4145 CHECK_NUMBER_COERCE_MARKER (beg); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4146 CHECK_NUMBER_COERCE_MARKER (end); |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4147 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4148 len = 10; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4149 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object)); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4150 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4151 /* 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
|
4152 Store the length in len. */ |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4153 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
|
4154 (int *) 0, (int *) 0); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4155 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4156 /* Make a list of them all. */ |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4157 result = Flist (noverlays, overlay_vec); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4158 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4159 xfree (overlay_vec); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4160 return result; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4161 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4162 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4163 DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
4164 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4165 doc: /* Return the next position after POS where an overlay starts or ends. |
70697
d6f5b85d7429
(Fprevious_overlay_change, Fnext_overlay_change): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
69154
diff
changeset
|
4166 If there are no overlay boundaries from POS to (point-max), |
d6f5b85d7429
(Fprevious_overlay_change, Fnext_overlay_change): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
69154
diff
changeset
|
4167 the value is (point-max). */) |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4168 (pos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4169 Lisp_Object pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4170 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4171 int noverlays; |
92237
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92215
diff
changeset
|
4172 EMACS_INT endpos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4173 Lisp_Object *overlay_vec; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4174 int len; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4175 int i; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4176 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4177 CHECK_NUMBER_COERCE_MARKER (pos); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4178 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4179 len = 10; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4180 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
|
4181 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4182 /* 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
|
4183 Store the length in len. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4184 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
|
4185 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, |
92237
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92215
diff
changeset
|
4186 &endpos, (EMACS_INT *) 0, 1); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4187 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4188 /* If any of these overlays ends before endpos, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4189 use its ending point instead. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4190 for (i = 0; i < noverlays; i++) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4191 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4192 Lisp_Object oend; |
92237
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92215
diff
changeset
|
4193 EMACS_INT oendpos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4194 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4195 oend = OVERLAY_END (overlay_vec[i]); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4196 oendpos = OVERLAY_POSITION (oend); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4197 if (oendpos < endpos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4198 endpos = oendpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4199 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4200 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
4201 xfree (overlay_vec); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4202 return make_number (endpos); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4203 } |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4204 |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4205 DEFUN ("previous-overlay-change", Fprevious_overlay_change, |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4206 Sprevious_overlay_change, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4207 doc: /* Return the previous position before POS where an overlay starts or ends. |
70697
d6f5b85d7429
(Fprevious_overlay_change, Fnext_overlay_change): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
69154
diff
changeset
|
4208 If there are no overlay boundaries from (point-min) to POS, |
d6f5b85d7429
(Fprevious_overlay_change, Fnext_overlay_change): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
69154
diff
changeset
|
4209 the value is (point-min). */) |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4210 (pos) |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4211 Lisp_Object pos; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4212 { |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4213 int noverlays; |
92237
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92215
diff
changeset
|
4214 EMACS_INT prevpos; |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4215 Lisp_Object *overlay_vec; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4216 int len; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4217 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4218 CHECK_NUMBER_COERCE_MARKER (pos); |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4219 |
12214
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
4220 /* 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
|
4221 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
|
4222 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
|
4223 return pos; |
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
4224 |
30360
92f92a541686
(Fprevious_overlay_change): Avoid memory leak.
Gerd Moellmann <gerd@gnu.org>
parents:
29456
diff
changeset
|
4225 len = 10; |
92f92a541686
(Fprevious_overlay_change): Avoid memory leak.
Gerd Moellmann <gerd@gnu.org>
parents:
29456
diff
changeset
|
4226 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object)); |
92f92a541686
(Fprevious_overlay_change): Avoid memory leak.
Gerd Moellmann <gerd@gnu.org>
parents:
29456
diff
changeset
|
4227 |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4228 /* 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
|
4229 Store the length in len. |
25205
14269f6d315b
(Fprevious_overlay_change): Just return the answer obtained from overlays_at.
Richard M. Stallman <rms@gnu.org>
parents:
25184
diff
changeset
|
4230 prevpos gets the position of the previous change. */ |
11418
f892e7cb7f51
(Foverlays_at, Fnext_overlay_change): Don't use NULL.
Richard M. Stallman <rms@gnu.org>
parents:
11414
diff
changeset
|
4231 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, |
92237
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92215
diff
changeset
|
4232 (EMACS_INT *) 0, &prevpos, 1); |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4233 |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4234 xfree (overlay_vec); |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4235 return make_number (prevpos); |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4236 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4237 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4238 /* These functions are for debugging overlays. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4239 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4240 DEFUN ("overlay-lists", Foverlay_lists, Soverlay_lists, 0, 0, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4241 doc: /* Return a pair of lists giving all the overlays of the current buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
4242 The car has all the overlays before the overlay center; |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
4243 the cdr has all the overlays after the overlay center. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
4244 Recentering overlays moves overlays between these lists. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
4245 The lists you get are copies, so that changing them has no effect. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4246 However, the overlays you get are the real objects that the buffer uses. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4247 () |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4248 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4249 struct Lisp_Overlay *ol; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4250 Lisp_Object before = Qnil, after = Qnil, tmp; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4251 for (ol = current_buffer->overlays_before; ol; ol = ol->next) |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4252 { |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4253 XSETMISC (tmp, ol); |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4254 before = Fcons (tmp, before); |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4255 } |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4256 for (ol = current_buffer->overlays_after; ol; ol = ol->next) |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4257 { |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4258 XSETMISC (tmp, ol); |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4259 after = Fcons (tmp, after); |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4260 } |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4261 return Fcons (Fnreverse (before), Fnreverse (after)); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4262 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4263 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4264 DEFUN ("overlay-recenter", Foverlay_recenter, Soverlay_recenter, 1, 1, 0, |
50605
d91f2dfe45eb
(Foverlay_recenter): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
50304
diff
changeset
|
4265 doc: /* Recenter the overlays of the current buffer around position POS. |
d91f2dfe45eb
(Foverlay_recenter): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
50304
diff
changeset
|
4266 That makes overlay lookup faster for positions near POS (but perhaps slower |
d91f2dfe45eb
(Foverlay_recenter): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
50304
diff
changeset
|
4267 for positions far away from POS). */) |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4268 (pos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4269 Lisp_Object pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4270 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4271 CHECK_NUMBER_COERCE_MARKER (pos); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4272 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
4273 recenter_overlay_lists (current_buffer, XINT (pos)); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4274 return Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4275 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4276 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4277 DEFUN ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4278 doc: /* Get the property of overlay OVERLAY with property name PROP. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4279 (overlay, prop) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4280 Lisp_Object overlay, prop; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4281 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4282 CHECK_OVERLAY (overlay); |
45683
9e40bb8e9a60
(Foverlay_get): Use lookup_char_property.
Colin Walters <walters@gnu.org>
parents:
45626
diff
changeset
|
4283 return lookup_char_property (XOVERLAY (overlay)->plist, prop, 0); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4284 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4285 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4286 DEFUN ("overlay-put", Foverlay_put, Soverlay_put, 3, 3, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4287 doc: /* Set one property of overlay OVERLAY: give property PROP value VALUE. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4288 (overlay, prop, value) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4289 Lisp_Object overlay, prop, value; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4290 { |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
4291 Lisp_Object tail, buffer; |
8839 | 4292 int changed; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4293 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4294 CHECK_OVERLAY (overlay); |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
4295 |
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
4296 buffer = Fmarker_buffer (OVERLAY_START (overlay)); |
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
4297 |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
4298 for (tail = XOVERLAY (overlay)->plist; |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4299 CONSP (tail) && CONSP (XCDR (tail)); |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4300 tail = XCDR (XCDR (tail))) |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4301 if (EQ (XCAR (tail), prop)) |
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
4302 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4303 changed = !EQ (XCAR (XCDR (tail)), value); |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
4304 XSETCAR (XCDR (tail), value); |
8839 | 4305 goto found; |
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
4306 } |
8839 | 4307 /* It wasn't in the list, so add it to the front. */ |
4308 changed = !NILP (value); | |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
4309 XOVERLAY (overlay)->plist |
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
4310 = Fcons (prop, Fcons (value, XOVERLAY (overlay)->plist)); |
8839 | 4311 found: |
4312 if (! NILP (buffer)) | |
4313 { | |
4314 if (changed) | |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
4315 modify_overlay (XBUFFER (buffer), |
39333
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
4316 marker_position (OVERLAY_START (overlay)), |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
4317 marker_position (OVERLAY_END (overlay))); |
8839 | 4318 if (EQ (prop, Qevaporate) && ! NILP (value) |
4319 && (OVERLAY_POSITION (OVERLAY_START (overlay)) | |
4320 == OVERLAY_POSITION (OVERLAY_END (overlay)))) | |
4321 Fdelete_overlay (overlay); | |
4322 } | |
69153
1f7111323584
* buffer.c (Foverlay_put): Mark buffer as changed.
Chong Yidong <cyd@stupidchicken.com>
parents:
69144
diff
changeset
|
4323 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4324 return value; |
333 | 4325 } |
4326 | |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4327 /* Subroutine of report_overlay_modification. */ |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4328 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4329 /* Lisp vector holding overlay hook functions to call. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4330 Vector elements come in pairs. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4331 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
|
4332 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
|
4333 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4334 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
|
4335 as we call overlay hook functions. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4336 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
|
4337 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
|
4338 static Lisp_Object last_overlay_modification_hooks; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4339 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4340 /* 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
|
4341 static int last_overlay_modification_hooks_used; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4342 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4343 /* Add one functionlist/overlay pair |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4344 to the end of last_overlay_modification_hooks. */ |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4345 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4346 static void |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4347 add_overlay_mod_hooklist (functionlist, overlay) |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4348 Lisp_Object functionlist, overlay; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4349 { |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4350 int oldsize = XVECTOR (last_overlay_modification_hooks)->size; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4351 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4352 if (last_overlay_modification_hooks_used == oldsize) |
85242
9b00632ffdf2
(add_overlay_mod_hooklist): Use larger_vector.
Eli Zaretskii <eliz@gnu.org>
parents:
85114
diff
changeset
|
4353 last_overlay_modification_hooks = larger_vector |
9b00632ffdf2
(add_overlay_mod_hooklist): Use larger_vector.
Eli Zaretskii <eliz@gnu.org>
parents:
85114
diff
changeset
|
4354 (last_overlay_modification_hooks, oldsize * 2, Qnil); |
91607
d1e53221c4aa
* xselect.c (x_handle_dnd_message):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
4355 ASET (last_overlay_modification_hooks, last_overlay_modification_hooks_used, |
d1e53221c4aa
* xselect.c (x_handle_dnd_message):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
4356 functionlist); last_overlay_modification_hooks_used++; |
d1e53221c4aa
* xselect.c (x_handle_dnd_message):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
4357 ASET (last_overlay_modification_hooks, last_overlay_modification_hooks_used, |
d1e53221c4aa
* xselect.c (x_handle_dnd_message):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
4358 overlay); last_overlay_modification_hooks_used++; |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4359 } |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4360 |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4361 /* Run the modification-hooks of overlays that include |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4362 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
|
4363 If this change is an insertion, also |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4364 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
|
4365 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
|
4366 |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4367 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
|
4368 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
|
4369 |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4370 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
|
4371 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
|
4372 the position after the inserted new text, |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4373 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
|
4374 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4375 void |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4376 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
|
4377 Lisp_Object start, end; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4378 int after; |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4379 Lisp_Object arg1, arg2, arg3; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4380 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4381 Lisp_Object prop, overlay; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4382 struct Lisp_Overlay *tail; |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4383 /* 1 if this change is an insertion. */ |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4384 int insertion = (after ? XFASTINT (arg3) == 0 : EQ (start, end)); |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4385 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4386 |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4387 overlay = Qnil; |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4388 tail = NULL; |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4389 |
51939
d38453fdf2a0
(copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51867
diff
changeset
|
4390 /* We used to run the functions as soon as we found them and only register |
d38453fdf2a0
(copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51867
diff
changeset
|
4391 them in last_overlay_modification_hooks for the purpose of the `after' |
d38453fdf2a0
(copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51867
diff
changeset
|
4392 case. But running elisp code as we traverse the list of overlays is |
d38453fdf2a0
(copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51867
diff
changeset
|
4393 painful because the list can be modified by the elisp code so we had to |
d38453fdf2a0
(copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51867
diff
changeset
|
4394 copy at several places. We now simply do a read-only traversal that |
d38453fdf2a0
(copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51867
diff
changeset
|
4395 only collects the functions to run and we run them afterwards. It's |
d38453fdf2a0
(copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51867
diff
changeset
|
4396 simpler, especially since all the code was already there. -stef */ |
d38453fdf2a0
(copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51867
diff
changeset
|
4397 |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4398 if (!after) |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4399 { |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4400 /* We are being called before a change. |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4401 Scan the overlays to find the functions to call. */ |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4402 last_overlay_modification_hooks_used = 0; |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4403 for (tail = current_buffer->overlays_before; tail; tail = tail->next) |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4404 { |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4405 int startpos, endpos; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4406 Lisp_Object ostart, oend; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4407 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4408 XSETMISC (overlay, tail); |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4409 |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4410 ostart = OVERLAY_START (overlay); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4411 oend = OVERLAY_END (overlay); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4412 endpos = OVERLAY_POSITION (oend); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4413 if (XFASTINT (start) > endpos) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4414 break; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4415 startpos = OVERLAY_POSITION (ostart); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4416 if (insertion && (XFASTINT (start) == startpos |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4417 || XFASTINT (end) == startpos)) |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4418 { |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4419 prop = Foverlay_get (overlay, Qinsert_in_front_hooks); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4420 if (!NILP (prop)) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4421 add_overlay_mod_hooklist (prop, overlay); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4422 } |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4423 if (insertion && (XFASTINT (start) == endpos |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4424 || XFASTINT (end) == endpos)) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4425 { |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4426 prop = Foverlay_get (overlay, Qinsert_behind_hooks); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4427 if (!NILP (prop)) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4428 add_overlay_mod_hooklist (prop, overlay); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4429 } |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4430 /* Test for intersecting intervals. This does the right thing |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4431 for both insertion and deletion. */ |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4432 if (XFASTINT (end) > startpos && XFASTINT (start) < endpos) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4433 { |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4434 prop = Foverlay_get (overlay, Qmodification_hooks); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4435 if (!NILP (prop)) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4436 add_overlay_mod_hooklist (prop, overlay); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4437 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4438 } |
55242
d57364949309
(syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents:
55140
diff
changeset
|
4439 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4440 for (tail = current_buffer->overlays_after; tail; tail = tail->next) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4441 { |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4442 int startpos, endpos; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4443 Lisp_Object ostart, oend; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4444 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4445 XSETMISC (overlay, tail); |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4446 |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4447 ostart = OVERLAY_START (overlay); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4448 oend = OVERLAY_END (overlay); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4449 startpos = OVERLAY_POSITION (ostart); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4450 endpos = OVERLAY_POSITION (oend); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4451 if (XFASTINT (end) < startpos) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4452 break; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4453 if (insertion && (XFASTINT (start) == startpos |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4454 || XFASTINT (end) == startpos)) |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4455 { |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4456 prop = Foverlay_get (overlay, Qinsert_in_front_hooks); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4457 if (!NILP (prop)) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4458 add_overlay_mod_hooklist (prop, overlay); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4459 } |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4460 if (insertion && (XFASTINT (start) == endpos |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4461 || XFASTINT (end) == endpos)) |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4462 { |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4463 prop = Foverlay_get (overlay, Qinsert_behind_hooks); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4464 if (!NILP (prop)) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4465 add_overlay_mod_hooklist (prop, overlay); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4466 } |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4467 /* Test for intersecting intervals. This does the right thing |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4468 for both insertion and deletion. */ |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4469 if (XFASTINT (end) > startpos && XFASTINT (start) < endpos) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4470 { |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4471 prop = Foverlay_get (overlay, Qmodification_hooks); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4472 if (!NILP (prop)) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4473 add_overlay_mod_hooklist (prop, overlay); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4474 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4475 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4476 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4477 |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4478 GCPRO4 (overlay, arg1, arg2, arg3); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4479 { |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4480 /* Call the functions recorded in last_overlay_modification_hooks. |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4481 First copy the vector contents, in case some of these hooks |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4482 do subsequent modification of the buffer. */ |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4483 int size = last_overlay_modification_hooks_used; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4484 Lisp_Object *copy = (Lisp_Object *) alloca (size * sizeof (Lisp_Object)); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4485 int i; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4486 |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4487 bcopy (XVECTOR (last_overlay_modification_hooks)->contents, |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4488 copy, size * sizeof (Lisp_Object)); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4489 gcpro1.var = copy; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4490 gcpro1.nvars = size; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4491 |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4492 for (i = 0; i < size;) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4493 { |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4494 Lisp_Object prop, overlay; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4495 prop = copy[i++]; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4496 overlay = copy[i++]; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4497 call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4498 } |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4499 } |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4500 UNGCPRO; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4501 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4502 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4503 static void |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4504 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
|
4505 Lisp_Object list, overlay; |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4506 int after; |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4507 Lisp_Object arg1, arg2, arg3; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4508 { |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4509 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4510 |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4511 GCPRO4 (list, arg1, arg2, arg3); |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4512 |
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
4513 while (CONSP (list)) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4514 { |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4515 if (NILP (arg3)) |
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
4516 call4 (XCAR (list), overlay, after ? Qt : Qnil, arg1, arg2); |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4517 else |
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
4518 call5 (XCAR (list), overlay, after ? Qt : Qnil, arg1, arg2, arg3); |
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
4519 list = XCDR (list); |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4520 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4521 UNGCPRO; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4522 } |
8839 | 4523 |
4524 /* Delete any zero-sized overlays at position POS, if the `evaporate' | |
4525 property is set. */ | |
4526 void | |
4527 evaporate_overlays (pos) | |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
4528 EMACS_INT pos; |
8839 | 4529 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4530 Lisp_Object overlay, hit_list; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4531 struct Lisp_Overlay *tail; |
8839 | 4532 |
4533 hit_list = Qnil; | |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
4534 if (pos <= current_buffer->overlay_center) |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4535 for (tail = current_buffer->overlays_before; tail; tail = tail->next) |
8839 | 4536 { |
4537 int endpos; | |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4538 XSETMISC (overlay, tail); |
8839 | 4539 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
4540 if (endpos < pos) | |
4541 break; | |
4542 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
|
4543 && ! NILP (Foverlay_get (overlay, Qevaporate))) |
8839 | 4544 hit_list = Fcons (overlay, hit_list); |
4545 } | |
4546 else | |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4547 for (tail = current_buffer->overlays_after; tail; tail = tail->next) |
8839 | 4548 { |
4549 int startpos; | |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4550 XSETMISC (overlay, tail); |
8839 | 4551 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
4552 if (startpos > pos) | |
4553 break; | |
4554 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
|
4555 && ! NILP (Foverlay_get (overlay, Qevaporate))) |
8839 | 4556 hit_list = Fcons (overlay, hit_list); |
4557 } | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4558 for (; CONSP (hit_list); hit_list = XCDR (hit_list)) |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4559 Fdelete_overlay (XCAR (hit_list)); |
8839 | 4560 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4561 |
9464
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
4562 /* Somebody has tried to store a value with an unacceptable type |
20995
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
4563 in the slot with offset OFFSET. */ |
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
4564 |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4565 void |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
4566 buffer_slot_type_mismatch (newval, type) |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
4567 Lisp_Object newval; |
86285
59344cb482f3
* lisp.h (struct Lisp_Buffer_Objfwd): Add a `slottype' field.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86230
diff
changeset
|
4568 int type; |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4569 { |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
4570 Lisp_Object predicate; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4571 |
86285
59344cb482f3
* lisp.h (struct Lisp_Buffer_Objfwd): Add a `slottype' field.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86230
diff
changeset
|
4572 switch (type) |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4573 { |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
4574 case Lisp_Int: predicate = Qintegerp; break; |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
4575 case Lisp_String: predicate = Qstringp; break; |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
4576 case Lisp_Symbol: predicate = Qsymbolp; break; |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
4577 default: abort (); |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4578 } |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4579 |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
4580 wrong_type_argument (predicate, newval); |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4581 } |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4582 |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4583 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4584 /*********************************************************************** |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4585 Allocation with mmap |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4586 ***********************************************************************/ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4587 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4588 #ifdef USE_MMAP_FOR_BUFFERS |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4589 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4590 #include <sys/types.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4591 #include <sys/mman.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4592 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4593 #ifndef MAP_ANON |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4594 #ifdef MAP_ANONYMOUS |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4595 #define MAP_ANON MAP_ANONYMOUS |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4596 #else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4597 #define MAP_ANON 0 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4598 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4599 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4600 |
33645
e822f94eb7d9
(MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents:
33598
diff
changeset
|
4601 #ifndef MAP_FAILED |
e822f94eb7d9
(MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents:
33598
diff
changeset
|
4602 #define MAP_FAILED ((void *) -1) |
e822f94eb7d9
(MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents:
33598
diff
changeset
|
4603 #endif |
e822f94eb7d9
(MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents:
33598
diff
changeset
|
4604 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4605 #include <stdio.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4606 #include <errno.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4607 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4608 #if MAP_ANON == 0 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4609 #include <fcntl.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4610 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4611 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4612 #include "coding.h" |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4613 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4614 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4615 /* Memory is allocated in regions which are mapped using mmap(2). |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4616 The current implementation lets the system select mapped |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4617 addresses; we're not using MAP_FIXED in general, except when |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4618 trying to enlarge regions. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4619 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4620 Each mapped region starts with a mmap_region structure, the user |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4621 area starts after that structure, aligned to MEM_ALIGN. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4622 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4623 +-----------------------+ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4624 | struct mmap_info + | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4625 | padding | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4626 +-----------------------+ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4627 | user data | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4628 | | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4629 | | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4630 +-----------------------+ */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4631 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4632 struct mmap_region |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4633 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4634 /* User-specified size. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4635 size_t nbytes_specified; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4636 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4637 /* Number of bytes mapped */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4638 size_t nbytes_mapped; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4639 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4640 /* Pointer to the location holding the address of the memory |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4641 allocated with the mmap'd block. The variable actually points |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4642 after this structure. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4643 POINTER_TYPE **var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4644 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4645 /* Next and previous in list of all mmap'd regions. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4646 struct mmap_region *next, *prev; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4647 }; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4648 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4649 /* Doubly-linked list of mmap'd regions. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4650 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4651 static struct mmap_region *mmap_regions; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4652 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4653 /* File descriptor for mmap. If we don't have anonymous mapping, |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4654 /dev/zero will be opened on it. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4655 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4656 static int mmap_fd; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4657 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4658 /* Temporary storage for mmap_set_vars, see there. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4659 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4660 static struct mmap_region *mmap_regions_1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4661 static int mmap_fd_1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4662 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4663 /* Page size on this system. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4664 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4665 static int mmap_page_size; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4666 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4667 /* 1 means mmap has been intialized. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4668 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4669 static int mmap_initialized_p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4670 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4671 /* Value is X rounded up to the next multiple of N. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4672 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4673 #define ROUND(X, N) (((X) + (N) - 1) / (N) * (N)) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4674 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4675 /* Size of mmap_region structure plus padding. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4676 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4677 #define MMAP_REGION_STRUCT_SIZE \ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4678 ROUND (sizeof (struct mmap_region), MEM_ALIGN) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4679 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4680 /* Given a pointer P to the start of the user-visible part of a mapped |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4681 region, return a pointer to the start of the region. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4682 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4683 #define MMAP_REGION(P) \ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4684 ((struct mmap_region *) ((char *) (P) - MMAP_REGION_STRUCT_SIZE)) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4685 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4686 /* Given a pointer P to the start of a mapped region, return a pointer |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4687 to the start of the user-visible part of the region. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4688 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4689 #define MMAP_USER_AREA(P) \ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4690 ((POINTER_TYPE *) ((char *) (P) + MMAP_REGION_STRUCT_SIZE)) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4691 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4692 #define MEM_ALIGN sizeof (double) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4693 |
48090 | 4694 /* Predicate returning true if part of the address range [START .. END] |
4695 is currently mapped. Used to prevent overwriting an existing | |
44617
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4696 memory mapping. |
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4697 |
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4698 Default is to conservativly assume the address range is occupied by |
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4699 something else. This can be overridden by system configuration |
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4700 files if system-specific means to determine this exists. */ |
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4701 |
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4702 #ifndef MMAP_ALLOCATED_P |
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4703 #define MMAP_ALLOCATED_P(start, end) 1 |
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4704 #endif |
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4705 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4706 /* Function prototypes. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4707 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4708 static int mmap_free_1 P_ ((struct mmap_region *)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4709 static int mmap_enlarge P_ ((struct mmap_region *, int)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4710 static struct mmap_region *mmap_find P_ ((POINTER_TYPE *, POINTER_TYPE *)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4711 static POINTER_TYPE *mmap_alloc P_ ((POINTER_TYPE **, size_t)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4712 static POINTER_TYPE *mmap_realloc P_ ((POINTER_TYPE **, size_t)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4713 static void mmap_free P_ ((POINTER_TYPE **ptr)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4714 static void mmap_init P_ ((void)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4715 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4716 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4717 /* Return a region overlapping address range START...END, or null if |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4718 none. END is not including, i.e. the last byte in the range |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4719 is at END - 1. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4720 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4721 static struct mmap_region * |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4722 mmap_find (start, end) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4723 POINTER_TYPE *start, *end; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4724 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4725 struct mmap_region *r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4726 char *s = (char *) start, *e = (char *) end; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4727 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4728 for (r = mmap_regions; r; r = r->next) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4729 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4730 char *rstart = (char *) r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4731 char *rend = rstart + r->nbytes_mapped; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4732 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4733 if (/* First byte of range, i.e. START, in this region? */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4734 (s >= rstart && s < rend) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4735 /* Last byte of range, i.e. END - 1, in this region? */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4736 || (e > rstart && e <= rend) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4737 /* First byte of this region in the range? */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4738 || (rstart >= s && rstart < e) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4739 /* Last byte of this region in the range? */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4740 || (rend > s && rend <= e)) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4741 break; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4742 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4743 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4744 return r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4745 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4746 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4747 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4748 /* Unmap a region. P is a pointer to the start of the user-araa of |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4749 the region. Value is non-zero if successful. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4750 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4751 static int |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4752 mmap_free_1 (r) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4753 struct mmap_region *r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4754 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4755 if (r->next) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4756 r->next->prev = r->prev; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4757 if (r->prev) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4758 r->prev->next = r->next; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4759 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4760 mmap_regions = r->next; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4761 |
33675
cd12ade4547d
(mmap_free_1): Avoid a compiler warning.
Gerd Moellmann <gerd@gnu.org>
parents:
33645
diff
changeset
|
4762 if (munmap ((POINTER_TYPE *) r, r->nbytes_mapped) == -1) |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4763 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4764 fprintf (stderr, "munmap: %s\n", emacs_strerror (errno)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4765 return 0; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4766 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4767 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4768 return 1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4769 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4770 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4771 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4772 /* Enlarge region R by NPAGES pages. NPAGES < 0 means shrink R. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4773 Value is non-zero if successful. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4774 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4775 static int |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4776 mmap_enlarge (r, npages) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4777 struct mmap_region *r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4778 int npages; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4779 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4780 char *region_end = (char *) r + r->nbytes_mapped; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4781 size_t nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4782 int success = 0; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4783 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4784 if (npages < 0) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4785 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4786 /* Unmap pages at the end of the region. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4787 nbytes = - npages * mmap_page_size; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4788 if (munmap (region_end - nbytes, nbytes) == -1) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4789 fprintf (stderr, "munmap: %s\n", emacs_strerror (errno)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4790 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4791 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4792 r->nbytes_mapped -= nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4793 success = 1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4794 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4795 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4796 else if (npages > 0) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4797 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4798 nbytes = npages * mmap_page_size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4799 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4800 /* Try to map additional pages at the end of the region. We |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4801 cannot do this if the address range is already occupied by |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4802 something else because mmap deletes any previous mapping. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4803 I'm not sure this is worth doing, let's see. */ |
44617
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4804 if (!MMAP_ALLOCATED_P (region_end, region_end + nbytes)) |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4805 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4806 POINTER_TYPE *p; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4807 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4808 p = mmap (region_end, nbytes, PROT_READ | PROT_WRITE, |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4809 MAP_ANON | MAP_PRIVATE | MAP_FIXED, mmap_fd, 0); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4810 if (p == MAP_FAILED) |
33598
d2ed1317ec06
(mmap_enlarge): Don't print a message on stderr
Gerd Moellmann <gerd@gnu.org>
parents:
32856
diff
changeset
|
4811 ; /* fprintf (stderr, "mmap: %s\n", emacs_strerror (errno)); */ |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4812 else if (p != (POINTER_TYPE *) region_end) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4813 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4814 /* Kernels are free to choose a different address. In |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4815 that case, unmap what we've mapped above; we have |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4816 no use for it. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4817 if (munmap (p, nbytes) == -1) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4818 fprintf (stderr, "munmap: %s\n", emacs_strerror (errno)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4819 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4820 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4821 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4822 r->nbytes_mapped += nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4823 success = 1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4824 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4825 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4826 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4827 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4828 return success; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4829 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4830 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4831 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4832 /* Set or reset variables holding references to mapped regions. If |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4833 RESTORE_P is zero, set all variables to null. If RESTORE_P is |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4834 non-zero, set all variables to the start of the user-areas |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4835 of mapped regions. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4836 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4837 This function is called from Fdump_emacs to ensure that the dumped |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4838 Emacs doesn't contain references to memory that won't be mapped |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4839 when Emacs starts. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4840 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4841 void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4842 mmap_set_vars (restore_p) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4843 int restore_p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4844 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4845 struct mmap_region *r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4846 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4847 if (restore_p) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4848 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4849 mmap_regions = mmap_regions_1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4850 mmap_fd = mmap_fd_1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4851 for (r = mmap_regions; r; r = r->next) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4852 *r->var = MMAP_USER_AREA (r); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4853 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4854 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4855 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4856 for (r = mmap_regions; r; r = r->next) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4857 *r->var = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4858 mmap_regions_1 = mmap_regions; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4859 mmap_regions = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4860 mmap_fd_1 = mmap_fd; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4861 mmap_fd = -1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4862 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4863 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4864 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4865 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4866 /* Allocate a block of storage large enough to hold NBYTES bytes of |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4867 data. A pointer to the data is returned in *VAR. VAR is thus the |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4868 address of some variable which will use the data area. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4869 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4870 The allocation of 0 bytes is valid. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4871 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4872 If we can't allocate the necessary memory, set *VAR to null, and |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4873 return null. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4874 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4875 static POINTER_TYPE * |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4876 mmap_alloc (var, nbytes) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4877 POINTER_TYPE **var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4878 size_t nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4879 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4880 void *p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4881 size_t map; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4882 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4883 mmap_init (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4884 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4885 map = ROUND (nbytes + MMAP_REGION_STRUCT_SIZE, mmap_page_size); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4886 p = mmap (NULL, map, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4887 mmap_fd, 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4888 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4889 if (p == MAP_FAILED) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4890 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4891 if (errno != ENOMEM) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4892 fprintf (stderr, "mmap: %s\n", emacs_strerror (errno)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4893 p = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4894 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4895 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4896 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4897 struct mmap_region *r = (struct mmap_region *) p; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4898 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4899 r->nbytes_specified = nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4900 r->nbytes_mapped = map; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4901 r->var = var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4902 r->prev = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4903 r->next = mmap_regions; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4904 if (r->next) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4905 r->next->prev = r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4906 mmap_regions = r; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4907 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4908 p = MMAP_USER_AREA (p); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4909 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4910 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4911 return *var = p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4912 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4913 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4914 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4915 /* Given a pointer at address VAR to data allocated with mmap_alloc, |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4916 resize it to size NBYTES. Change *VAR to reflect the new block, |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4917 and return this value. If more memory cannot be allocated, then |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4918 leave *VAR unchanged, and return null. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4919 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4920 static POINTER_TYPE * |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4921 mmap_realloc (var, nbytes) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4922 POINTER_TYPE **var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4923 size_t nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4924 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4925 POINTER_TYPE *result; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4926 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4927 mmap_init (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4928 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4929 if (*var == NULL) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4930 result = mmap_alloc (var, nbytes); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4931 else if (nbytes == 0) |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4932 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4933 mmap_free (var); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4934 result = mmap_alloc (var, nbytes); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4935 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4936 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4937 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4938 struct mmap_region *r = MMAP_REGION (*var); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4939 size_t room = r->nbytes_mapped - MMAP_REGION_STRUCT_SIZE; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4940 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4941 if (room < nbytes) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4942 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4943 /* Must enlarge. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4944 POINTER_TYPE *old_ptr = *var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4945 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4946 /* Try to map additional pages at the end of the region. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4947 If that fails, allocate a new region, copy data |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4948 from the old region, then free it. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4949 if (mmap_enlarge (r, (ROUND (nbytes - room, mmap_page_size) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4950 / mmap_page_size))) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4951 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4952 r->nbytes_specified = nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4953 *var = result = old_ptr; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4954 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4955 else if (mmap_alloc (var, nbytes)) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4956 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4957 bcopy (old_ptr, *var, r->nbytes_specified); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4958 mmap_free_1 (MMAP_REGION (old_ptr)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4959 result = *var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4960 r = MMAP_REGION (result); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4961 r->nbytes_specified = nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4962 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4963 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4964 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4965 *var = old_ptr; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4966 result = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4967 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4968 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4969 else if (room - nbytes >= mmap_page_size) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4970 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4971 /* Shrinking by at least a page. Let's give some |
46588 | 4972 memory back to the system. |
4973 | |
4974 The extra parens are to make the division happens first, | |
4975 on positive values, so we know it will round towards | |
4976 zero. */ | |
46585
8d0730b0e14c
(mmap_realloc): When shrinking, make sure number of
Ken Raeburn <raeburn@raeburn.org>
parents:
46445
diff
changeset
|
4977 mmap_enlarge (r, - ((room - nbytes) / mmap_page_size)); |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4978 result = *var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4979 r->nbytes_specified = nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4980 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4981 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4982 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4983 /* Leave it alone. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4984 result = *var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4985 r->nbytes_specified = nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4986 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4987 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4988 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4989 return result; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4990 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4991 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4992 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4993 /* Free a block of relocatable storage whose data is pointed to by |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4994 PTR. Store 0 in *PTR to show there's no block allocated. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4995 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4996 static void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4997 mmap_free (var) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4998 POINTER_TYPE **var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4999 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5000 mmap_init (); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5001 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5002 if (*var) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5003 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5004 mmap_free_1 (MMAP_REGION (*var)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5005 *var = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5006 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5007 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5008 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5009 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5010 /* Perform necessary intializations for the use of mmap. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5011 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5012 static void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5013 mmap_init () |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5014 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5015 #if MAP_ANON == 0 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5016 /* The value of mmap_fd is initially 0 in temacs, and -1 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5017 in a dumped Emacs. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5018 if (mmap_fd <= 0) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5019 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5020 /* No anonymous mmap -- we need the file descriptor. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5021 mmap_fd = open ("/dev/zero", O_RDONLY); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5022 if (mmap_fd == -1) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5023 fatal ("Cannot open /dev/zero: %s", emacs_strerror (errno)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5024 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5025 #endif /* MAP_ANON == 0 */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5026 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5027 if (mmap_initialized_p) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5028 return; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5029 mmap_initialized_p = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5030 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5031 #if MAP_ANON != 0 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5032 mmap_fd = -1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5033 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5034 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5035 mmap_page_size = getpagesize (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5036 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5037 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5038 #endif /* USE_MMAP_FOR_BUFFERS */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5039 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5040 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5041 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5042 /*********************************************************************** |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5043 Buffer-text Allocation |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5044 ***********************************************************************/ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5045 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5046 #ifdef REL_ALLOC |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5047 extern POINTER_TYPE *r_alloc P_ ((POINTER_TYPE **, size_t)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5048 extern POINTER_TYPE *r_re_alloc P_ ((POINTER_TYPE **, size_t)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5049 extern void r_alloc_free P_ ((POINTER_TYPE **ptr)); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5050 #endif /* REL_ALLOC */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5051 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5052 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5053 /* Allocate NBYTES bytes for buffer B's text buffer. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5054 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5055 static void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5056 alloc_buffer_text (b, nbytes) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5057 struct buffer *b; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5058 size_t nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5059 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5060 POINTER_TYPE *p; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5061 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5062 BLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5063 #if defined USE_MMAP_FOR_BUFFERS |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5064 p = mmap_alloc ((POINTER_TYPE **) &b->text->beg, nbytes); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5065 #elif defined REL_ALLOC |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5066 p = r_alloc ((POINTER_TYPE **) &b->text->beg, nbytes); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5067 #else |
31612
2050f93e8cef
(alloc_buffer_text): Fix xmalloc call.
Dave Love <fx@gnu.org>
parents:
31604
diff
changeset
|
5068 p = xmalloc (nbytes); |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5069 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5070 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5071 if (p == NULL) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5072 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5073 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5074 memory_full (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5075 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5076 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5077 b->text->beg = (unsigned char *) p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5078 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5079 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5080 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5081 /* Enlarge buffer B's text buffer by DELTA bytes. DELTA < 0 means |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5082 shrink it. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5083 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5084 void |
93117
87f463ae1530
(enlarge_buffer_text): Fix int -> EMACS_INT.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92975
diff
changeset
|
5085 enlarge_buffer_text (struct buffer *b, EMACS_INT delta) |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5086 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5087 POINTER_TYPE *p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5088 size_t nbytes = (BUF_Z_BYTE (b) - BUF_BEG_BYTE (b) + BUF_GAP_SIZE (b) + 1 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5089 + delta); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5090 BLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5091 #if defined USE_MMAP_FOR_BUFFERS |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5092 p = mmap_realloc ((POINTER_TYPE **) &b->text->beg, nbytes); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5093 #elif defined REL_ALLOC |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5094 p = r_re_alloc ((POINTER_TYPE **) &b->text->beg, nbytes); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5095 #else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5096 p = xrealloc (b->text->beg, nbytes); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5097 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5098 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5099 if (p == NULL) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5100 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5101 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5102 memory_full (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5103 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5104 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5105 BUF_BEG_ADDR (b) = (unsigned char *) p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5106 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5107 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5108 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5109 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5110 /* Free buffer B's text buffer. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5111 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5112 static void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5113 free_buffer_text (b) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5114 struct buffer *b; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5115 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5116 BLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5117 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5118 #if defined USE_MMAP_FOR_BUFFERS |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5119 mmap_free ((POINTER_TYPE **) &b->text->beg); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5120 #elif defined REL_ALLOC |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5121 r_alloc_free ((POINTER_TYPE **) &b->text->beg); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5122 #else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5123 xfree (b->text->beg); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5124 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5125 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5126 BUF_BEG_ADDR (b) = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5127 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5128 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5129 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5130 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5131 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5132 /*********************************************************************** |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5133 Initialization |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5134 ***********************************************************************/ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5135 |
21514 | 5136 void |
333 | 5137 init_buffer_once () |
5138 { | |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5139 int idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5140 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5141 bzero (buffer_permanent_local_flags, sizeof buffer_permanent_local_flags); |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
5142 |
333 | 5143 /* Make sure all markable slots in buffer_defaults |
5144 are initialized reasonably, so mark_buffer won't choke. */ | |
5145 reset_buffer (&buffer_defaults); | |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
5146 reset_buffer_local_variables (&buffer_defaults, 1); |
333 | 5147 reset_buffer (&buffer_local_symbols); |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
5148 reset_buffer_local_variables (&buffer_local_symbols, 1); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
5149 /* Prevent GC from getting confused. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
5150 buffer_defaults.text = &buffer_defaults.own_text; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
5151 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
|
5152 BUF_INTERVALS (&buffer_defaults) = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
5153 BUF_INTERVALS (&buffer_local_symbols) = 0; |
85018
3389713480bb
(Fget_buffer_create, init_buffer_once): Use XSETPVECTYPE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85011
diff
changeset
|
5154 XSETPVECTYPE (&buffer_defaults, PVEC_BUFFER); |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
5155 XSETBUFFER (Vbuffer_defaults, &buffer_defaults); |
85018
3389713480bb
(Fget_buffer_create, init_buffer_once): Use XSETPVECTYPE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85011
diff
changeset
|
5156 XSETPVECTYPE (&buffer_local_symbols, PVEC_BUFFER); |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
5157 XSETBUFFER (Vbuffer_local_symbols, &buffer_local_symbols); |
333 | 5158 |
5159 /* Set up the default values of various buffer slots. */ | |
5160 /* Must do these before making the first buffer! */ | |
5161 | |
28636
19c81f320db5
(Fmake_indirect_buffer): Escape newline in doc.
Dave Love <fx@gnu.org>
parents:
28625
diff
changeset
|
5162 /* real setup is done in bindings.el */ |
333 | 5163 buffer_defaults.mode_line_format = build_string ("%-"); |
25546 | 5164 buffer_defaults.header_line_format = Qnil; |
333 | 5165 buffer_defaults.abbrev_mode = Qnil; |
5166 buffer_defaults.overwrite_mode = Qnil; | |
5167 buffer_defaults.case_fold_search = Qt; | |
5168 buffer_defaults.auto_fill_function = Qnil; | |
5169 buffer_defaults.selective_display = Qnil; | |
5170 #ifndef old | |
5171 buffer_defaults.selective_display_ellipses = Qt; | |
5172 #endif | |
5173 buffer_defaults.abbrev_table = Qnil; | |
5174 buffer_defaults.display_table = Qnil; | |
5175 buffer_defaults.undo_list = Qnil; | |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
5176 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
|
5177 buffer_defaults.file_format = Qnil; |
56976
b3aa8cb4c381
(reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56669
diff
changeset
|
5178 buffer_defaults.auto_save_file_format = Qt; |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
5179 buffer_defaults.overlays_before = NULL; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
5180 buffer_defaults.overlays_after = NULL; |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
5181 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
|
5182 |
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
|
5183 XSETFASTINT (buffer_defaults.tab_width, 8); |
333 | 5184 buffer_defaults.truncate_lines = Qnil; |
96233
514e5b8b3fbf
(syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents:
95826
diff
changeset
|
5185 buffer_defaults.word_wrap = Qnil; |
333 | 5186 buffer_defaults.ctl_arrow = Qt; |
17022 | 5187 buffer_defaults.direction_reversed = Qnil; |
28322
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
5188 buffer_defaults.cursor_type = Qt; |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
5189 buffer_defaults.extra_line_spacing = Qnil; |
62069
a0a348c8b14b
(init_buffer_once): Set cursor_in_non_selected_windows default value.
Kim F. Storm <storm@cua.dk>
parents:
62030
diff
changeset
|
5190 buffer_defaults.cursor_in_non_selected_windows = Qt; |
333 | 5191 |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
5192 #ifdef DOS_NT |
7270
0f79f4bd3c62
(init_buffer_once): Initialize buffer_file_type field right.
Richard M. Stallman <rms@gnu.org>
parents:
7062
diff
changeset
|
5193 buffer_defaults.buffer_file_type = Qnil; /* TEXT */ |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5194 #endif |
17124
fdad8ea24563
(init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents:
17022
diff
changeset
|
5195 buffer_defaults.enable_multibyte_characters = Qt; |
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5196 buffer_defaults.buffer_file_coding_system = Qnil; |
9296
a1a7fc21ded9
(reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9262
diff
changeset
|
5197 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
|
5198 XSETFASTINT (buffer_defaults.left_margin, 0); |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
5199 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
|
5200 buffer_defaults.file_truename = Qnil; |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
5201 XSETFASTINT (buffer_defaults.display_count, 0); |
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5202 XSETFASTINT (buffer_defaults.left_margin_cols, 0); |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5203 XSETFASTINT (buffer_defaults.right_margin_cols, 0); |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5204 buffer_defaults.left_fringe_width = Qnil; |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5205 buffer_defaults.right_fringe_width = Qnil; |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5206 buffer_defaults.fringes_outside_margins = Qnil; |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5207 buffer_defaults.scroll_bar_width = Qnil; |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5208 buffer_defaults.vertical_scroll_bar_type = Qt; |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5209 buffer_defaults.indicate_empty_lines = Qnil; |
53602
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5210 buffer_defaults.indicate_buffer_boundaries = Qnil; |
69047
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5211 buffer_defaults.fringe_indicator_alist = Qnil; |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5212 buffer_defaults.fringe_cursor_alist = Qnil; |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5213 buffer_defaults.scroll_up_aggressively = Qnil; |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5214 buffer_defaults.scroll_down_aggressively = Qnil; |
22150
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5215 buffer_defaults.display_time = Qnil; |
333 | 5216 |
5217 /* Assign the local-flags to the slots that have default values. | |
5218 The local flag is a bit that is used in the buffer | |
5219 to say that it has its own local value for the slot. | |
5220 The local flag bits are in the local_var_flags slot of the buffer. */ | |
5221 | |
5222 /* 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
|
5223 if (sizeof (EMACS_INT) != sizeof (Lisp_Object)) abort (); |
333 | 5224 |
5225 /* 0 means not a lisp var, -1 means always local, else mask */ | |
5226 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
|
5227 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
|
5228 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
|
5229 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
|
5230 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
|
5231 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
|
5232 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
|
5233 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
|
5234 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
|
5235 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
|
5236 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
|
5237 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
|
5238 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
|
5239 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
|
5240 XSETINT (buffer_local_flags.file_format, -1); |
56976
b3aa8cb4c381
(reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56669
diff
changeset
|
5241 XSETINT (buffer_local_flags.auto_save_file_format, -1); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
5242 XSETINT (buffer_local_flags.display_count, -1); |
22150
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
5243 XSETINT (buffer_local_flags.display_time, -1); |
20995
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
5244 XSETINT (buffer_local_flags.enable_multibyte_characters, -1); |
9296
a1a7fc21ded9
(reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9262
diff
changeset
|
5245 |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5246 idx = 1; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5247 XSETFASTINT (buffer_local_flags.mode_line_format, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5248 XSETFASTINT (buffer_local_flags.abbrev_mode, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5249 XSETFASTINT (buffer_local_flags.overwrite_mode, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5250 XSETFASTINT (buffer_local_flags.case_fold_search, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5251 XSETFASTINT (buffer_local_flags.auto_fill_function, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5252 XSETFASTINT (buffer_local_flags.selective_display, idx); ++idx; |
333 | 5253 #ifndef old |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5254 XSETFASTINT (buffer_local_flags.selective_display_ellipses, idx); ++idx; |
333 | 5255 #endif |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5256 XSETFASTINT (buffer_local_flags.tab_width, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5257 XSETFASTINT (buffer_local_flags.truncate_lines, idx); ++idx; |
96233
514e5b8b3fbf
(syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents:
95826
diff
changeset
|
5258 XSETFASTINT (buffer_local_flags.word_wrap, idx); ++idx; |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5259 XSETFASTINT (buffer_local_flags.ctl_arrow, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5260 XSETFASTINT (buffer_local_flags.fill_column, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5261 XSETFASTINT (buffer_local_flags.left_margin, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5262 XSETFASTINT (buffer_local_flags.abbrev_table, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5263 XSETFASTINT (buffer_local_flags.display_table, idx); ++idx; |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
5264 #ifdef DOS_NT |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5265 XSETFASTINT (buffer_local_flags.buffer_file_type, idx); |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
5266 /* Make this one a permanent local. */ |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5267 buffer_permanent_local_flags[idx++] = 1; |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5268 #endif |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5269 XSETFASTINT (buffer_local_flags.syntax_table, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5270 XSETFASTINT (buffer_local_flags.cache_long_line_scans, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5271 XSETFASTINT (buffer_local_flags.category_table, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5272 XSETFASTINT (buffer_local_flags.direction_reversed, idx); ++idx; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5273 XSETFASTINT (buffer_local_flags.buffer_file_coding_system, idx); |
17124
fdad8ea24563
(init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents:
17022
diff
changeset
|
5274 /* Make this one a permanent local. */ |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5275 buffer_permanent_local_flags[idx++] = 1; |
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5276 XSETFASTINT (buffer_local_flags.left_margin_cols, idx); ++idx; |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5277 XSETFASTINT (buffer_local_flags.right_margin_cols, idx); ++idx; |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5278 XSETFASTINT (buffer_local_flags.left_fringe_width, idx); ++idx; |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5279 XSETFASTINT (buffer_local_flags.right_fringe_width, idx); ++idx; |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5280 XSETFASTINT (buffer_local_flags.fringes_outside_margins, idx); ++idx; |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5281 XSETFASTINT (buffer_local_flags.scroll_bar_width, idx); ++idx; |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5282 XSETFASTINT (buffer_local_flags.vertical_scroll_bar_type, idx); ++idx; |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5283 XSETFASTINT (buffer_local_flags.indicate_empty_lines, idx); ++idx; |
53602
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5284 XSETFASTINT (buffer_local_flags.indicate_buffer_boundaries, idx); ++idx; |
69047
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5285 XSETFASTINT (buffer_local_flags.fringe_indicator_alist, idx); ++idx; |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5286 XSETFASTINT (buffer_local_flags.fringe_cursor_alist, idx); ++idx; |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5287 XSETFASTINT (buffer_local_flags.scroll_up_aggressively, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5288 XSETFASTINT (buffer_local_flags.scroll_down_aggressively, idx); ++idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5289 XSETFASTINT (buffer_local_flags.header_line_format, idx); ++idx; |
28332
8abeccb78576
(syms_of_buffer): Add default-cursor-type.
Gerd Moellmann <gerd@gnu.org>
parents:
28322
diff
changeset
|
5290 XSETFASTINT (buffer_local_flags.cursor_type, idx); ++idx; |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
5291 XSETFASTINT (buffer_local_flags.extra_line_spacing, idx); ++idx; |
62030
bc82609e1655
(syms_of_buffer): Define cursor-in-non-selected-windows.
Richard M. Stallman <rms@gnu.org>
parents:
61445
diff
changeset
|
5292 XSETFASTINT (buffer_local_flags.cursor_in_non_selected_windows, idx); ++idx; |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5293 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5294 /* Need more room? */ |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
5295 if (idx >= MAX_PER_BUFFER_VARS) |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5296 abort (); |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
5297 last_per_buffer_idx = idx; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5298 |
333 | 5299 Vbuffer_alist = Qnil; |
5300 current_buffer = 0; | |
5301 all_buffers = 0; | |
5302 | |
5303 QSFundamental = build_string ("Fundamental"); | |
5304 | |
5305 Qfundamental_mode = intern ("fundamental-mode"); | |
5306 buffer_defaults.major_mode = Qfundamental_mode; | |
5307 | |
5308 Qmode_class = intern ("mode-class"); | |
5309 | |
5310 Qprotected_field = intern ("protected-field"); | |
5311 | |
5312 Qpermanent_local = intern ("permanent-local"); | |
5313 | |
5314 Qkill_buffer_hook = intern ("kill-buffer-hook"); | |
51431
5fc6a7035dd3
(init_buffer_once): Make kill-buffer-hook permanent-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51394
diff
changeset
|
5315 Fput (Qkill_buffer_hook, Qpermanent_local, Qt); |
333 | 5316 |
48635 | 5317 Qucs_set_table_for_input = intern ("ucs-set-table-for-input"); |
5318 | |
102619
f40356cf5650
Move comment to make clearer it's talking about buffer Vprin1_to_string_buffer.
Juanma Barranquero <lekktu@gmail.com>
parents:
102466
diff
changeset
|
5319 /* super-magic invisible buffer */ |
333 | 5320 Vprin1_to_string_buffer = Fget_buffer_create (build_string (" prin1")); |
5321 Vbuffer_alist = Qnil; | |
5322 | |
648 | 5323 Fset_buffer (Fget_buffer_create (build_string ("*scratch*"))); |
23399
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
5324 |
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
5325 inhibit_modification_hooks = 0; |
333 | 5326 } |
5327 | |
21514 | 5328 void |
333 | 5329 init_buffer () |
5330 { | |
1563
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
5331 char *pwd; |
3463
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
5332 Lisp_Object temp; |
66043
7e251d472f1c
(init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents:
65439
diff
changeset
|
5333 int len; |
333 | 5334 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5335 #ifdef USE_MMAP_FOR_BUFFERS |
31412
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5336 { |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5337 /* When using the ralloc implementation based on mmap(2), buffer |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5338 text pointers will have been set to null in the dumped Emacs. |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5339 Map new memory. */ |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5340 struct buffer *b; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5341 |
31412
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5342 for (b = all_buffers; b; b = b->next) |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5343 if (b->text->beg == NULL) |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5344 enlarge_buffer_text (b, 0); |
31412
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5345 } |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5346 #endif /* USE_MMAP_FOR_BUFFERS */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5347 |
333 | 5348 Fset_buffer (Fget_buffer_create (build_string ("*scratch*"))); |
21141
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
5349 if (NILP (buffer_defaults.enable_multibyte_characters)) |
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
5350 Fset_buffer_multibyte (Qnil); |
1563
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
5351 |
65411
29cca0143d6f
(init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
5352 pwd = get_current_dir_name (); |
65422
c832bf03b2b2
(init_buffer): Fix error message for failed call to get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents:
65411
diff
changeset
|
5353 |
65438
170f43effa81
(init_buffer): Grow buffer to add directory separator
Romain Francoise <romain@orebokech.com>
parents:
65422
diff
changeset
|
5354 if (!pwd) |
65422
c832bf03b2b2
(init_buffer): Fix error message for failed call to get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents:
65411
diff
changeset
|
5355 fatal ("`get_current_dir_name' failed: %s\n", strerror (errno)); |
333 | 5356 |
5357 /* Maybe this should really use some standard subroutine | |
5358 whose definition is filename syntax dependent. */ | |
66043
7e251d472f1c
(init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents:
65439
diff
changeset
|
5359 len = strlen (pwd); |
7e251d472f1c
(init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents:
65439
diff
changeset
|
5360 if (!(IS_DIRECTORY_SEP (pwd[len - 1]))) |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
5361 { |
65438
170f43effa81
(init_buffer): Grow buffer to add directory separator
Romain Francoise <romain@orebokech.com>
parents:
65422
diff
changeset
|
5362 /* Grow buffer to add directory separator and '\0'. */ |
100633
5395c014feb8
* buffer.c (init_buffer): Use realloc instead of xrealloc.
Andreas Schwab <schwab@suse.de>
parents:
100295
diff
changeset
|
5363 pwd = (char *) realloc (pwd, len + 2); |
5395c014feb8
* buffer.c (init_buffer): Use realloc instead of xrealloc.
Andreas Schwab <schwab@suse.de>
parents:
100295
diff
changeset
|
5364 if (!pwd) |
5395c014feb8
* buffer.c (init_buffer): Use realloc instead of xrealloc.
Andreas Schwab <schwab@suse.de>
parents:
100295
diff
changeset
|
5365 fatal ("`get_current_dir_name' failed: %s\n", strerror (errno)); |
66043
7e251d472f1c
(init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents:
65439
diff
changeset
|
5366 pwd[len] = DIRECTORY_SEP; |
7e251d472f1c
(init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents:
65439
diff
changeset
|
5367 pwd[len + 1] = '\0'; |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
5368 } |
16384
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
5369 |
65411
29cca0143d6f
(init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
5370 current_buffer->directory = make_unibyte_string (pwd, strlen (pwd)); |
58618
567ca4ca8574
(init_buffer): Set current_buffer->directory to a
Kenichi Handa <handa@m17n.org>
parents:
58501
diff
changeset
|
5371 if (! NILP (buffer_defaults.enable_multibyte_characters)) |
65439
1ffe6d4d0fc4
(init_buffer): Fix typos.
Romain Francoise <romain@orebokech.com>
parents:
65438
diff
changeset
|
5372 /* At this moment, we still don't know how to decode the |
65438
170f43effa81
(init_buffer): Grow buffer to add directory separator
Romain Francoise <romain@orebokech.com>
parents:
65422
diff
changeset
|
5373 directory name. So, we keep the bytes in multibyte form so |
58618
567ca4ca8574
(init_buffer): Set current_buffer->directory to a
Kenichi Handa <handa@m17n.org>
parents:
58501
diff
changeset
|
5374 that ENCODE_FILE correctly gets the original bytes. */ |
567ca4ca8574
(init_buffer): Set current_buffer->directory to a
Kenichi Handa <handa@m17n.org>
parents:
58501
diff
changeset
|
5375 current_buffer->directory |
567ca4ca8574
(init_buffer): Set current_buffer->directory to a
Kenichi Handa <handa@m17n.org>
parents:
58501
diff
changeset
|
5376 = string_to_multibyte (current_buffer->directory); |
3463
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
5377 |
16384
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
5378 /* Add /: to the front of the name |
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
5379 if it would otherwise be treated as magic. */ |
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
5380 temp = Ffind_file_name_handler (current_buffer->directory, Qt); |
20080
52fbf5fad62e
(init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents:
19977
diff
changeset
|
5381 if (! NILP (temp) |
52fbf5fad62e
(init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents:
19977
diff
changeset
|
5382 /* If the default dir is just /, TEMP is non-nil |
52fbf5fad62e
(init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents:
19977
diff
changeset
|
5383 because of the ange-ftp completion handler. |
52fbf5fad62e
(init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents:
19977
diff
changeset
|
5384 However, it is not necessary to turn / into /:/. |
52fbf5fad62e
(init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents:
19977
diff
changeset
|
5385 So avoid doing that. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5386 && strcmp ("/", SDATA (current_buffer->directory))) |
16384
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
5387 current_buffer->directory |
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
5388 = concat2 (build_string ("/:"), current_buffer->directory); |
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
5389 |
3463
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
5390 temp = get_minibuffer (0); |
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
5391 XBUFFER (temp)->directory = current_buffer->directory; |
65411
29cca0143d6f
(init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
5392 |
29cca0143d6f
(init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
5393 free (pwd); |
333 | 5394 } |
5395 | |
85011
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5396 /* Similar to defvar_lisp but define a variable whose value is the Lisp |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5397 Object stored in the current buffer. address is the address of the slot |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5398 in the buffer that is current now. */ |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5399 |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5400 /* TYPE is nil for a general Lisp variable. |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5401 An integer specifies a type; then only LIsp values |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5402 with that type code are allowed (except that nil is allowed too). |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5403 LNAME is the LIsp-level variable name. |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5404 VNAME is the name of the buffer slot. |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5405 DOC is a dummy where you write the doc string as a comment. */ |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5406 #define DEFVAR_PER_BUFFER(lname, vname, type, doc) \ |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5407 defvar_per_buffer (lname, vname, type, 0) |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5408 |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5409 static void |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5410 defvar_per_buffer (namestring, address, type, doc) |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5411 char *namestring; |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5412 Lisp_Object *address; |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5413 Lisp_Object type; |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5414 char *doc; |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5415 { |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5416 Lisp_Object sym, val; |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5417 int offset; |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5418 |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5419 sym = intern (namestring); |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5420 val = allocate_misc (); |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5421 offset = (char *)address - (char *)current_buffer; |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5422 |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5423 XMISCTYPE (val) = Lisp_Misc_Buffer_Objfwd; |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5424 XBUFFER_OBJFWD (val)->offset = offset; |
86285
59344cb482f3
* lisp.h (struct Lisp_Buffer_Objfwd): Add a `slottype' field.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86230
diff
changeset
|
5425 XBUFFER_OBJFWD (val)->slottype = type; |
85011
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5426 SET_SYMBOL_VALUE (sym, val); |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5427 PER_BUFFER_SYMBOL (offset) = sym; |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5428 |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5429 if (PER_BUFFER_IDX (offset) == 0) |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5430 /* Did a DEFVAR_PER_BUFFER without initializing the corresponding |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5431 slot of buffer_local_flags */ |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5432 abort (); |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5433 } |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5434 |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5435 |
333 | 5436 /* initialize the buffer routines */ |
21514 | 5437 void |
333 | 5438 syms_of_buffer () |
5439 { | |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
5440 staticpro (&last_overlay_modification_hooks); |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
5441 last_overlay_modification_hooks |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
5442 = Fmake_vector (make_number (10), Qnil); |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
5443 |
333 | 5444 staticpro (&Vbuffer_defaults); |
5445 staticpro (&Vbuffer_local_symbols); | |
5446 staticpro (&Qfundamental_mode); | |
5447 staticpro (&Qmode_class); | |
5448 staticpro (&QSFundamental); | |
5449 staticpro (&Vbuffer_alist); | |
5450 staticpro (&Qprotected_field); | |
5451 staticpro (&Qpermanent_local); | |
87977
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
5452 Qpermanent_local_hook = intern ("permanent-local-hook"); |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
5453 staticpro (&Qpermanent_local_hook); |
333 | 5454 staticpro (&Qkill_buffer_hook); |
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5455 Qoverlayp = intern ("overlayp"); |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
5456 staticpro (&Qoverlayp); |
8839 | 5457 Qevaporate = intern ("evaporate"); |
5458 staticpro (&Qevaporate); | |
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5459 Qmodification_hooks = intern ("modification-hooks"); |
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
5460 staticpro (&Qmodification_hooks); |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
5461 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
|
5462 staticpro (&Qinsert_in_front_hooks); |
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
5463 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
|
5464 staticpro (&Qinsert_behind_hooks); |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5465 Qget_file_buffer = intern ("get-file-buffer"); |
5433 | 5466 staticpro (&Qget_file_buffer); |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
5467 Qpriority = intern ("priority"); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
5468 staticpro (&Qpriority); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
5469 Qwindow = intern ("window"); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
5470 staticpro (&Qwindow); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
5471 Qbefore_string = intern ("before-string"); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
5472 staticpro (&Qbefore_string); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
5473 Qafter_string = intern ("after-string"); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
5474 staticpro (&Qafter_string); |
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5475 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
|
5476 staticpro (&Qfirst_change_hook); |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5477 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
|
5478 staticpro (&Qbefore_change_functions); |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5479 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
|
5480 staticpro (&Qafter_change_functions); |
87977
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
5481 /* The next one is initialized in init_buffer_once. */ |
48635 | 5482 staticpro (&Qucs_set_table_for_input); |
333 | 5483 |
50014
3b2576528809
(Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents:
49974
diff
changeset
|
5484 Qkill_buffer_query_functions = intern ("kill-buffer-query-functions"); |
3b2576528809
(Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents:
49974
diff
changeset
|
5485 staticpro (&Qkill_buffer_query_functions); |
3b2576528809
(Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents:
49974
diff
changeset
|
5486 |
333 | 5487 Fput (Qprotected_field, Qerror_conditions, |
5488 Fcons (Qprotected_field, Fcons (Qerror, Qnil))); | |
5489 Fput (Qprotected_field, Qerror_message, | |
5490 build_string ("Attempt to modify a protected field")); | |
5491 | |
5492 /* All these use DEFVAR_LISP_NOPRO because the slots in | |
5493 buffer_defaults will all be marked via Vbuffer_defaults. */ | |
5494 | |
5495 DEFVAR_LISP_NOPRO ("default-mode-line-format", | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5496 &buffer_defaults.mode_line_format, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5497 doc: /* Default value of `mode-line-format' for buffers that don't override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5498 This is the same as (default-value 'mode-line-format). */); |
333 | 5499 |
25546 | 5500 DEFVAR_LISP_NOPRO ("default-header-line-format", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5501 &buffer_defaults.header_line_format, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5502 doc: /* Default value of `header-line-format' for buffers that don't override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5503 This is the same as (default-value 'header-line-format). */); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5504 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5505 DEFVAR_LISP_NOPRO ("default-cursor-type", &buffer_defaults.cursor_type, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5506 doc: /* Default value of `cursor-type' for buffers that don't override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5507 This is the same as (default-value 'cursor-type). */); |
28332
8abeccb78576
(syms_of_buffer): Add default-cursor-type.
Gerd Moellmann <gerd@gnu.org>
parents:
28322
diff
changeset
|
5508 |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
5509 DEFVAR_LISP_NOPRO ("default-line-spacing", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5510 &buffer_defaults.extra_line_spacing, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5511 doc: /* Default value of `line-spacing' for buffers that don't override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5512 This is the same as (default-value 'line-spacing). */); |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
5513 |
62069
a0a348c8b14b
(init_buffer_once): Set cursor_in_non_selected_windows default value.
Kim F. Storm <storm@cua.dk>
parents:
62030
diff
changeset
|
5514 DEFVAR_LISP_NOPRO ("default-cursor-in-non-selected-windows", |
a0a348c8b14b
(init_buffer_once): Set cursor_in_non_selected_windows default value.
Kim F. Storm <storm@cua.dk>
parents:
62030
diff
changeset
|
5515 &buffer_defaults.cursor_in_non_selected_windows, |
a0a348c8b14b
(init_buffer_once): Set cursor_in_non_selected_windows default value.
Kim F. Storm <storm@cua.dk>
parents:
62030
diff
changeset
|
5516 doc: /* Default value of `cursor-in-non-selected-windows'. |
a0a348c8b14b
(init_buffer_once): Set cursor_in_non_selected_windows default value.
Kim F. Storm <storm@cua.dk>
parents:
62030
diff
changeset
|
5517 This is the same as (default-value 'cursor-in-non-selected-windows). */); |
a0a348c8b14b
(init_buffer_once): Set cursor_in_non_selected_windows default value.
Kim F. Storm <storm@cua.dk>
parents:
62030
diff
changeset
|
5518 |
333 | 5519 DEFVAR_LISP_NOPRO ("default-abbrev-mode", |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5520 &buffer_defaults.abbrev_mode, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5521 doc: /* Default value of `abbrev-mode' for buffers that do not override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5522 This is the same as (default-value 'abbrev-mode). */); |
333 | 5523 |
5524 DEFVAR_LISP_NOPRO ("default-ctl-arrow", | |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5525 &buffer_defaults.ctl_arrow, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5526 doc: /* Default value of `ctl-arrow' for buffers that do not override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5527 This is the same as (default-value 'ctl-arrow). */); |
333 | 5528 |
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
5529 DEFVAR_LISP_NOPRO ("default-direction-reversed", |
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
5530 &buffer_defaults.direction_reversed, |
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
5531 doc: /* Default value of `direction-reversed' for buffers that do not override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5532 This is the same as (default-value 'direction-reversed). */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5533 |
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
5534 DEFVAR_LISP_NOPRO ("default-enable-multibyte-characters", |
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
5535 &buffer_defaults.enable_multibyte_characters, |
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
5536 doc: /* *Default value of `enable-multibyte-characters' for buffers not overriding it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5537 This is the same as (default-value 'enable-multibyte-characters). */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5538 |
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
5539 DEFVAR_LISP_NOPRO ("default-buffer-file-coding-system", |
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
5540 &buffer_defaults.buffer_file_coding_system, |
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
5541 doc: /* Default value of `buffer-file-coding-system' for buffers not overriding it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5542 This is the same as (default-value 'buffer-file-coding-system). */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5543 |
333 | 5544 DEFVAR_LISP_NOPRO ("default-truncate-lines", |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5545 &buffer_defaults.truncate_lines, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5546 doc: /* Default value of `truncate-lines' for buffers that do not override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5547 This is the same as (default-value 'truncate-lines). */); |
333 | 5548 |
5549 DEFVAR_LISP_NOPRO ("default-fill-column", | |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5550 &buffer_defaults.fill_column, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5551 doc: /* Default value of `fill-column' for buffers that do not override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5552 This is the same as (default-value 'fill-column). */); |
333 | 5553 |
5554 DEFVAR_LISP_NOPRO ("default-left-margin", | |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5555 &buffer_defaults.left_margin, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5556 doc: /* Default value of `left-margin' for buffers that do not override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5557 This is the same as (default-value 'left-margin). */); |
333 | 5558 |
5559 DEFVAR_LISP_NOPRO ("default-tab-width", | |
74720 | 5560 &buffer_defaults.tab_width, |
74721
24338a0d4577
Whitespace change (again).
Juanma Barranquero <lekktu@gmail.com>
parents:
74720
diff
changeset
|
5561 doc: /* Default value of `tab-width' for buffers that do not override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5562 This is the same as (default-value 'tab-width). */); |
333 | 5563 |
5564 DEFVAR_LISP_NOPRO ("default-case-fold-search", | |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5565 &buffer_defaults.case_fold_search, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5566 doc: /* Default value of `case-fold-search' for buffers that don't override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5567 This is the same as (default-value 'case-fold-search). */); |
333 | 5568 |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
5569 #ifdef DOS_NT |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5570 DEFVAR_LISP_NOPRO ("default-buffer-file-type", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5571 &buffer_defaults.buffer_file_type, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5572 doc: /* Default file type for buffers that do not override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5573 This is the same as (default-value 'buffer-file-type). |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5574 The file type is nil for text, t for binary. */); |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5575 #endif |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5576 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5577 DEFVAR_LISP_NOPRO ("default-left-margin-width", |
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5578 &buffer_defaults.left_margin_cols, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5579 doc: /* Default value of `left-margin-width' for buffers that don't override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5580 This is the same as (default-value 'left-margin-width). */); |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5581 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5582 DEFVAR_LISP_NOPRO ("default-right-margin-width", |
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5583 &buffer_defaults.right_margin_cols, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5584 doc: /* Default value of `right-margin-width' for buffers that don't override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5585 This is the same as (default-value 'right-margin-width). */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5586 |
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5587 DEFVAR_LISP_NOPRO ("default-left-fringe-width", |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5588 &buffer_defaults.left_fringe_width, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5589 doc: /* Default value of `left-fringe-width' for buffers that don't override it. |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5590 This is the same as (default-value 'left-fringe-width). */); |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5591 |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5592 DEFVAR_LISP_NOPRO ("default-right-fringe-width", |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5593 &buffer_defaults.right_fringe_width, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5594 doc: /* Default value of `right-fringe-width' for buffers that don't override it. |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5595 This is the same as (default-value 'right-fringe-width). */); |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5596 |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5597 DEFVAR_LISP_NOPRO ("default-fringes-outside-margins", |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5598 &buffer_defaults.fringes_outside_margins, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5599 doc: /* Default value of `fringes-outside-margins' for buffers that don't override it. |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5600 This is the same as (default-value 'fringes-outside-margins). */); |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5601 |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5602 DEFVAR_LISP_NOPRO ("default-scroll-bar-width", |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5603 &buffer_defaults.scroll_bar_width, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5604 doc: /* Default value of `scroll-bar-width' for buffers that don't override it. |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5605 This is the same as (default-value 'scroll-bar-width). */); |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5606 |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5607 DEFVAR_LISP_NOPRO ("default-vertical-scroll-bar", |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5608 &buffer_defaults.vertical_scroll_bar_type, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5609 doc: /* Default value of `vertical-scroll-bar' for buffers that don't override it. |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5610 This is the same as (default-value 'vertical-scroll-bar). */); |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5611 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5612 DEFVAR_LISP_NOPRO ("default-indicate-empty-lines", |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5613 &buffer_defaults.indicate_empty_lines, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5614 doc: /* Default value of `indicate-empty-lines' for buffers that don't override it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5615 This is the same as (default-value 'indicate-empty-lines). */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5616 |
53602
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5617 DEFVAR_LISP_NOPRO ("default-indicate-buffer-boundaries", |
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5618 &buffer_defaults.indicate_buffer_boundaries, |
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5619 doc: /* Default value of `indicate-buffer-boundaries' for buffers that don't override it. |
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5620 This is the same as (default-value 'indicate-buffer-boundaries). */); |
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5621 |
69047
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5622 DEFVAR_LISP_NOPRO ("default-fringe-indicator-alist", |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5623 &buffer_defaults.fringe_indicator_alist, |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5624 doc: /* Default value of `fringe-indicator-alist' for buffers that don't override it. |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5625 This is the same as (default-value 'fringe-indicator-alist'). */); |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5626 |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5627 DEFVAR_LISP_NOPRO ("default-fringe-cursor-alist", |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5628 &buffer_defaults.fringe_cursor_alist, |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5629 doc: /* Default value of `fringe-cursor-alist' for buffers that don't override it. |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5630 This is the same as (default-value 'fringe-cursor-alist'). */); |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5631 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5632 DEFVAR_LISP_NOPRO ("default-scroll-up-aggressively", |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5633 &buffer_defaults.scroll_up_aggressively, |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5634 doc: /* Default value of `scroll-up-aggressively'. |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5635 This value applies in buffers that don't have their own local values. |
74595
42f97e1a6081
(syms_of_buffer) <cursor-in-non-selected-windows, line-spacing, left-margin,
Juanma Barranquero <lekktu@gmail.com>
parents:
74565
diff
changeset
|
5636 This is the same as (default-value 'scroll-up-aggressively). */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5637 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5638 DEFVAR_LISP_NOPRO ("default-scroll-down-aggressively", |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5639 &buffer_defaults.scroll_down_aggressively, |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5640 doc: /* Default value of `scroll-down-aggressively'. |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5641 This value applies in buffers that don't have their own local values. |
74595
42f97e1a6081
(syms_of_buffer) <cursor-in-non-selected-windows, line-spacing, left-margin,
Juanma Barranquero <lekktu@gmail.com>
parents:
74565
diff
changeset
|
5642 This is the same as (default-value 'scroll-down-aggressively). */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5643 |
25546 | 5644 DEFVAR_PER_BUFFER ("header-line-format", |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5645 ¤t_buffer->header_line_format, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5646 Qnil, |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5647 doc: /* Analogous to `mode-line-format', but controls the header line. |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5648 The header line appears, optionally, at the top of a window; |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5649 the mode line appears at the bottom. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5650 |
333 | 5651 DEFVAR_PER_BUFFER ("mode-line-format", ¤t_buffer->mode_line_format, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5652 Qnil, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5653 doc: /* Template for displaying mode line for current buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5654 Each buffer has its own value of this variable. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5655 Value may be nil, a string, a symbol or a list or cons cell. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5656 A value of nil means don't display a mode line. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5657 For a symbol, its value is used (but it is ignored if t or nil). |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5658 A string appearing directly as the value of a symbol is processed verbatim |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5659 in that the %-constructs below are not recognized. |
48305
55b6e3969474
(syms_of_buffer) <mode-line-format>: Document symbol
Kim F. Storm <storm@cua.dk>
parents:
48227
diff
changeset
|
5660 Note that unless the symbol is marked as a `risky-local-variable', all |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5661 properties in any strings, as well as all :eval and :propertize forms |
48305
55b6e3969474
(syms_of_buffer) <mode-line-format>: Document symbol
Kim F. Storm <storm@cua.dk>
parents:
48227
diff
changeset
|
5662 in the value of that symbol will be ignored. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5663 For a list of the form `(:eval FORM)', FORM is evaluated and the result |
48355
77552fd065a0
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
48305
diff
changeset
|
5664 is used as a mode line element. Be careful--FORM should not load any files, |
77552fd065a0
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
48305
diff
changeset
|
5665 because that can cause an infinite recursion. |
48305
55b6e3969474
(syms_of_buffer) <mode-line-format>: Document symbol
Kim F. Storm <storm@cua.dk>
parents:
48227
diff
changeset
|
5666 For a list of the form `(:propertize ELT PROPS...)', ELT is displayed |
55b6e3969474
(syms_of_buffer) <mode-line-format>: Document symbol
Kim F. Storm <storm@cua.dk>
parents:
48227
diff
changeset
|
5667 with the specified properties PROPS applied. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5668 For a list whose car is a symbol, the symbol's value is taken, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5669 and if that is non-nil, the cadr of the list is processed recursively. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5670 Otherwise, the caddr of the list (if there is one) is processed. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5671 For a list whose car is a string or list, each element is processed |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5672 recursively and the results are effectively concatenated. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5673 For a list whose car is an integer, the cdr of the list is processed |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5674 and padded (if the number is positive) or truncated (if negative) |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5675 to the width specified by that number. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5676 A string is printed verbatim in the mode line except for %-constructs: |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5677 (%-constructs are allowed when the string is the entire mode-line-format |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5678 or when it is found in a cons-cell or a list) |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5679 %b -- print buffer name. %f -- print visited file name. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5680 %F -- print frame name. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5681 %* -- print %, * or hyphen. %+ -- print *, % or hyphen. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5682 %& is like %*, but ignore read-only-ness. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5683 % means buffer is read-only and * means it is modified. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5684 For a modified read-only buffer, %* gives % and %+ gives *. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5685 %s -- print process status. %l -- print the current line number. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5686 %c -- print the current column number (this makes editing slower). |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5687 To make the column number update correctly in all cases, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5688 `column-number-mode' must be non-nil. |
52459
efa9d19d170e
(syms_of_buffer): Document `%i' and `%I' constructs for
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
5689 %i -- print the size of the buffer. |
efa9d19d170e
(syms_of_buffer): Document `%i' and `%I' constructs for
Lute Kamstra <lute@gnu.org>
parents:
52401
diff
changeset
|
5690 %I -- like %i, but use k, M, G, etc., to abbreviate. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5691 %p -- print percent of buffer above top of window, or Top, Bot or All. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5692 %P -- print percent of buffer above bottom of window, perhaps plus Top, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5693 or print Bottom or All. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5694 %n -- print Narrow if appropriate. |
70931
83b791ca7b11
(mode-line-format): Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
70816
diff
changeset
|
5695 %t -- visited file is text or binary (if OS supports this distinction). |
73173
b6668e8a8f5f
(syms_of_buffer): Reorder coding systems in the
Juri Linkov <juri@jurta.org>
parents:
72596
diff
changeset
|
5696 %z -- print mnemonics of keyboard, terminal, and buffer coding systems. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5697 %Z -- like %z, but including the end-of-line format. |
70931
83b791ca7b11
(mode-line-format): Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
70816
diff
changeset
|
5698 %e -- print error message about full memory. |
82179
70709e17ebee
* xdisp.c (decode_mode_spec): Use '@' instead of 'R' to test for
Nick Roberts <nickrob@snap.net.nz>
parents:
82140
diff
changeset
|
5699 %@ -- print @ or hyphen. @ means that default-directory is on a |
70709e17ebee
* xdisp.c (decode_mode_spec): Use '@' instead of 'R' to test for
Nick Roberts <nickrob@snap.net.nz>
parents:
82140
diff
changeset
|
5700 remote machine. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5701 %[ -- print one [ for each recursive editing level. %] similar. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5702 %% -- print %. %- -- print infinitely many dashes. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5703 Decimal digits after the % specify field width to which to pad. */); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5704 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5705 DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5706 doc: /* *Major mode for new buffers. Defaults to `fundamental-mode'. |
74565
60f389aaa76a
(syms_of_buffer) <default-major-mode>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74160
diff
changeset
|
5707 A value of nil means use current buffer's major mode, |
60f389aaa76a
(syms_of_buffer) <default-major-mode>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74160
diff
changeset
|
5708 provided it is not marked as "special". |
57138
5358b2582e78
(syms_of_buffer) <default-major-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56976
diff
changeset
|
5709 |
5358b2582e78
(syms_of_buffer) <default-major-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56976
diff
changeset
|
5710 When a mode is used by default, `find-file' switches to it |
5358b2582e78
(syms_of_buffer) <default-major-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56976
diff
changeset
|
5711 before it reads the contents into the buffer and before |
5358b2582e78
(syms_of_buffer) <default-major-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56976
diff
changeset
|
5712 it finishes setting up the buffer. Thus, the mode and |
5358b2582e78
(syms_of_buffer) <default-major-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56976
diff
changeset
|
5713 its hooks should not expect certain variables such as |
5358b2582e78
(syms_of_buffer) <default-major-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56976
diff
changeset
|
5714 `buffer-read-only' and `buffer-file-coding-system' to be set up. */); |
333 | 5715 |
5716 DEFVAR_PER_BUFFER ("major-mode", ¤t_buffer->major_mode, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5717 make_number (Lisp_Symbol), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5718 doc: /* Symbol for current buffer's major mode. */); |
333 | 5719 |
5720 DEFVAR_PER_BUFFER ("mode-name", ¤t_buffer->mode_name, | |
43712
223f1f5d160d
(syms_of_buffer): Allow non-string `mode-name'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43630
diff
changeset
|
5721 Qnil, |
87843
e1d6c4e34d2c
(syms_of_buffer) <mode-name>: Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
5722 doc: /* Pretty name of current buffer's major mode. |
98732 | 5723 Usually a string, but can use any of the constructs for `mode-line-format', |
5724 which see. | |
5725 Format with `format-mode-line' to produce a string value. */); | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5726 |
85011
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5727 DEFVAR_PER_BUFFER ("local-abbrev-table", ¤t_buffer->abbrev_table, Qnil, |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5728 doc: /* Local (mode-specific) abbrev table of current buffer. */); |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5729 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5730 DEFVAR_PER_BUFFER ("abbrev-mode", ¤t_buffer->abbrev_mode, Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5731 doc: /* Non-nil turns on automatic expansion of abbrevs as they are inserted. */); |
333 | 5732 |
5733 DEFVAR_PER_BUFFER ("case-fold-search", ¤t_buffer->case_fold_search, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5734 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5735 doc: /* *Non-nil if searches and matches should ignore case. */); |
333 | 5736 |
5737 DEFVAR_PER_BUFFER ("fill-column", ¤t_buffer->fill_column, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5738 make_number (Lisp_Int), |
46864
df9f70dd69a4
(syms_of_buffer) <fill-column>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
46599
diff
changeset
|
5739 doc: /* *Column beyond which automatic line-wrapping should happen. |
56138
5dde0034a30e
(syms_of_buffer): Clarify `fill-column' docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55744
diff
changeset
|
5740 Interactively, you can set the buffer local value using \\[set-fill-column]. */); |
333 | 5741 |
5742 DEFVAR_PER_BUFFER ("left-margin", ¤t_buffer->left_margin, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5743 make_number (Lisp_Int), |
74595
42f97e1a6081
(syms_of_buffer) <cursor-in-non-selected-windows, line-spacing, left-margin,
Juanma Barranquero <lekktu@gmail.com>
parents:
74565
diff
changeset
|
5744 doc: /* *Column for the default `indent-line-function' to indent to. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5745 Linefeed indents to this column in Fundamental mode. */); |
333 | 5746 |
5747 DEFVAR_PER_BUFFER ("tab-width", ¤t_buffer->tab_width, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5748 make_number (Lisp_Int), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5749 doc: /* *Distance between tab stops (for display of tab characters), in columns. */); |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5750 |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5751 DEFVAR_PER_BUFFER ("ctl-arrow", ¤t_buffer->ctl_arrow, Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5752 doc: /* *Non-nil means display control chars with uparrow. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5753 A value of nil means use backslash and octal digits. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5754 This variable does not apply to characters whose display is specified |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5755 in the current display table (if there is one). */); |
333 | 5756 |
17022 | 5757 DEFVAR_PER_BUFFER ("enable-multibyte-characters", |
20995
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
5758 ¤t_buffer->enable_multibyte_characters, |
50304
d9d826db650f
(overlays_in): Declare static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50014
diff
changeset
|
5759 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5760 doc: /* Non-nil means the buffer contents are regarded as multi-byte characters. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5761 Otherwise they are regarded as unibyte. This affects the display, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5762 file I/O and the behavior of various editing commands. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5763 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5764 This variable is buffer-local but you cannot set it directly; |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5765 use the function `set-buffer-multibyte' to change a buffer's representation. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5766 Changing its default value with `setq-default' is supported. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5767 See also variable `default-enable-multibyte-characters' and Info node |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5768 `(elisp)Text Representations'. */); |
50304
d9d826db650f
(overlays_in): Declare static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50014
diff
changeset
|
5769 XSYMBOL (intern ("enable-multibyte-characters"))->constant = 1; |
17022 | 5770 |
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5771 DEFVAR_PER_BUFFER ("buffer-file-coding-system", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5772 ¤t_buffer->buffer_file_coding_system, Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5773 doc: /* Coding system to be used for encoding the buffer contents on saving. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5774 This variable applies to saving the buffer, and also to `write-region' |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5775 and other functions that use `write-region'. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5776 It does not apply to sending output to subprocesses, however. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5777 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5778 If this is nil, the buffer is saved without any code conversion |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5779 unless some coding system is specified in `file-coding-system-alist' |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5780 for the buffer file. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5781 |
43630
a4789f07d85d
(syms_of_buffer) <buffer-file-coding-system>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
42982
diff
changeset
|
5782 If the text to be saved cannot be encoded as specified by this variable, |
a4789f07d85d
(syms_of_buffer) <buffer-file-coding-system>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
42982
diff
changeset
|
5783 an alternative encoding is selected by `select-safe-coding-system', which see. |
a4789f07d85d
(syms_of_buffer) <buffer-file-coding-system>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
42982
diff
changeset
|
5784 |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5785 The variable `coding-system-for-write', if non-nil, overrides this variable. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5786 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5787 This variable is never applied to a way of decoding a file while reading it. */); |
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5788 |
17022 | 5789 DEFVAR_PER_BUFFER ("direction-reversed", ¤t_buffer->direction_reversed, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5790 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5791 doc: /* *Non-nil means lines in the buffer are displayed right to left. */); |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5792 |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5793 DEFVAR_PER_BUFFER ("truncate-lines", ¤t_buffer->truncate_lines, Qnil, |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5794 doc: /* *Non-nil means do not display continuation lines. |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5795 Instead, give each line of text just one screen line. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5796 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5797 Note that this is overridden by the variable |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5798 `truncate-partial-width-windows' if that variable is non-nil |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5799 and this buffer is not full-frame width. */); |
333 | 5800 |
96233
514e5b8b3fbf
(syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents:
95826
diff
changeset
|
5801 DEFVAR_PER_BUFFER ("word-wrap", ¤t_buffer->word_wrap, Qnil, |
514e5b8b3fbf
(syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents:
95826
diff
changeset
|
5802 doc: /* *Non-nil means to use word-wrapping for continuation lines. |
514e5b8b3fbf
(syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents:
95826
diff
changeset
|
5803 When word-wrapping is on, continuation lines are wrapped at the space |
514e5b8b3fbf
(syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents:
95826
diff
changeset
|
5804 or tab character nearest to the right window edge. |
514e5b8b3fbf
(syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents:
95826
diff
changeset
|
5805 If nil, continuation lines are wrapped at the right screen edge. |
514e5b8b3fbf
(syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents:
95826
diff
changeset
|
5806 |
514e5b8b3fbf
(syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents:
95826
diff
changeset
|
5807 This variable has no effect if long lines are truncated (see |
97810 | 5808 `truncate-lines' and `truncate-partial-width-windows'). If you use |
5809 word-wrapping, you might want to reduce the value of | |
5810 `truncate-partial-width-windows', since wrapping can make text readable | |
5811 in narrower windows. */); | |
96233
514e5b8b3fbf
(syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents:
95826
diff
changeset
|
5812 |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
5813 #ifdef DOS_NT |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5814 DEFVAR_PER_BUFFER ("buffer-file-type", ¤t_buffer->buffer_file_type, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5815 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5816 doc: /* Non-nil if the visited file is a binary file. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5817 This variable is meaningful on MS-DOG and Windows NT. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5818 On those systems, it is automatically local in every buffer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5819 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
|
5820 #endif |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5821 |
333 | 5822 DEFVAR_PER_BUFFER ("default-directory", ¤t_buffer->directory, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5823 make_number (Lisp_String), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5824 doc: /* Name of default directory of current buffer. Should end with slash. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5825 To interactively change the default directory, use command `cd'. */); |
333 | 5826 |
5827 DEFVAR_PER_BUFFER ("auto-fill-function", ¤t_buffer->auto_fill_function, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5828 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5829 doc: /* Function called (if non-nil) to perform auto-fill. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5830 It is called after self-inserting any character specified in |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5831 the `auto-fill-chars' table. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5832 NOTE: This variable is not a hook; |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5833 its value may not be a list of functions. */); |
333 | 5834 |
5835 DEFVAR_PER_BUFFER ("buffer-file-name", ¤t_buffer->filename, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5836 make_number (Lisp_String), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5837 doc: /* Name of file visited in current buffer, or nil if not visiting a file. */); |
333 | 5838 |
10751
dea8f022819d
(syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents:
10668
diff
changeset
|
5839 DEFVAR_PER_BUFFER ("buffer-file-truename", ¤t_buffer->file_truename, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5840 make_number (Lisp_String), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5841 doc: /* Abbreviated truename of file visited in current buffer, or nil if none. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5842 The truename of a file is calculated by `file-truename' |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5843 and then abbreviated with `abbreviate-file-name'. */); |
10751
dea8f022819d
(syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents:
10668
diff
changeset
|
5844 |
333 | 5845 DEFVAR_PER_BUFFER ("buffer-auto-save-file-name", |
1041 | 5846 ¤t_buffer->auto_save_file_name, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5847 make_number (Lisp_String), |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5848 doc: /* Name of file for auto-saving current buffer. |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5849 If it is nil, that means don't auto-save this buffer. */); |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5850 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5851 DEFVAR_PER_BUFFER ("buffer-read-only", ¤t_buffer->read_only, Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5852 doc: /* Non-nil if this buffer is read-only. */); |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5853 |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5854 DEFVAR_PER_BUFFER ("buffer-backed-up", ¤t_buffer->backed_up, Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5855 doc: /* Non-nil if this buffer's file has been backed up. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5856 Backing up is done before the first time the file is saved. */); |
333 | 5857 |
5858 DEFVAR_PER_BUFFER ("buffer-saved-size", ¤t_buffer->save_length, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5859 make_number (Lisp_Int), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5860 doc: /* Length of current buffer when last read in, saved or auto-saved. |
103917
aa5e8ff5a9c4
* fileio.c (Fwrite_region, Fdo_auto_save): Handle save_length = -2.
Richard M. Stallman <rms@gnu.org>
parents:
102966
diff
changeset
|
5861 0 initially. |
aa5e8ff5a9c4
* fileio.c (Fwrite_region, Fdo_auto_save): Handle save_length = -2.
Richard M. Stallman <rms@gnu.org>
parents:
102966
diff
changeset
|
5862 -1 means auto-saving turned off until next real save. |
aa5e8ff5a9c4
* fileio.c (Fwrite_region, Fdo_auto_save): Handle save_length = -2.
Richard M. Stallman <rms@gnu.org>
parents:
102966
diff
changeset
|
5863 |
aa5e8ff5a9c4
* fileio.c (Fwrite_region, Fdo_auto_save): Handle save_length = -2.
Richard M. Stallman <rms@gnu.org>
parents:
102966
diff
changeset
|
5864 If you set this to -2, that means don't turn off auto-saving in this buffer |
aa5e8ff5a9c4
* fileio.c (Fwrite_region, Fdo_auto_save): Handle save_length = -2.
Richard M. Stallman <rms@gnu.org>
parents:
102966
diff
changeset
|
5865 if its text size shrinks. If you use `buffer-swap-text' on a buffer, |
aa5e8ff5a9c4
* fileio.c (Fwrite_region, Fdo_auto_save): Handle save_length = -2.
Richard M. Stallman <rms@gnu.org>
parents:
102966
diff
changeset
|
5866 you probably should set this to -2 in that buffer. */); |
333 | 5867 |
5868 DEFVAR_PER_BUFFER ("selective-display", ¤t_buffer->selective_display, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5869 Qnil, |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5870 doc: /* Non-nil enables selective display. |
78053
69559cc5606f
(syms_of_buffer) <selective-display>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
77843
diff
changeset
|
5871 An integer N as value means display only lines |
69559cc5606f
(syms_of_buffer) <selective-display>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
77843
diff
changeset
|
5872 that start with less than N columns of space. |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5873 A value of t means that the character ^M makes itself and |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5874 all the rest of the line invisible; also, when saving the buffer |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5875 in a file, save the ^M as a newline. */); |
333 | 5876 |
5877 #ifndef old | |
5878 DEFVAR_PER_BUFFER ("selective-display-ellipses", | |
97285
6c695773401d
* buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents:
97142
diff
changeset
|
5879 ¤t_buffer->selective_display_ellipses, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5880 Qnil, |
40567
7c28809db274
(selective-display-ellipses): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents:
40108
diff
changeset
|
5881 doc: /* Non-nil means display ... on previous line when a line is invisible. */); |
333 | 5882 #endif |
5883 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5884 DEFVAR_PER_BUFFER ("overwrite-mode", ¤t_buffer->overwrite_mode, Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5885 doc: /* Non-nil if self-insertion should replace existing text. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5886 The value should be one of `overwrite-mode-textual', |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5887 `overwrite-mode-binary', or nil. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5888 If it is `overwrite-mode-textual', self-insertion still |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5889 inserts at the end of a line, and inserts when point is before a tab, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5890 until the tab is filled in. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5891 If `overwrite-mode-binary', self-insertion replaces newlines and tabs too. */); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5892 |
333 | 5893 DEFVAR_PER_BUFFER ("buffer-display-table", ¤t_buffer->display_table, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5894 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5895 doc: /* Display table that controls display of the contents of current buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5896 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5897 If this variable is nil, the value of `standard-display-table' is used. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5898 Each window can have its own, overriding display table, see |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5899 `set-window-display-table' and `window-display-table'. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5900 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5901 The display table is a char-table created with `make-display-table'. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5902 A char-table is an array indexed by character codes. Normal array |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5903 primitives `aref' and `aset' can be used to access elements of a char-table. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5904 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5905 Each of the char-table elements control how to display the corresponding |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5906 text character: the element at index C in the table says how to display |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5907 the character whose code is C. Each element should be a vector of |
74745
af518323048e
(syms_of_buffer) <buffer-display-table>, scroll-up-aggressively,
Juanma Barranquero <lekktu@gmail.com>
parents:
74721
diff
changeset
|
5908 characters or nil. The value nil means display the character in the |
af518323048e
(syms_of_buffer) <buffer-display-table>, scroll-up-aggressively,
Juanma Barranquero <lekktu@gmail.com>
parents:
74721
diff
changeset
|
5909 default fashion; otherwise, the characters from the vector are delivered |
af518323048e
(syms_of_buffer) <buffer-display-table>, scroll-up-aggressively,
Juanma Barranquero <lekktu@gmail.com>
parents:
74721
diff
changeset
|
5910 to the screen instead of the original character. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5911 |
76557
b99f6ff8775b
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
76526
diff
changeset
|
5912 For example, (aset buffer-display-table ?X [?Y]) tells Emacs |
76526
89c077825908
(syms_of_buffer) <buffer-display-table>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
75784
diff
changeset
|
5913 to display a capital Y instead of each X character. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5914 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5915 In addition, a char-table has six extra slots to control the display of: |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5916 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5917 the end of a truncated screen line (extra-slot 0, a single character); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5918 the end of a continued line (extra-slot 1, a single character); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5919 the escape character used to display character codes in octal |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5920 (extra-slot 2, a single character); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5921 the character used as an arrow for control characters (extra-slot 3, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5922 a single character); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5923 the decoration indicating the presence of invisible lines (extra-slot 4, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5924 a vector of characters); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5925 the character used to draw the border between side-by-side windows |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5926 (extra-slot 5, a single character). |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5927 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5928 See also the functions `display-table-slot' and `set-display-table-slot'. */); |
333 | 5929 |
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5930 DEFVAR_PER_BUFFER ("left-margin-width", ¤t_buffer->left_margin_cols, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5931 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5932 doc: /* *Width of left marginal area for display of a buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5933 A value of nil means no marginal area. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5934 |
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5935 DEFVAR_PER_BUFFER ("right-margin-width", ¤t_buffer->right_margin_cols, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5936 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5937 doc: /* *Width of right marginal area for display of a buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5938 A value of nil means no marginal area. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5939 |
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5940 DEFVAR_PER_BUFFER ("left-fringe-width", ¤t_buffer->left_fringe_width, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5941 Qnil, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5942 doc: /* *Width of this buffer's left fringe (in pixels). |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5943 A value of 0 means no left fringe is shown in this buffer's window. |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5944 A value of nil means to use the left fringe width from the window's frame. */); |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5945 |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5946 DEFVAR_PER_BUFFER ("right-fringe-width", ¤t_buffer->right_fringe_width, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5947 Qnil, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5948 doc: /* *Width of this buffer's right fringe (in pixels). |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5949 A value of 0 means no right fringe is shown in this buffer's window. |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5950 A value of nil means to use the right fringe width from the window's frame. */); |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5951 |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5952 DEFVAR_PER_BUFFER ("fringes-outside-margins", ¤t_buffer->fringes_outside_margins, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5953 Qnil, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5954 doc: /* *Non-nil means to display fringes outside display margins. |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5955 A value of nil means to display fringes between margins and buffer text. */); |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5956 |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5957 DEFVAR_PER_BUFFER ("scroll-bar-width", ¤t_buffer->scroll_bar_width, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5958 Qnil, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5959 doc: /* *Width of this buffer's scroll bars in pixels. |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5960 A value of nil means to use the scroll bar width from the window's frame. */); |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5961 |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5962 DEFVAR_PER_BUFFER ("vertical-scroll-bar", ¤t_buffer->vertical_scroll_bar_type, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5963 Qnil, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5964 doc: /* *Position of this buffer's vertical scroll bar. |
59191
f6d6e52c03a4
(syms_of_buffer) <vertical-scroll-bar>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
59114
diff
changeset
|
5965 The value takes effect whenever you tell a window to display this buffer; |
59194
e81022709627
(syms_of_buffer) <vertical-scroll-bar>: Correct typo.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59191
diff
changeset
|
5966 for instance, with `set-window-buffer' or when `display-buffer' displays it. |
59191
f6d6e52c03a4
(syms_of_buffer) <vertical-scroll-bar>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
59114
diff
changeset
|
5967 |
59114
3f2406abbe2a
(Fbuffer_disable_undo): Deleted (moved to simple.el).
Richard M. Stallman <rms@gnu.org>
parents:
58618
diff
changeset
|
5968 A value of `left' or `right' means put the vertical scroll bar at that side |
3f2406abbe2a
(Fbuffer_disable_undo): Deleted (moved to simple.el).
Richard M. Stallman <rms@gnu.org>
parents:
58618
diff
changeset
|
5969 of the window; a value of nil means don't show any vertical scroll bars. |
3f2406abbe2a
(Fbuffer_disable_undo): Deleted (moved to simple.el).
Richard M. Stallman <rms@gnu.org>
parents:
58618
diff
changeset
|
5970 A value of t (the default) means do whatever the window's frame specifies. */); |
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5971 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5972 DEFVAR_PER_BUFFER ("indicate-empty-lines", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5973 ¤t_buffer->indicate_empty_lines, Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5974 doc: /* *Visually indicate empty lines after the buffer end. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5975 If non-nil, a bitmap is displayed in the left fringe of a window on |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5976 window-systems. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5977 |
53602
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5978 DEFVAR_PER_BUFFER ("indicate-buffer-boundaries", |
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5979 ¤t_buffer->indicate_buffer_boundaries, Qnil, |
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5980 doc: /* *Visually indicate buffer boundaries and scrolling. |
53958
1aa8132576ec
(syms_of_buffer): Doc fix for indicate-buffer-boundaries.
Kim F. Storm <storm@cua.dk>
parents:
53816
diff
changeset
|
5981 If non-nil, the first and last line of the buffer are marked in the fringe |
1aa8132576ec
(syms_of_buffer): Doc fix for indicate-buffer-boundaries.
Kim F. Storm <storm@cua.dk>
parents:
53816
diff
changeset
|
5982 of a window on window-systems with angle bitmaps, or if the window can be |
1aa8132576ec
(syms_of_buffer): Doc fix for indicate-buffer-boundaries.
Kim F. Storm <storm@cua.dk>
parents:
53816
diff
changeset
|
5983 scrolled, the top and bottom line of the window are marked with up and down |
1aa8132576ec
(syms_of_buffer): Doc fix for indicate-buffer-boundaries.
Kim F. Storm <storm@cua.dk>
parents:
53816
diff
changeset
|
5984 arrow bitmaps. |
57245
8c66fdb3c3ba
(syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents:
57138
diff
changeset
|
5985 |
8c66fdb3c3ba
(syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents:
57138
diff
changeset
|
5986 If value is a symbol `left' or `right', both angle and arrow bitmaps |
58501
8f225aca7c72
(syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57705
diff
changeset
|
5987 are displayed in the left or right fringe, resp. Any other value |
60248 | 5988 that doesn't look like an alist means display the angle bitmaps in |
58501
8f225aca7c72
(syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57705
diff
changeset
|
5989 the left fringe but no arrows. |
8f225aca7c72
(syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57705
diff
changeset
|
5990 |
8f225aca7c72
(syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57705
diff
changeset
|
5991 You can exercise more precise control by using an alist as the |
8f225aca7c72
(syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57705
diff
changeset
|
5992 value. Each alist element (INDICATOR . POSITION) specifies |
8f225aca7c72
(syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57705
diff
changeset
|
5993 where to show one of the indicators. INDICATOR is one of `top', |
57245
8c66fdb3c3ba
(syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents:
57138
diff
changeset
|
5994 `bottom', `up', `down', or t, which specifies the default position, |
8c66fdb3c3ba
(syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents:
57138
diff
changeset
|
5995 and POSITION is one of `left', `right', or nil, meaning do not show |
8c66fdb3c3ba
(syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents:
57138
diff
changeset
|
5996 this indicator. |
8c66fdb3c3ba
(syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents:
57138
diff
changeset
|
5997 |
8c66fdb3c3ba
(syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents:
57138
diff
changeset
|
5998 For example, ((top . left) (t . right)) places the top angle bitmap in |
8c66fdb3c3ba
(syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents:
57138
diff
changeset
|
5999 left fringe, the bottom angle bitmap in right fringe, and both arrow |
53958
1aa8132576ec
(syms_of_buffer): Doc fix for indicate-buffer-boundaries.
Kim F. Storm <storm@cua.dk>
parents:
53816
diff
changeset
|
6000 bitmaps in right fringe. To show just the angle bitmaps in the left |
57245
8c66fdb3c3ba
(syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents:
57138
diff
changeset
|
6001 fringe, but no arrow bitmaps, use ((top . left) (bottom . left)). */); |
53602
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
6002 |
69047
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6003 DEFVAR_PER_BUFFER ("fringe-indicator-alist", |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6004 ¤t_buffer->fringe_indicator_alist, Qnil, |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6005 doc: /* *Mapping from logical to physical fringe indicator bitmaps. |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6006 The value is an alist where each element (INDICATOR . BITMAPS) |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6007 specifies the fringe bitmaps used to display a specific logical |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6008 fringe indicator. |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6009 |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6010 INDICATOR specifies the logical indicator type which is one of the |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6011 following symbols: `truncation' , `continuation', `overlay-arrow', |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6012 `top', `bottom', `up', `down', `one-line', `empty-line', or `unknown'. |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6013 |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6014 BITMAPS is list of symbols (LEFT RIGHT [LEFT1 RIGHT1]) which specifies |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6015 the actual bitmap shown in the left or right fringe for the logical |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6016 indicator. LEFT and RIGHT are the bitmaps shown in the left and/or |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6017 right fringe for the specific indicator. The LEFT1 or RIGHT1 bitmaps |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6018 are used only for the `bottom' and `one-line' indicators when the last |
70816
8168db834af2
(syms_of_buffer, Fmake_overlay): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
70697
diff
changeset
|
6019 \(only) line in has no final newline. BITMAPS may also be a single |
69047
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6020 symbol which is used in both left and right fringes. */); |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6021 |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6022 DEFVAR_PER_BUFFER ("fringe-cursor-alist", |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6023 ¤t_buffer->fringe_cursor_alist, Qnil, |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6024 doc: /* *Mapping from logical to physical fringe cursor bitmaps. |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6025 The value is an alist where each element (CURSOR . BITMAP) |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6026 specifies the fringe bitmaps used to display a specific logical |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6027 cursor type in the fringe. |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6028 |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6029 CURSOR specifies the logical cursor type which is one of the following |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6030 symbols: `box' , `hollow', `bar', `hbar', or `hollow-small'. The last |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6031 one is used to show a hollow cursor on narrow lines display lines |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6032 where the normal hollow cursor will not fit. |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6033 |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6034 BITMAP is the corresponding fringe bitmap shown for the logical |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6035 cursor type. */); |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
6036 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
6037 DEFVAR_PER_BUFFER ("scroll-up-aggressively", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6038 ¤t_buffer->scroll_up_aggressively, Qnil, |
49057
8c97b527621e
(syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
48947
diff
changeset
|
6039 doc: /* How far to scroll windows upward. |
8c97b527621e
(syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
48947
diff
changeset
|
6040 If you move point off the bottom, the window scrolls automatically. |
74745
af518323048e
(syms_of_buffer) <buffer-display-table>, scroll-up-aggressively,
Juanma Barranquero <lekktu@gmail.com>
parents:
74721
diff
changeset
|
6041 This variable controls how far it scrolls. The value nil, the default, |
49057
8c97b527621e
(syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
48947
diff
changeset
|
6042 means scroll to center point. A fraction means scroll to put point |
8c97b527621e
(syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
48947
diff
changeset
|
6043 that fraction of the window's height from the bottom of the window. |
97285
6c695773401d
* buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents:
97142
diff
changeset
|
6044 When the value is 0.0, point goes at the bottom line, which in the |
6c695773401d
* buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents:
97142
diff
changeset
|
6045 simple case that you moved off with C-f means scrolling just one line. |
6c695773401d
* buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents:
97142
diff
changeset
|
6046 1.0 means point goes at the top, so that in that simple case, the |
6c695773401d
* buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents:
97142
diff
changeset
|
6047 window scrolls by a full window height. Meaningful values are |
48947
3bdd36228f48
(syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
48776
diff
changeset
|
6048 between 0.0 and 1.0, inclusive. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
6049 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
6050 DEFVAR_PER_BUFFER ("scroll-down-aggressively", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6051 ¤t_buffer->scroll_down_aggressively, Qnil, |
49057
8c97b527621e
(syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
48947
diff
changeset
|
6052 doc: /* How far to scroll windows downward. |
8c97b527621e
(syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
48947
diff
changeset
|
6053 If you move point off the top, the window scrolls automatically. |
74745
af518323048e
(syms_of_buffer) <buffer-display-table>, scroll-up-aggressively,
Juanma Barranquero <lekktu@gmail.com>
parents:
74721
diff
changeset
|
6054 This variable controls how far it scrolls. The value nil, the default, |
49057
8c97b527621e
(syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
48947
diff
changeset
|
6055 means scroll to center point. A fraction means scroll to put point |
8c97b527621e
(syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
48947
diff
changeset
|
6056 that fraction of the window's height from the top of the window. |
97285
6c695773401d
* buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents:
97142
diff
changeset
|
6057 When the value is 0.0, point goes at the top line, which in the |
6c695773401d
* buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents:
97142
diff
changeset
|
6058 simple case that you moved off with C-b means scrolling just one line. |
6c695773401d
* buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents:
97142
diff
changeset
|
6059 1.0 means point goes at the bottom, so that in that simple case, the |
6c695773401d
* buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents:
97142
diff
changeset
|
6060 window scrolls by a full window height. Meaningful values are |
48947
3bdd36228f48
(syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
48776
diff
changeset
|
6061 between 0.0 and 1.0, inclusive. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
6062 |
333 | 6063 /*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol, |
6064 "Don't ask."); | |
6065 */ | |
6066 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6067 DEFVAR_LISP ("before-change-functions", &Vbefore_change_functions, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6068 doc: /* List of functions to call before each text change. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6069 Two arguments are passed to each function: the positions of |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6070 the beginning and end of the range of old text to be changed. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6071 \(For an insertion, the beginning and end are at the same place.) |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6072 No information is given about the length of the text after the change. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6073 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6074 Buffer changes made while executing the `before-change-functions' |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6075 don't call any before-change or after-change functions. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6076 That's because these variables are temporarily set to nil. |
97285
6c695773401d
* buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents:
97142
diff
changeset
|
6077 As a result, a hook function cannot straightforwardly alter the |
6c695773401d
* buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents:
97142
diff
changeset
|
6078 value of these variables. See the Emacs Lisp manual for a way of |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6079 accomplishing an equivalent result by using other variables. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6080 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6081 If an unhandled error happens in running these functions, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6082 the variable's value remains nil. That prevents the error |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6083 from happening repeatedly and making Emacs nonfunctional. */); |
6785
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
6084 Vbefore_change_functions = Qnil; |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
6085 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6086 DEFVAR_LISP ("after-change-functions", &Vafter_change_functions, |
44790
56ce64222cbe
(syms_of_buffer): Doc fix.
Colin Walters <walters@gnu.org>
parents:
44784
diff
changeset
|
6087 doc: /* List of functions to call after each text change. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6088 Three arguments are passed to each function: the positions of |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6089 the beginning and end of the range of changed text, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6090 and the length in bytes of the pre-change text replaced by that range. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6091 \(For an insertion, the pre-change length is zero; |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6092 for a deletion, that length is the number of bytes deleted, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6093 and the post-change beginning and end are at the same place.) |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6094 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6095 Buffer changes made while executing the `after-change-functions' |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6096 don't call any before-change or after-change functions. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6097 That's because these variables are temporarily set to nil. |
97285
6c695773401d
* buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents:
97142
diff
changeset
|
6098 As a result, a hook function cannot straightforwardly alter the |
6c695773401d
* buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents:
97142
diff
changeset
|
6099 value of these variables. See the Emacs Lisp manual for a way of |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6100 accomplishing an equivalent result by using other variables. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6101 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6102 If an unhandled error happens in running these functions, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6103 the variable's value remains nil. That prevents the error |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6104 from happening repeatedly and making Emacs nonfunctional. */); |
6785
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
6105 Vafter_change_functions = Qnil; |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
6106 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6107 DEFVAR_LISP ("first-change-hook", &Vfirst_change_hook, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
6108 doc: /* A list of functions to call before changing a buffer which is unmodified. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6109 The functions are run using the `run-hooks' function. */); |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
6110 Vfirst_change_hook = Qnil; |
333 | 6111 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6112 DEFVAR_PER_BUFFER ("buffer-undo-list", ¤t_buffer->undo_list, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6113 doc: /* List of undo entries in current buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6114 Recent changes come first; older changes follow newer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6115 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6116 An entry (BEG . END) represents an insertion which begins at |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6117 position BEG and ends at position END. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6118 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6119 An entry (TEXT . POSITION) represents the deletion of the string TEXT |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6120 from (abs POSITION). If POSITION is positive, point was at the front |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6121 of the text being deleted; if negative, point was at the end. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6122 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6123 An entry (t HIGH . LOW) indicates that the buffer previously had |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6124 \"unmodified\" status. HIGH and LOW are the high and low 16-bit portions |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6125 of the visited file's modification time, as of that time. If the |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6126 modification time of the most recent save is different, this entry is |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6127 obsolete. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6128 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6129 An entry (nil PROPERTY VALUE BEG . END) indicates that a text property |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6130 was modified between BEG and END. PROPERTY is the property name, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6131 and VALUE is the old value. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6132 |
59833
62b43d677801
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
59780
diff
changeset
|
6133 An entry (apply FUN-NAME . ARGS) means undo the change with |
62b43d677801
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
59780
diff
changeset
|
6134 \(apply FUN-NAME ARGS). |
62b43d677801
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
59780
diff
changeset
|
6135 |
62b43d677801
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
59780
diff
changeset
|
6136 An entry (apply DELTA BEG END FUN-NAME . ARGS) supports selective undo |
62b43d677801
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
59780
diff
changeset
|
6137 in the active region. BEG and END is the range affected by this entry |
62b43d677801
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
59780
diff
changeset
|
6138 and DELTA is the number of bytes added or deleted in that range by |
62b43d677801
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
59780
diff
changeset
|
6139 this change. |
59780
9d293bf75d6c
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
59194
diff
changeset
|
6140 |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6141 An entry (MARKER . DISTANCE) indicates that the marker MARKER |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6142 was adjusted in position by the offset DISTANCE (an integer). |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6143 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6144 An entry of the form POSITION indicates that point was at the buffer |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6145 location given by the integer. Undoing an entry of this form places |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6146 point at POSITION. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6147 |
74160
6e1dfb25e826
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73173
diff
changeset
|
6148 Entries with value `nil' mark undo boundaries. The undo command treats |
6e1dfb25e826
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73173
diff
changeset
|
6149 the changes between two undo boundaries as a single step to be undone. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6150 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6151 If the value of the variable is t, undo information is not recorded. */); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6152 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6153 DEFVAR_PER_BUFFER ("mark-active", ¤t_buffer->mark_active, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6154 doc: /* Non-nil means the mark and region are currently active in this buffer. */); |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6155 |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6156 DEFVAR_PER_BUFFER ("cache-long-line-scans", ¤t_buffer->cache_long_line_scans, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6157 doc: /* Non-nil means that Emacs should use caches to handle long lines more quickly. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6158 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6159 Normally, the line-motion functions work by scanning the buffer for |
57705
804f28bbd89c
(syms_of_buffer): Fix a few typos.
David Kastrup <dak@gnu.org>
parents:
57245
diff
changeset
|
6160 newlines. Columnar operations (like `move-to-column' and |
804f28bbd89c
(syms_of_buffer): Fix a few typos.
David Kastrup <dak@gnu.org>
parents:
57245
diff
changeset
|
6161 `compute-motion') also work by scanning the buffer, summing character |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6162 widths as they go. This works well for ordinary text, but if the |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6163 buffer's lines are very long (say, more than 500 characters), these |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6164 motion functions will take longer to execute. Emacs may also take |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6165 longer to update the display. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6166 |
57705
804f28bbd89c
(syms_of_buffer): Fix a few typos.
David Kastrup <dak@gnu.org>
parents:
57245
diff
changeset
|
6167 If `cache-long-line-scans' is non-nil, these motion functions cache the |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6168 results of their scans, and consult the cache to avoid rescanning |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6169 regions of the buffer until the text is modified. The caches are most |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6170 beneficial when they prevent the most searching---that is, when the |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6171 buffer contains long lines and large regions of characters with the |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6172 same, fixed screen width. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6173 |
57705
804f28bbd89c
(syms_of_buffer): Fix a few typos.
David Kastrup <dak@gnu.org>
parents:
57245
diff
changeset
|
6174 When `cache-long-line-scans' is non-nil, processing short lines will |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6175 become slightly slower (because of the overhead of consulting the |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6176 cache), and the caches will use memory roughly proportional to the |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6177 number of newlines and characters whose screen width varies. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6178 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6179 The caches require no explicit maintenance; their accuracy is |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6180 maintained internally by the Emacs primitives. Enabling or disabling |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6181 the cache should not affect the behavior of any of the motion |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6182 functions; it should only affect their performance. */); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6183 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6184 DEFVAR_PER_BUFFER ("point-before-scroll", ¤t_buffer->point_before_scroll, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6185 doc: /* Value of point before the last series of scroll operations, or nil. */); |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6186 |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6187 DEFVAR_PER_BUFFER ("buffer-file-format", ¤t_buffer->file_format, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6188 doc: /* List of formats to use when saving this buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6189 Formats are defined by `format-alist'. This variable is |
50304
d9d826db650f
(overlays_in): Declare static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50014
diff
changeset
|
6190 set when a file is visited. */); |
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
|
6191 |
56976
b3aa8cb4c381
(reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56669
diff
changeset
|
6192 DEFVAR_PER_BUFFER ("buffer-auto-save-file-format", |
b3aa8cb4c381
(reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56669
diff
changeset
|
6193 ¤t_buffer->auto_save_file_format, Qnil, |
b3aa8cb4c381
(reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56669
diff
changeset
|
6194 doc: /* *Format in which to write auto-save files. |
b3aa8cb4c381
(reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56669
diff
changeset
|
6195 Should be a list of symbols naming formats that are defined in `format-alist'. |
b3aa8cb4c381
(reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56669
diff
changeset
|
6196 If it is t, which is the default, auto-save files are written in the |
b3aa8cb4c381
(reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56669
diff
changeset
|
6197 same format as a regular save would use. */); |
b3aa8cb4c381
(reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56669
diff
changeset
|
6198 |
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
6199 DEFVAR_PER_BUFFER ("buffer-invisibility-spec", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6200 ¤t_buffer->invisibility_spec, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6201 doc: /* Invisibility spec of this buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6202 The default is t, which means that text is invisible |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6203 if it has a non-nil `invisible' property. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6204 If the value is a list, a text character is invisible if its `invisible' |
77843
f49a56c237e0
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77176
diff
changeset
|
6205 property is an element in that list (or is a list with members in common). |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6206 If an element is a cons cell of the form (PROP . ELLIPSIS), |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6207 then characters with property value PROP are invisible, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6208 and they have an ellipsis as well if ELLIPSIS is non-nil. */); |
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
6209 |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
6210 DEFVAR_PER_BUFFER ("buffer-display-count", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6211 ¤t_buffer->display_count, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6212 doc: /* A number incremented each time this buffer is displayed in a window. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6213 The function `set-window-buffer' increments it. */); |
22150
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
6214 |
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
6215 DEFVAR_PER_BUFFER ("buffer-display-time", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6216 ¤t_buffer->display_time, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6217 doc: /* Time stamp updated each time this buffer is displayed in a window. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6218 The function `set-window-buffer' updates this variable |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6219 to the value obtained by calling `current-time'. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6220 If the buffer has never been shown in a window, the value is nil. */); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6221 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6222 DEFVAR_LISP ("transient-mark-mode", &Vtransient_mark_mode, |
93544
b75140e5e267
(Vtransient_mark_mode): Move docstring to simple.el to
Chong Yidong <cyd@stupidchicken.com>
parents:
93117
diff
changeset
|
6223 doc: /* */); |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
6224 Vtransient_mark_mode = Qnil; |
93544
b75140e5e267
(Vtransient_mark_mode): Move docstring to simple.el to
Chong Yidong <cyd@stupidchicken.com>
parents:
93117
diff
changeset
|
6225 /* The docstring is in simple.el. If we put it here, it would be |
b75140e5e267
(Vtransient_mark_mode): Move docstring to simple.el to
Chong Yidong <cyd@stupidchicken.com>
parents:
93117
diff
changeset
|
6226 overwritten when transient-mark-mode is defined using |
b75140e5e267
(Vtransient_mark_mode): Move docstring to simple.el to
Chong Yidong <cyd@stupidchicken.com>
parents:
93117
diff
changeset
|
6227 define-minor-mode. */ |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
6228 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6229 DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6230 doc: /* *Non-nil means disregard read-only status of buffers or characters. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6231 If the value is t, disregard `buffer-read-only' and all `read-only' |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6232 text properties. If the value is a list, disregard `buffer-read-only' |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6233 and disregard a `read-only' text property if the property value |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6234 is a member of the list. */); |
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
6235 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
|
6236 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6237 DEFVAR_PER_BUFFER ("cursor-type", ¤t_buffer->cursor_type, Qnil, |
74680
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
6238 doc: /* Cursor to use when this buffer is in the selected window. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6239 Values are interpreted as follows: |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6240 |
64572
339bbffbcd05
(syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64469
diff
changeset
|
6241 t use the cursor specified for the frame |
339bbffbcd05
(syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64469
diff
changeset
|
6242 nil don't display a cursor |
339bbffbcd05
(syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64469
diff
changeset
|
6243 box display a filled box cursor |
339bbffbcd05
(syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64469
diff
changeset
|
6244 hollow display a hollow box cursor |
339bbffbcd05
(syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64469
diff
changeset
|
6245 bar display a vertical bar cursor with default width |
339bbffbcd05
(syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64469
diff
changeset
|
6246 (bar . WIDTH) display a vertical bar cursor with width WIDTH |
339bbffbcd05
(syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64469
diff
changeset
|
6247 hbar display a horizontal bar cursor with default height |
63570
7b153a401f5c
Finish previous change.
Richard M. Stallman <rms@gnu.org>
parents:
63545
diff
changeset
|
6248 (hbar . HEIGHT) display a horizontal bar cursor with height HEIGHT |
64572
339bbffbcd05
(syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64469
diff
changeset
|
6249 ANYTHING ELSE display a hollow box cursor |
45421
4c14a5806a68
(syms_of_buffer) <cursor-type>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45393
diff
changeset
|
6250 |
99626
df0a1afd03b2
(syms_of_buffer): Fix doc-string of cursor-type.
Martin Rudalics <rudalics@gmx.at>
parents:
99080
diff
changeset
|
6251 When the buffer is displayed in a non-selected window, the |
df0a1afd03b2
(syms_of_buffer): Fix doc-string of cursor-type.
Martin Rudalics <rudalics@gmx.at>
parents:
99080
diff
changeset
|
6252 cursor's appearance is instead controlled by the variable |
df0a1afd03b2
(syms_of_buffer): Fix doc-string of cursor-type.
Martin Rudalics <rudalics@gmx.at>
parents:
99080
diff
changeset
|
6253 `cursor-in-non-selected-windows'. */); |
28322
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
6254 |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
6255 DEFVAR_PER_BUFFER ("line-spacing", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6256 ¤t_buffer->extra_line_spacing, Qnil, |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6257 doc: /* Additional space to put between lines when displaying a buffer. |
102966
a58ef8dce7bd
(syms_of_buffer) <line-spacing>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
102619
diff
changeset
|
6258 The space is measured in pixels, and put below lines on graphic displays, |
a58ef8dce7bd
(syms_of_buffer) <line-spacing>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
102619
diff
changeset
|
6259 see `display-graphic-p'. |
55242
d57364949309
(syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents:
55140
diff
changeset
|
6260 If value is a floating point number, it specifies the spacing relative |
74595
42f97e1a6081
(syms_of_buffer) <cursor-in-non-selected-windows, line-spacing, left-margin,
Juanma Barranquero <lekktu@gmail.com>
parents:
74565
diff
changeset
|
6261 to the default frame line height. A value of nil means add no extra space. */); |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6262 |
62030
bc82609e1655
(syms_of_buffer): Define cursor-in-non-selected-windows.
Richard M. Stallman <rms@gnu.org>
parents:
61445
diff
changeset
|
6263 DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows", |
62069
a0a348c8b14b
(init_buffer_once): Set cursor_in_non_selected_windows default value.
Kim F. Storm <storm@cua.dk>
parents:
62030
diff
changeset
|
6264 ¤t_buffer->cursor_in_non_selected_windows, Qnil, |
74680
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
6265 doc: /* *Cursor type to display in non-selected windows. |
74595
42f97e1a6081
(syms_of_buffer) <cursor-in-non-selected-windows, line-spacing, left-margin,
Juanma Barranquero <lekktu@gmail.com>
parents:
74565
diff
changeset
|
6266 The value t means to use hollow box cursor. See `cursor-type' for other values. */); |
62030
bc82609e1655
(syms_of_buffer): Define cursor-in-non-selected-windows.
Richard M. Stallman <rms@gnu.org>
parents:
61445
diff
changeset
|
6267 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6268 DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions, |
74680
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
6269 doc: /* List of functions called with no args to query before killing a buffer. |
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
6270 The buffer being killed will be current while the functions are running. |
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
6271 If any of them returns nil, the buffer is not killed. */); |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
6272 Vkill_buffer_query_functions = Qnil; |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
6273 |
72299
e97bfa736263
* buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents:
71968
diff
changeset
|
6274 DEFVAR_LISP ("change-major-mode-hook", &Vchange_major_mode_hook, |
e97bfa736263
* buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents:
71968
diff
changeset
|
6275 doc: /* Normal hook run before changing the major mode of a buffer. |
e97bfa736263
* buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents:
71968
diff
changeset
|
6276 The function `kill-all-local-variables' runs this before doing anything else. */); |
e97bfa736263
* buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents:
71968
diff
changeset
|
6277 Vchange_major_mode_hook = Qnil; |
e97bfa736263
* buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents:
71968
diff
changeset
|
6278 Qchange_major_mode_hook = intern ("change-major-mode-hook"); |
e97bfa736263
* buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents:
71968
diff
changeset
|
6279 staticpro (&Qchange_major_mode_hook); |
e97bfa736263
* buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents:
71968
diff
changeset
|
6280 |
14506
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
6281 defsubr (&Sbuffer_live_p); |
333 | 6282 defsubr (&Sbuffer_list); |
6283 defsubr (&Sget_buffer); | |
6284 defsubr (&Sget_file_buffer); | |
6285 defsubr (&Sget_buffer_create); | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
6286 defsubr (&Smake_indirect_buffer); |
392 | 6287 defsubr (&Sgenerate_new_buffer_name); |
333 | 6288 defsubr (&Sbuffer_name); |
6289 /*defsubr (&Sbuffer_number);*/ | |
6290 defsubr (&Sbuffer_file_name); | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
6291 defsubr (&Sbuffer_base_buffer); |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
6292 defsubr (&Sbuffer_local_value); |
333 | 6293 defsubr (&Sbuffer_local_variables); |
6294 defsubr (&Sbuffer_modified_p); | |
6295 defsubr (&Sset_buffer_modified_p); | |
6296 defsubr (&Sbuffer_modified_tick); | |
72592
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
6297 defsubr (&Sbuffer_chars_modified_tick); |
333 | 6298 defsubr (&Srename_buffer); |
6299 defsubr (&Sother_buffer); | |
6300 defsubr (&Sbuffer_enable_undo); | |
6301 defsubr (&Skill_buffer); | |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
6302 defsubr (&Sset_buffer_major_mode); |
333 | 6303 defsubr (&Sswitch_to_buffer); |
6304 defsubr (&Scurrent_buffer); | |
6305 defsubr (&Sset_buffer); | |
6306 defsubr (&Sbarf_if_buffer_read_only); | |
6307 defsubr (&Sbury_buffer); | |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
6308 defsubr (&Serase_buffer); |
92215
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
6309 defsubr (&Sbuffer_swap_text); |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
6310 defsubr (&Sset_buffer_multibyte); |
333 | 6311 defsubr (&Skill_all_local_variables); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6312 |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
6313 defsubr (&Soverlayp); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6314 defsubr (&Smake_overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6315 defsubr (&Sdelete_overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6316 defsubr (&Smove_overlay); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
6317 defsubr (&Soverlay_start); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
6318 defsubr (&Soverlay_end); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
6319 defsubr (&Soverlay_buffer); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
6320 defsubr (&Soverlay_properties); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6321 defsubr (&Soverlays_at); |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
6322 defsubr (&Soverlays_in); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6323 defsubr (&Snext_overlay_change); |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
6324 defsubr (&Sprevious_overlay_change); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6325 defsubr (&Soverlay_recenter); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6326 defsubr (&Soverlay_lists); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6327 defsubr (&Soverlay_get); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6328 defsubr (&Soverlay_put); |
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
6329 defsubr (&Srestore_buffer_modified_p); |
333 | 6330 } |
6331 | |
21514 | 6332 void |
333 | 6333 keys_of_buffer () |
6334 { | |
6335 initial_define_key (control_x_map, 'b', "switch-to-buffer"); | |
6336 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
|
6337 |
2c5f3537a1cc
(syms_of_buffer): Don't do (put 'erase-buffer 'disabled t) here.
Roland McGrath <roland@gnu.org>
parents:
5502
diff
changeset
|
6338 /* 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
|
6339 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
|
6340 Fput (intern ("erase-buffer"), Qdisabled, Qt); |
333 | 6341 } |
52401 | 6342 |
6343 /* arch-tag: e48569bf-69a9-4b65-a23b-8e68769436e1 | |
6344 (do not change this comment) */ |