Mercurial > emacs
annotate src/buffer.c @ 97723:90321d9c73d1
*** empty log message ***
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Tue, 26 Aug 2008 05:39:53 +0000 |
parents | 6c695773401d |
children | ec7f95140247 |
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, |
79759 | 4 2003, 2004, 2005, 2006, 2007, 2008 |
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, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
269 doc: /* Return the buffer named NAME (a string). |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
270 If there is no live buffer named NAME, return nil. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
271 NAME may also be a buffer; if so, the value is that buffer. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
272 (name) |
333 | 273 register Lisp_Object name; |
274 { | |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
275 if (BUFFERP (name)) |
333 | 276 return name; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
277 CHECK_STRING (name); |
333 | 278 |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
279 return Fcdr (assoc_ignore_text_properties (name, Vbuffer_alist)); |
333 | 280 } |
281 | |
282 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
|
283 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
|
284 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
|
285 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
|
286 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
|
287 (filename) |
333 | 288 register Lisp_Object filename; |
289 { | |
290 register Lisp_Object tail, buf, tem; | |
5433 | 291 Lisp_Object handler; |
292 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
293 CHECK_STRING (filename); |
333 | 294 filename = Fexpand_file_name (filename, Qnil); |
295 | |
5433 | 296 /* If the file name has special constructs in it, |
297 call the corresponding file handler. */ | |
7028
6915bf781a38
Pass operation to Ffind_file_name_handler.
Karl Heuer <kwzh@gnu.org>
parents:
6785
diff
changeset
|
298 handler = Ffind_file_name_handler (filename, Qget_file_buffer); |
5433 | 299 if (!NILP (handler)) |
300 return call2 (handler, Qget_file_buffer, filename); | |
301 | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
302 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
333 | 303 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
304 buf = Fcdr (XCAR (tail)); |
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
305 if (!BUFFERP (buf)) continue; |
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
306 if (!STRINGP (XBUFFER (buf)->filename)) continue; |
333 | 307 tem = Fstring_equal (XBUFFER (buf)->filename, filename); |
485 | 308 if (!NILP (tem)) |
333 | 309 return buf; |
310 } | |
311 return Qnil; | |
312 } | |
313 | |
12810
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
314 Lisp_Object |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
315 get_truename_buffer (filename) |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
316 register Lisp_Object filename; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
317 { |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
318 register Lisp_Object tail, buf, tem; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
319 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
320 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
|
321 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
322 buf = Fcdr (XCAR (tail)); |
12810
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
323 if (!BUFFERP (buf)) continue; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
324 if (!STRINGP (XBUFFER (buf)->file_truename)) continue; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
325 tem = Fstring_equal (XBUFFER (buf)->file_truename, filename); |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
326 if (!NILP (tem)) |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
327 return buf; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
328 } |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
329 return Qnil; |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
330 } |
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
331 |
333 | 332 /* Incremented for each buffer created, to assign the buffer number. */ |
333 int buffer_count; | |
334 | |
335 DEFUN ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
336 doc: /* Return the buffer named NAME, or create such a buffer and return it. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
337 A new buffer is created if there is no live buffer named NAME. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
338 If NAME starts with a space, the new buffer does not keep undo information. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
339 If NAME is a buffer instead of a string, then it is the value returned. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
340 The value is never nil. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
341 (name) |
333 | 342 register Lisp_Object name; |
343 { | |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
344 register Lisp_Object buf; |
333 | 345 register struct buffer *b; |
346 | |
347 buf = Fget_buffer (name); | |
485 | 348 if (!NILP (buf)) |
333 | 349 return buf; |
350 | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
351 if (SCHARS (name) == 0) |
6697
28e36f59e856
(Fget_buffer_create): Disallow empty string.
Karl Heuer <kwzh@gnu.org>
parents:
6675
diff
changeset
|
352 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
|
353 |
86561
13041217da4b
(Fget_buffer_create, Fmake_indirect_buffer): Don't cast redundantly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86285
diff
changeset
|
354 b = allocate_buffer (); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
355 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
356 /* 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
|
357 b->text = &b->own_text; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
358 b->base_buffer = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
359 |
333 | 360 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
|
361 BLOCK_INPUT; |
17022 | 362 /* We allocate extra 1-byte at the tail and keep it always '\0' for |
363 anchoring a search. */ | |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
364 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
|
365 UNBLOCK_INPUT; |
333 | 366 if (! BUF_BEG_ADDR (b)) |
10668
acbd9fab366a
(Fget_buffer_create): Call buffer_memory_full.
Richard M. Stallman <rms@gnu.org>
parents:
10611
diff
changeset
|
367 buffer_memory_full (); |
333 | 368 |
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
369 BUF_PT (b) = BEG; |
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
370 BUF_GPT (b) = BEG; |
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
371 BUF_BEGV (b) = BEG; |
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
372 BUF_ZV (b) = BEG; |
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
373 BUF_Z (b) = BEG; |
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
374 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
|
375 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
|
376 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
|
377 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
|
378 BUF_Z_BYTE (b) = BEG_BYTE; |
333 | 379 BUF_MODIFF (b) = 1; |
72592
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
380 BUF_CHARS_MODIFF (b) = 1; |
16213
3b8851bebc76
(Fget_buffer_create): Initialize BUF_OVERLAY_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents:
16193
diff
changeset
|
381 BUF_OVERLAY_MODIFF (b) = 1; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
382 BUF_SAVE_MODIFF (b) = 1; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
383 BUF_INTERVALS (b) = 0; |
25368
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
384 BUF_UNCHANGED_MODIFIED (b) = 1; |
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
385 BUF_OVERLAY_UNCHANGED_MODIFIED (b) = 1; |
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
386 BUF_END_UNCHANGED (b) = 0; |
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
387 BUF_BEG_UNCHANGED (b) = 0; |
17022 | 388 *(BUF_GPT_ADDR (b)) = *(BUF_Z_ADDR (b)) = 0; /* Put an anchor '\0'. */ |
333 | 389 |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
390 b->newline_cache = 0; |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
391 b->width_run_cache = 0; |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
392 b->width_table = Qnil; |
25368
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
393 b->prevent_redisplay_optimizations_p = 1; |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
394 |
333 | 395 /* Put this on the chain of all buffers including killed ones. */ |
396 b->next = all_buffers; | |
397 all_buffers = b; | |
398 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
399 /* An ordinary buffer normally doesn't need markers |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
400 to handle BEGV and ZV. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
401 b->pt_marker = Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
402 b->begv_marker = Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
403 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
|
404 |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
405 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
|
406 STRING_SET_INTERVALS (name, NULL_INTERVAL); |
333 | 407 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
|
408 |
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
|
409 b->undo_list = (SREF (name, 0) != ' ') ? Qnil : Qt; |
333 | 410 |
411 reset_buffer (b); | |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
412 reset_buffer_local_variables (b, 1); |
333 | 413 |
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
|
414 b->mark = Fmake_marker (); |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
415 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
|
416 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
|
417 |
333 | 418 /* Put this in the alist of all live buffers. */ |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
419 XSETBUFFER (buf, b); |
333 | 420 Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil)); |
421 | |
75784 | 422 /* An error in calling the function here (should someone redefine it) |
51318 | 423 can lead to infinite regress until you run out of stack. rms |
424 says that's not worth protecting against. */ | |
48635 | 425 if (!NILP (Ffboundp (Qucs_set_table_for_input))) |
51318 | 426 /* buf is on buffer-alist, so no gcpro. */ |
48635 | 427 call1 (Qucs_set_table_for_input, buf); |
428 | |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
429 return buf; |
333 | 430 } |
431 | |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
432 |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
433 /* 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
|
434 LIST, but for buffer B. */ |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
435 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
436 static struct Lisp_Overlay * |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
437 copy_overlays (b, list) |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
438 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
|
439 struct Lisp_Overlay *list; |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
440 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
441 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
|
442 struct Lisp_Overlay *result = NULL, *tail = NULL; |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
443 |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
444 XSETBUFFER (buffer, b); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
445 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
446 for (; list; list = list->next) |
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 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
|
449 EMACS_INT charpos; |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
450 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
451 XSETMISC (old_overlay, list); |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
452 charpos = marker_position (OVERLAY_START (old_overlay)); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
453 start = Fmake_marker (); |
37950
f01f454ea6bf
(copy_overlays): Make ENABLE_CHECKING happy.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37752
diff
changeset
|
454 Fset_marker (start, make_number (charpos), buffer); |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
455 XMARKER (start)->insertion_type |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
456 = XMARKER (OVERLAY_START (old_overlay))->insertion_type; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
457 |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
458 charpos = marker_position (OVERLAY_END (old_overlay)); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
459 end = Fmake_marker (); |
37950
f01f454ea6bf
(copy_overlays): Make ENABLE_CHECKING happy.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37752
diff
changeset
|
460 Fset_marker (end, make_number (charpos), buffer); |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
461 XMARKER (end)->insertion_type |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
462 = XMARKER (OVERLAY_END (old_overlay))->insertion_type; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
463 |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
464 overlay = allocate_misc (); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
465 XMISCTYPE (overlay) = Lisp_Misc_Overlay; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
466 OVERLAY_START (overlay) = start; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
467 OVERLAY_END (overlay) = end; |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
468 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
|
469 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
|
470 |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
471 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
|
472 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
|
473 else |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
474 result = tail = XOVERLAY (overlay); |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
475 } |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
476 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
477 return result; |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
478 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
479 |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
480 |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
481 /* Clone per-buffer values of buffer FROM. |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
482 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
483 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
|
484 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
|
485 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
|
486 copied. */ |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
487 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
488 static void |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
489 clone_per_buffer_values (from, to) |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
490 struct buffer *from, *to; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
491 { |
66233
e93aafd2c52b
(clone_per_buffer_values): Remove unused var tem.
Kim F. Storm <storm@cua.dk>
parents:
66043
diff
changeset
|
492 Lisp_Object to_buffer; |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
493 int offset; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
494 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
495 XSETBUFFER (to_buffer, to); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
496 |
91781
a6047ef14f4c
(clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91711
diff
changeset
|
497 /* 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
|
498 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
|
499 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
|
500 offset < sizeof *to; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
501 offset += sizeof (Lisp_Object)) |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
502 { |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
503 Lisp_Object obj; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
504 |
95826
54e76878a8c0
(clone_per_buffer_values): Skip `name'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
505 /* 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
|
506 if (offset == PER_BUFFER_VAR_OFFSET (name)) |
54e76878a8c0
(clone_per_buffer_values): Skip `name'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
507 continue; |
54e76878a8c0
(clone_per_buffer_values): Skip `name'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
508 |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
509 obj = PER_BUFFER_VALUE (from, offset); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
510 if (MARKERP (obj)) |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
511 { |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
512 struct Lisp_Marker *m = XMARKER (obj); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
513 obj = Fmake_marker (); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
514 XMARKER (obj)->insertion_type = m->insertion_type; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
515 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
|
516 } |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
517 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
518 PER_BUFFER_VALUE (to, offset) = obj; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
519 } |
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 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
|
522 |
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
523 to->overlays_before = copy_overlays (to, from->overlays_before); |
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
524 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
|
525 |
60683
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
526 /* 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
|
527 and install that in TO. */ |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
528 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
|
529 } |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
530 |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
531 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
|
532 2, 3, |
11838
92a61e91ec05
(Fmake_indirect_buffer): Fix interactive spec.
Karl Heuer <kwzh@gnu.org>
parents:
11823
diff
changeset
|
533 "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
|
534 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
|
535 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
|
536 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
|
537 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
|
538 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
|
539 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
|
540 (base_buffer, name, clone) |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
541 Lisp_Object base_buffer, name, clone; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
542 { |
54834
9533e29b87e8
(Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents:
54819
diff
changeset
|
543 Lisp_Object buf, tem; |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
544 struct buffer *b; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
545 |
54819
8df5ed349fc2
(Fmake_indirect_buffer): Check that NAME is a string.
Andreas Schwab <schwab@suse.de>
parents:
54786
diff
changeset
|
546 CHECK_STRING (name); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
547 buf = Fget_buffer (name); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
548 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
|
549 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
|
550 |
54834
9533e29b87e8
(Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents:
54819
diff
changeset
|
551 tem = base_buffer; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
552 base_buffer = Fget_buffer (base_buffer); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
553 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
|
554 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
|
555 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
|
556 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
|
557 |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
558 if (SCHARS (name) == 0) |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
559 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
|
560 |
86561
13041217da4b
(Fget_buffer_create, Fmake_indirect_buffer): Don't cast redundantly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86285
diff
changeset
|
561 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
|
562 |
d0d527210b0c
* lisp.h (enum Lisp_Misc_Type): Del Lisp_Misc_Some_Buffer_Local_Value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85296
diff
changeset
|
563 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
|
564 ? 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
|
565 : XBUFFER (base_buffer)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
566 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
567 /* Use the base buffer's text object. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
568 b->text = b->base_buffer->text; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
569 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
570 BUF_BEGV (b) = BUF_BEGV (b->base_buffer); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
571 BUF_ZV (b) = BUF_ZV (b->base_buffer); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
572 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
|
573 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
|
574 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
|
575 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
|
576 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
577 b->newline_cache = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
578 b->width_run_cache = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
579 b->width_table = Qnil; |
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 /* 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
|
582 b->next = all_buffers; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
583 all_buffers = b; |
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 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
|
586 STRING_SET_INTERVALS (name, NULL_INTERVAL); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
587 b->name = name; |
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 reset_buffer (b); |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
590 reset_buffer_local_variables (b, 1); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
591 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
592 /* 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
|
593 XSETBUFFER (buf, b); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
594 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
|
595 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
596 b->mark = Fmake_marker (); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
597 b->name = name; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
598 |
24604
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
599 /* 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
|
600 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
|
601 |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
602 /* 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
|
603 if (NILP (b->base_buffer->pt_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
604 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
605 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
|
606 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
|
607 BUF_PT (b->base_buffer), |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
608 BUF_PT_BYTE (b->base_buffer)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
609 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
610 if (NILP (b->base_buffer->begv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
611 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
612 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
|
613 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
|
614 BUF_BEGV (b->base_buffer), |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
615 BUF_BEGV_BYTE (b->base_buffer)); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
616 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
617 if (NILP (b->base_buffer->zv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
618 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
619 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
|
620 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
|
621 BUF_ZV (b->base_buffer), |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
622 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
|
623 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
|
624 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
625 |
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
626 if (NILP (clone)) |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
627 { |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
628 /* Give the indirect buffer markers for its narrowing. */ |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
629 b->pt_marker = Fmake_marker (); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
630 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
|
631 b->begv_marker = Fmake_marker (); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
632 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
|
633 b->zv_marker = Fmake_marker (); |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
634 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
|
635 XMARKER (b->zv_marker)->insertion_type = 1; |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
636 } |
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
637 else |
61445
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
638 { |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
639 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
|
640 |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
641 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
|
642 b->filename = Qnil; |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
643 b->file_truename = Qnil; |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
644 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
|
645 b->backed_up = Qnil; |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
646 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
|
647 set_buffer_internal_1 (b); |
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
648 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
|
649 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
|
650 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
|
651 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
|
652 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
653 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
654 return buf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
655 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
656 |
52012
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
657 void |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
658 delete_all_overlays (b) |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
659 struct buffer *b; |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
660 { |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
661 Lisp_Object overlay; |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
662 |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
663 /* `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
|
664 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
|
665 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
|
666 them any more. */ |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
667 while (b->overlays_before) |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
668 { |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
669 XSETMISC (overlay, b->overlays_before); |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
670 Fdelete_overlay (overlay); |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
671 } |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
672 while (b->overlays_after) |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
673 { |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
674 XSETMISC (overlay, b->overlays_after); |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
675 Fdelete_overlay (overlay); |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
676 } |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
677 eassert (b->overlays_before == NULL); |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
678 eassert (b->overlays_after == NULL); |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
679 } |
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
680 |
8873
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
681 /* 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
|
682 and local variables. |
52012
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
683 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
|
684 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
|
685 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
|
686 claims it doesn't belong to it. */ |
333 | 687 |
688 void | |
689 reset_buffer (b) | |
690 register struct buffer *b; | |
691 { | |
692 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
|
693 b->file_truename = Qnil; |
333 | 694 b->directory = (current_buffer) ? current_buffer->directory : Qnil; |
695 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
|
696 XSETFASTINT (b->save_length, 0); |
333 | 697 b->last_window_start = 1; |
17566
7ed40081342f
(reset_buffer): Initialize clip_changed field.
Richard M. Stallman <rms@gnu.org>
parents:
17238
diff
changeset
|
698 /* 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
|
699 b->clip_changed = 0; |
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
700 b->prevent_redisplay_optimizations_p = 1; |
333 | 701 b->backed_up = Qnil; |
702 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
|
703 b->auto_save_failure_time = -1; |
333 | 704 b->auto_save_file_name = Qnil; |
705 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
|
706 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
|
707 b->overlays_after = NULL; |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
708 b->overlay_center = BEG; |
3242
f873e6b9af52
(reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents:
3226
diff
changeset
|
709 b->mark_active = Qnil; |
10561
53f34c870201
(init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
10505
diff
changeset
|
710 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
|
711 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
|
712 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
|
713 b->last_selected_window = Qnil; |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
714 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
|
715 b->display_time = Qnil; |
20995
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
716 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
|
717 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
|
718 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
|
719 |
11a505aa1322
(reset_buffer): Initialize `display_error_modiff'.
Richard M. Stallman <rms@gnu.org>
parents:
41524
diff
changeset
|
720 b->display_error_modiff = 0; |
333 | 721 } |
722 | |
8873
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
723 /* 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
|
724 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
|
725 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
|
726 Instead, use Fkill_all_local_variables. |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
727 |
87218
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
728 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
|
729 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
|
730 we preserve those. */ |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
731 |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
732 static void |
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
733 reset_buffer_local_variables (b, permanent_too) |
333 | 734 register struct buffer *b; |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
735 int permanent_too; |
333 | 736 { |
737 register int offset; | |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
738 int i; |
333 | 739 |
740 /* Reset the major mode to Fundamental, together with all the | |
741 things that depend on the major mode. | |
742 default-major-mode is handled at a higher level. | |
743 We ignore it here. */ | |
744 b->major_mode = Qfundamental_mode; | |
745 b->keymap = Qnil; | |
746 b->mode_name = QSFundamental; | |
747 b->minor_modes = Qnil; | |
13270
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
748 |
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
749 /* 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
|
750 fix up its insides first. */ |
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
751 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
|
752 && 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
|
753 && 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
|
754 Fset_standard_case_table (Vascii_downcase_table); |
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
755 |
333 | 756 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
|
757 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
|
758 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
|
759 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
|
760 b->invisibility_spec = Qt; |
15786
f2d0e8928d57
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15776
diff
changeset
|
761 #ifndef DOS_NT |
f2d0e8928d57
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15776
diff
changeset
|
762 b->buffer_file_type = Qnil; |
f2d0e8928d57
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15776
diff
changeset
|
763 #endif |
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
764 |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
765 /* 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
|
766 if (permanent_too) |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
767 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
|
768 else |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
769 { |
87977
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
770 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
|
771 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
|
772 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
|
773 && SYMBOLP (XCAR (XCAR (tmp))) |
87977
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
774 && !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
|
775 { |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
776 /* If permanent-local, keep it. */ |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
777 last = tmp; |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
778 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
|
779 { |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
780 /* 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
|
781 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
|
782 Lisp_Object list, newlist; |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
783 list = XCDR (XCAR (tmp)); |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
784 if (!CONSP (list)) |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
785 newlist = list; |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
786 else |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
787 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
|
788 { |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
789 Lisp_Object elt = XCAR (list); |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
790 /* 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
|
791 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
|
792 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
|
793 if (! SYMBOLP (elt) |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
794 || EQ (elt, Qt) |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
795 || !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
|
796 newlist = Fcons (elt, newlist); |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
797 } |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
798 XSETCDR (XCAR (tmp), Fnreverse (newlist)); |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
799 } |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
800 } |
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
801 /* 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
|
802 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
|
803 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
|
804 else |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
805 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
|
806 } |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
807 |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
808 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
|
809 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
|
810 SET_PER_BUFFER_VALUE_P (b, i, 0); |
333 | 811 |
812 /* For each slot that has a default value, | |
813 copy that into the slot. */ | |
814 | |
91781
a6047ef14f4c
(clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91711
diff
changeset
|
815 /* 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
|
816 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
|
817 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
|
818 offset < sizeof *b; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
819 offset += sizeof (Lisp_Object)) |
9362
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
820 { |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
821 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
|
822 if ((idx > 0 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
823 && (permanent_too |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
824 || buffer_permanent_local_flags[idx] == 0)) |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
825 /* Is -2 used anywhere? */ |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
826 || idx == -2) |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
827 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
|
828 } |
333 | 829 } |
830 | |
392 | 831 /* We split this away from generate-new-buffer, because rename-buffer |
832 and set-visited-file-name ought to be able to use this to really | |
833 rename the buffer properly. */ | |
834 | |
835 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
|
836 1, 2, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
837 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
|
838 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
|
839 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
|
840 \(starting at 2) until an unused name is found, and then return that name. |
75784 | 841 Optional second argument IGNORE specifies a name that is okay to use (if |
842 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
|
843 (name, ignore) |
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
844 register Lisp_Object name, ignore; |
333 | 845 { |
846 register Lisp_Object gentemp, tem; | |
847 int count; | |
848 char number[10]; | |
849 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
850 CHECK_STRING (name); |
333 | 851 |
54786
870b7a6bffb8
(Fgenerate_new_buffer_name): Return NAME argument if IGNORE argument
Luc Teirlinck <teirllm@auburn.edu>
parents:
54772
diff
changeset
|
852 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
|
853 if (!NILP (tem)) |
870b7a6bffb8
(Fgenerate_new_buffer_name): Return NAME argument if IGNORE argument
Luc Teirlinck <teirllm@auburn.edu>
parents:
54772
diff
changeset
|
854 return name; |
333 | 855 tem = Fget_buffer (name); |
485 | 856 if (NILP (tem)) |
392 | 857 return name; |
333 | 858 |
859 count = 1; | |
860 while (1) | |
861 { | |
862 sprintf (number, "<%d>", ++count); | |
863 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
|
864 tem = Fstring_equal (gentemp, ignore); |
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
865 if (!NILP (tem)) |
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
866 return gentemp; |
333 | 867 tem = Fget_buffer (gentemp); |
485 | 868 if (NILP (tem)) |
392 | 869 return gentemp; |
333 | 870 } |
871 } | |
872 | |
873 | |
874 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
|
875 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
|
876 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
|
877 (buffer) |
333 | 878 register Lisp_Object buffer; |
879 { | |
485 | 880 if (NILP (buffer)) |
333 | 881 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
|
882 CHECK_BUFFER (buffer); |
333 | 883 return XBUFFER (buffer)->name; |
884 } | |
885 | |
886 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
|
887 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
|
888 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
|
889 (buffer) |
333 | 890 register Lisp_Object buffer; |
891 { | |
485 | 892 if (NILP (buffer)) |
333 | 893 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
|
894 CHECK_BUFFER (buffer); |
333 | 895 return XBUFFER (buffer)->filename; |
896 } | |
897 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
898 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
|
899 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
900 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
|
901 If BUFFER is not indirect, return nil. |
95d283fb2215
(Fbuffer_base_buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54834
diff
changeset
|
902 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
|
903 (buffer) |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
904 register Lisp_Object buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
905 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
906 struct buffer *base; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
907 Lisp_Object base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
908 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
909 if (NILP (buffer)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
910 base = current_buffer->base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
911 else |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
912 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
913 CHECK_BUFFER (buffer); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
914 base = XBUFFER (buffer)->base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
915 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
916 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
917 if (! base) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
918 return Qnil; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
919 XSETBUFFER (base_buffer, base); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
920 return base_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
921 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
922 |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
923 DEFUN ("buffer-local-value", Fbuffer_local_value, |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
924 Sbuffer_local_value, 2, 2, 0, |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
925 doc: /* Return the value of VARIABLE in BUFFER. |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
926 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
|
927 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
|
928 (variable, buffer) |
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
929 register Lisp_Object variable; |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
930 register Lisp_Object buffer; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
931 { |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
932 register struct buffer *buf; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
933 register Lisp_Object result; |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
934 struct Lisp_Symbol *sym; |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
935 |
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
936 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
|
937 CHECK_BUFFER (buffer); |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
938 buf = XBUFFER (buffer); |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
939 |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
940 sym = indirect_variable (XSYMBOL (variable)); |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
941 XSETSYMBOL (variable, sym); |
62855
5ef5c45c0187
(Fbuffer_local_value): Call indirect_variable.
Richard M. Stallman <rms@gnu.org>
parents:
62793
diff
changeset
|
942 |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
943 /* 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
|
944 result = Fassoc (variable, buf->local_var_alist); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
945 if (NILP (result)) |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
946 { |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
947 int offset, idx; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
948 int found = 0; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
949 |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
950 /* Look in special slots */ |
91781
a6047ef14f4c
(clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91711
diff
changeset
|
951 /* 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
|
952 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
|
953 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
|
954 offset < sizeof (struct buffer); |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
955 /* sizeof EMACS_INT == sizeof Lisp_Object */ |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
956 offset += (sizeof (EMACS_INT))) |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
957 { |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
958 idx = PER_BUFFER_IDX (offset); |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
959 if ((idx == -1 || PER_BUFFER_VALUE_P (buf, idx)) |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
960 && 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
|
961 && EQ (PER_BUFFER_SYMBOL (offset), variable)) |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
962 { |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
963 result = PER_BUFFER_VALUE (buf, offset); |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
964 found = 1; |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
965 break; |
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 } |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
968 |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
969 if (!found) |
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
970 result = Fdefault_value (variable); |
40725
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 else |
46199
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
973 { |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
974 Lisp_Object valcontents; |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
975 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
|
976 |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
977 /* What binding is loaded right now? */ |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
978 valcontents = sym->value; |
46199
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
979 current_alist_element |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
980 = 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
|
981 |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
982 /* 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
|
983 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
|
984 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
|
985 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
|
986 |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
987 Fsetcdr (current_alist_element, |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
988 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
|
989 |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
990 /* 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
|
991 result = XCDR (result); |
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
992 } |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
993 |
71968
b0505e901bff
(Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents:
70931
diff
changeset
|
994 if (!EQ (result, Qunbound)) |
b0505e901bff
(Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents:
70931
diff
changeset
|
995 return result; |
b0505e901bff
(Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents:
70931
diff
changeset
|
996 |
b0505e901bff
(Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents:
70931
diff
changeset
|
997 xsignal1 (Qvoid_variable, variable); |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
998 } |
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
999 |
60683
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1000 /* 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
|
1001 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
|
1002 in special slots in the buffer object. */ |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1003 |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1004 static Lisp_Object |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1005 buffer_lisp_local_variables (buf) |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1006 struct buffer *buf; |
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 Lisp_Object result = Qnil; |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1009 register Lisp_Object tail; |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1010 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
|
1011 { |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1012 Lisp_Object val, elt; |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1013 |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1014 elt = XCAR (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 /* 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
|
1017 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
|
1018 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
|
1019 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
|
1020 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
|
1021 val = find_symbol_value (XCAR (elt)); |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1022 /* 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
|
1023 if (buf != current_buffer) |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1024 val = XCDR (elt); |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1025 |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1026 /* 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
|
1027 if (EQ (val, Qunbound)) |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1028 result = Fcons (XCAR (elt), result); |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1029 /* Otherwise, put (symbol . value) in the list. */ |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1030 else |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1031 result = Fcons (Fcons (XCAR (elt), val), result); |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1032 } |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1033 |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1034 return result; |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1035 } |
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1036 |
333 | 1037 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
|
1038 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
|
1039 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
|
1040 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
|
1041 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
|
1042 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
|
1043 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
|
1044 (buffer) |
333 | 1045 register Lisp_Object buffer; |
1046 { | |
1047 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
|
1048 register Lisp_Object result; |
333 | 1049 |
485 | 1050 if (NILP (buffer)) |
333 | 1051 buf = current_buffer; |
1052 else | |
1053 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
1054 CHECK_BUFFER (buffer); |
333 | 1055 buf = XBUFFER (buffer); |
1056 } | |
1057 | |
60683
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1058 result = buffer_lisp_local_variables (buf); |
333 | 1059 |
1060 /* Add on all the variables stored in special slots. */ | |
1061 { | |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
1062 int offset, idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
1063 |
91781
a6047ef14f4c
(clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91711
diff
changeset
|
1064 /* 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
|
1065 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
|
1066 for (offset = PER_BUFFER_VAR_OFFSET (undo_list); |
333 | 1067 offset < sizeof (struct buffer); |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
1068 /* sizeof EMACS_INT == sizeof Lisp_Object */ |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
1069 offset += (sizeof (EMACS_INT))) |
333 | 1070 { |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
1071 idx = PER_BUFFER_IDX (offset); |
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
1072 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
|
1073 && SYMBOLP (PER_BUFFER_SYMBOL (offset))) |
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
1074 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
|
1075 PER_BUFFER_VALUE (buf, offset)), |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
1076 result); |
333 | 1077 } |
1078 } | |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
1079 |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
1080 return result; |
333 | 1081 } |
1082 | |
1083 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
|
1084 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1085 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
|
1086 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
|
1087 (buffer) |
333 | 1088 register Lisp_Object buffer; |
1089 { | |
1090 register struct buffer *buf; | |
485 | 1091 if (NILP (buffer)) |
333 | 1092 buf = current_buffer; |
1093 else | |
1094 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
1095 CHECK_BUFFER (buffer); |
333 | 1096 buf = XBUFFER (buffer); |
1097 } | |
1098 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1099 return BUF_SAVE_MODIFF (buf) < BUF_MODIFF (buf) ? Qt : Qnil; |
333 | 1100 } |
1101 | |
1102 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
|
1103 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1104 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
|
1105 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
|
1106 (flag) |
333 | 1107 register Lisp_Object flag; |
1108 { | |
1109 register int already; | |
1110 register Lisp_Object fn; | |
28207
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1111 Lisp_Object buffer, window; |
333 | 1112 |
1113 #ifdef CLASH_DETECTION | |
1114 /* If buffer becoming modified, lock the file. | |
1115 If buffer becoming unmodified, unlock the file. */ | |
1116 | |
11659
f9b6e65774e7
(Fset_buffer_modified_p): Use the truename for locking.
Richard M. Stallman <rms@gnu.org>
parents:
11473
diff
changeset
|
1117 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
|
1118 /* 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
|
1119 if (!NILP (fn) && ! NILP (current_buffer->filename)) |
333 | 1120 { |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1121 already = SAVE_MODIFF < MODIFF; |
485 | 1122 if (!already && !NILP (flag)) |
333 | 1123 lock_file (fn); |
485 | 1124 else if (already && NILP (flag)) |
333 | 1125 unlock_file (fn); |
1126 } | |
1127 #endif /* CLASH_DETECTION */ | |
1128 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1129 SAVE_MODIFF = NILP (flag) ? MODIFF : 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1130 |
28207
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1131 /* 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
|
1132 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
|
1133 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
|
1134 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
|
1135 (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
|
1136 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
|
1137 update_modes_lines unconditionally. |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1138 |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1139 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
|
1140 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
|
1141 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
|
1142 XSETBUFFER (buffer, current_buffer); |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1143 window = Fget_buffer_window (buffer, Qt); |
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1144 if (WINDOWP (window)) |
35339
e5e6579e8308
(Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents:
34488
diff
changeset
|
1145 { |
e5e6579e8308
(Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents:
34488
diff
changeset
|
1146 ++update_mode_lines; |
e5e6579e8308
(Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents:
34488
diff
changeset
|
1147 current_buffer->prevent_redisplay_optimizations_p = 1; |
e5e6579e8308
(Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents:
34488
diff
changeset
|
1148 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1149 |
333 | 1150 return flag; |
1151 } | |
1152 | |
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1153 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
|
1154 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
|
1155 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
|
1156 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
|
1157 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
|
1158 (flag) |
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1159 Lisp_Object flag; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1160 { |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1161 #ifdef CLASH_DETECTION |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1162 Lisp_Object fn; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1163 |
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1164 /* If buffer becoming modified, lock the file. |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1165 If buffer becoming unmodified, unlock the file. */ |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1166 |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1167 fn = current_buffer->file_truename; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1168 /* 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
|
1169 if (!NILP (fn) && ! NILP (current_buffer->filename)) |
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 int already = SAVE_MODIFF < MODIFF; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1172 if (!already && !NILP (flag)) |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1173 lock_file (fn); |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1174 else if (already && NILP (flag)) |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1175 unlock_file (fn); |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1176 } |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1177 #endif /* CLASH_DETECTION */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1178 |
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1179 SAVE_MODIFF = NILP (flag) ? MODIFF : 0; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1180 return flag; |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1181 } |
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1182 |
333 | 1183 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
|
1184 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1185 doc: /* Return BUFFER's tick counter, incremented for each change in text. |
75784 | 1186 Each buffer has a tick counter which is incremented each time the |
1187 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
|
1188 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
|
1189 (buffer) |
333 | 1190 register Lisp_Object buffer; |
1191 { | |
1192 register struct buffer *buf; | |
485 | 1193 if (NILP (buffer)) |
333 | 1194 buf = current_buffer; |
1195 else | |
1196 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
1197 CHECK_BUFFER (buffer); |
333 | 1198 buf = XBUFFER (buffer); |
1199 } | |
1200 | |
1201 return make_number (BUF_MODIFF (buf)); | |
1202 } | |
72592
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1203 |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1204 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
|
1205 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
|
1206 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
|
1207 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
|
1208 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
|
1209 time text in that buffer is inserted or deleted. By comparing the |
72596 | 1210 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
|
1211 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
|
1212 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
|
1213 buffer as BUFFER. */) |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1214 (buffer) |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1215 register Lisp_Object buffer; |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1216 { |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1217 register struct buffer *buf; |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1218 if (NILP (buffer)) |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1219 buf = current_buffer; |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1220 else |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1221 { |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1222 CHECK_BUFFER (buffer); |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1223 buf = XBUFFER (buffer); |
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1224 } |
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 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
|
1227 } |
333 | 1228 |
392 | 1229 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
|
1230 "(list (read-string \"Rename buffer (to new name): \" \ |
40dcde0eb331
(Frename_buffer): In interactive spec replace
Juri Linkov <juri@jurta.org>
parents:
87218
diff
changeset
|
1231 nil 'buffer-name-history (buffer-name (current-buffer))) \ |
40dcde0eb331
(Frename_buffer): In interactive spec replace
Juri Linkov <juri@jurta.org>
parents:
87218
diff
changeset
|
1232 current-prefix-arg)", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1233 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
|
1234 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
|
1235 buffer named NEWNAME already exists. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1236 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
|
1237 `generate-new-buffer-name'. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1238 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
|
1239 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
|
1240 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
|
1241 (newname, unique) |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1242 register Lisp_Object newname, unique; |
333 | 1243 { |
1244 register Lisp_Object tem, buf; | |
1245 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
1246 CHECK_STRING (newname); |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1247 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1248 if (SCHARS (newname) == 0) |
7455
35657813817c
(Frename_buffer): Reject empty string as new name.
Richard M. Stallman <rms@gnu.org>
parents:
7434
diff
changeset
|
1249 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
|
1250 |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1251 tem = Fget_buffer (newname); |
485 | 1252 if (!NILP (tem)) |
392 | 1253 { |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
1254 /* 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
|
1255 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
|
1256 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
|
1257 (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
|
1258 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
|
1259 return current_buffer->name; |
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
1260 if (!NILP (unique)) |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1261 newname = Fgenerate_new_buffer_name (newname, current_buffer->name); |
392 | 1262 else |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1263 error ("Buffer name `%s' is in use", SDATA (newname)); |
392 | 1264 } |
333 | 1265 |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1266 current_buffer->name = newname; |
1707
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
1267 |
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
1268 /* 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
|
1269 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
|
1270 update_mode_lines++; |
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
1271 |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
1272 XSETBUFFER (buf, current_buffer); |
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1273 Fsetcar (Frassq (buf, Vbuffer_alist), newname); |
8599
cf3233d70e94
(Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents:
8550
diff
changeset
|
1274 if (NILP (current_buffer->filename) |
cf3233d70e94
(Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents:
8550
diff
changeset
|
1275 && !NILP (current_buffer->auto_save_file_name)) |
333 | 1276 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
|
1277 /* 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
|
1278 return current_buffer->name; |
333 | 1279 } |
1280 | |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1281 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
|
1282 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
|
1283 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
|
1284 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
|
1285 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
|
1286 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
|
1287 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
|
1288 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
|
1289 (buffer, visible_ok, frame) |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1290 register Lisp_Object buffer, visible_ok, frame; |
333 | 1291 { |
14226
ad275aca6fc5
(Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1292 Lisp_Object Fset_buffer_major_mode (); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1293 register Lisp_Object tail, buf, notsogood, tem, pred, add_ons; |
333 | 1294 notsogood = Qnil; |
1295 | |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1296 if (NILP (frame)) |
25664
832aeb9c3996
(Fother_buffer): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25653
diff
changeset
|
1297 frame = selected_frame; |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1298 |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1299 tail = Vbuffer_alist; |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1300 pred = frame_buffer_predicate (frame); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1301 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1302 /* 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
|
1303 before other buffers. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1304 |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1305 tem = frame_buffer_list (frame); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1306 add_ons = Qnil; |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1307 while (CONSP (tem)) |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1308 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1309 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
|
1310 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
|
1311 tem = XCDR (tem); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1312 } |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1313 tail = nconc2 (Fnreverse (add_ons), tail); |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1314 |
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
1315 for (; CONSP (tail); tail = XCDR (tail)) |
333 | 1316 { |
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
1317 buf = Fcdr (XCAR (tail)); |
333 | 1318 if (EQ (buf, buffer)) |
1319 continue; | |
53350
89a24e997838
(Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents:
52459
diff
changeset
|
1320 if (NILP (buf)) |
89a24e997838
(Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents:
52459
diff
changeset
|
1321 continue; |
89a24e997838
(Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents:
52459
diff
changeset
|
1322 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
|
1323 continue; |
46419
46ff766afaaf
* buffer.c (Fother_buffer): Use SREF when retrieving a byte from
Ken Raeburn <raeburn@raeburn.org>
parents:
46378
diff
changeset
|
1324 if (SREF (XBUFFER (buf)->name, 0) == ' ') |
333 | 1325 continue; |
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1326 /* 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
|
1327 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
|
1328 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
|
1329 { |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1330 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
|
1331 if (NILP (tem)) |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1332 continue; |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1333 } |
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1334 |
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
1335 if (NILP (visible_ok)) |
31395
d0f522cf422b
(Fother_buffer): Consider buffers as invisible when
Gerd Moellmann <gerd@gnu.org>
parents:
31128
diff
changeset
|
1336 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
|
1337 else |
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
1338 tem = Qnil; |
485 | 1339 if (NILP (tem)) |
333 | 1340 return buf; |
485 | 1341 if (NILP (notsogood)) |
333 | 1342 notsogood = buf; |
1343 } | |
485 | 1344 if (!NILP (notsogood)) |
333 | 1345 return notsogood; |
27480
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1346 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
|
1347 if (NILP (buf)) |
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1348 { |
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1349 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
|
1350 Fset_buffer_major_mode (buf); |
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1351 } |
14226
ad275aca6fc5
(Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1352 return buf; |
333 | 1353 } |
1354 | |
1355 DEFUN ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo, | |
1356 0, 1, "", | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1357 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
|
1358 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
|
1359 (buffer) |
648 | 1360 register Lisp_Object buffer; |
333 | 1361 { |
648 | 1362 Lisp_Object real_buffer; |
333 | 1363 |
648 | 1364 if (NILP (buffer)) |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
1365 XSETBUFFER (real_buffer, current_buffer); |
333 | 1366 else |
1367 { | |
648 | 1368 real_buffer = Fget_buffer (buffer); |
1369 if (NILP (real_buffer)) | |
1370 nsberror (buffer); | |
333 | 1371 } |
1372 | |
648 | 1373 if (EQ (XBUFFER (real_buffer)->undo_list, Qt)) |
1374 XBUFFER (real_buffer)->undo_list = Qnil; | |
333 | 1375 |
1376 return Qnil; | |
1377 } | |
1378 | |
1379 /* | |
1380 DEFVAR_LISP ("kill-buffer-hook", no_cell, "\ | |
1381 Hook to be run (by `run-hooks', which see) when a buffer is killed.\n\ | |
1382 The buffer being killed will be current while the hook is running.\n\ | |
1383 See `kill-buffer'." | |
1384 */ | |
1385 DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 1, 1, "bKill buffer: ", | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1386 doc: /* Kill the buffer BUFFER. |
74680
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
1387 The argument may be a buffer or the name of a buffer. |
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
1388 With a nil argument, kill the current buffer. |
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
1389 |
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
1390 Value is t if the buffer is actually killed, nil otherwise. |
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
1391 |
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
1392 The functions in `kill-buffer-query-functions' are called with BUFFER as |
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
1393 the current buffer. If any of them returns nil, the buffer is not killed. |
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
1394 |
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
1395 The hook `kill-buffer-hook' is run before the buffer is actually killed. |
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
1396 The buffer being killed will be current while the hook is running. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1397 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1398 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
|
1399 with SIGHUP. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1400 (buffer) |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1401 Lisp_Object buffer; |
333 | 1402 { |
1403 Lisp_Object buf; | |
1404 register struct buffer *b; | |
1405 register Lisp_Object tem; | |
1406 register struct Lisp_Marker *m; | |
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
1407 struct gcpro gcpro1; |
333 | 1408 |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1409 if (NILP (buffer)) |
333 | 1410 buf = Fcurrent_buffer (); |
1411 else | |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1412 buf = Fget_buffer (buffer); |
485 | 1413 if (NILP (buf)) |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1414 nsberror (buffer); |
333 | 1415 |
1416 b = XBUFFER (buf); | |
1417 | |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1418 /* Avoid trouble for buffer already dead. */ |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1419 if (NILP (b->name)) |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1420 return Qnil; |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1421 |
333 | 1422 /* Query if the buffer is still modified. */ |
485 | 1423 if (INTERACTIVE && !NILP (b->filename) |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1424 && BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) |
333 | 1425 { |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1426 GCPRO1 (buf); |
49444
a80513b20297
(Fkill_buffer): Call format2 instead of format1.
Richard M. Stallman <rms@gnu.org>
parents:
49057
diff
changeset
|
1427 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
|
1428 b->name, make_number (0))); |
333 | 1429 UNGCPRO; |
485 | 1430 if (NILP (tem)) |
333 | 1431 return Qnil; |
1432 } | |
1433 | |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1434 /* Run hooks with the buffer to be killed the current buffer. */ |
333 | 1435 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46199
diff
changeset
|
1436 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
|
1437 Lisp_Object arglist[1]; |
333 | 1438 |
1439 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
1440 set_buffer_internal (b); | |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1441 |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1442 /* 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
|
1443 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
|
1444 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
|
1445 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
|
1446 if (NILP (tem)) |
50014
3b2576528809
(Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents:
49974
diff
changeset
|
1447 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
|
1448 |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1449 /* Then run the hooks. */ |
41524
095a45698793
(Fkill_buffer): Use Frun_hooks, not Vrun_hooks.
Richard M. Stallman <rms@gnu.org>
parents:
41027
diff
changeset
|
1450 Frun_hooks (1, &Qkill_buffer_hook); |
333 | 1451 unbind_to (count, Qnil); |
1452 } | |
1453 | |
1454 /* We have no more questions to ask. Verify that it is valid | |
1455 to kill the buffer. This must be done after the questions | |
1456 since anything can happen within do_yes_or_no_p. */ | |
1457 | |
1458 /* Don't kill the minibuffer now current. */ | |
1459 if (EQ (buf, XWINDOW (minibuf_window)->buffer)) | |
1460 return Qnil; | |
1461 | |
485 | 1462 if (NILP (b->name)) |
333 | 1463 return Qnil; |
1464 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1465 /* 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
|
1466 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
|
1467 ask questions or their hooks get errors. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1468 if (! b->base_buffer) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1469 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1470 struct buffer *other; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1471 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1472 GCPRO1 (buf); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1473 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1474 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
|
1475 /* all_buffers contains dead buffers too; |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1476 don't re-kill them. */ |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1477 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
|
1478 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1479 Lisp_Object buf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1480 XSETBUFFER (buf, other); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1481 Fkill_buffer (buf); |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1482 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1483 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1484 UNGCPRO; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1485 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1486 |
333 | 1487 /* Make this buffer not be current. |
1488 In the process, notice if this is the sole visible buffer | |
1489 and give up if so. */ | |
1490 if (b == current_buffer) | |
1491 { | |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1492 tem = Fother_buffer (buf, Qnil, Qnil); |
333 | 1493 Fset_buffer (tem); |
1494 if (b == current_buffer) | |
1495 return Qnil; | |
1496 } | |
1497 | |
33698
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1498 /* 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
|
1499 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
|
1500 XSETBUFFER (tem, current_buffer); |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1501 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
|
1502 { |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1503 tem = Fother_buffer (buf, Qnil, Qnil); |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1504 if (EQ (buf, tem)) |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1505 return Qnil; |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1506 } |
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1507 |
333 | 1508 /* Now there is no question: we can kill the buffer. */ |
1509 | |
1510 #ifdef CLASH_DETECTION | |
1511 /* Unlock this buffer's file, if it is locked. */ | |
1512 unlock_buffer (b); | |
1513 #endif /* CLASH_DETECTION */ | |
1514 | |
77176
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1515 GCPRO1 (buf); |
333 | 1516 kill_buffer_processes (buf); |
77176
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1517 UNGCPRO; |
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1518 |
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1519 /* 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
|
1520 have called kill-buffer. */ |
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1521 |
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1522 if (NILP (b->name)) |
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1523 return Qnil; |
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1524 |
51782
3b58843e8f3f
(Fkill_buffer): Clear charpos cache if necessary.
Kenichi Handa <handa@m17n.org>
parents:
51669
diff
changeset
|
1525 clear_charpos_cache (b); |
333 | 1526 |
1527 tem = Vinhibit_quit; | |
1528 Vinhibit_quit = Qt; | |
13922
5636ed4243ec
(Fkill_buffer): Delete buffer from Vbuffer_alist after replacing it.
Erik Naggum <erik@naggum.no>
parents:
13917
diff
changeset
|
1529 replace_buffer_in_all_windows (buf); |
333 | 1530 Vbuffer_alist = Fdelq (Frassq (buf, Vbuffer_alist), Vbuffer_alist); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1531 frames_discard_buffer (buf); |
333 | 1532 Vinhibit_quit = tem; |
1533 | |
40760
aa9b081b3a0d
(Fkill_buffer): Don't delete auto save file if buffer is modified.
Richard M. Stallman <rms@gnu.org>
parents:
40735
diff
changeset
|
1534 /* 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
|
1535 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
|
1536 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
|
1537 && 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
|
1538 && 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
|
1539 && 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
|
1540 && NILP (Fsymbol_value (intern ("auto-save-visited-file-name")))) |
333 | 1541 { |
1542 Lisp_Object tem; | |
1543 tem = Fsymbol_value (intern ("delete-auto-save-files")); | |
485 | 1544 if (! NILP (tem)) |
10082
8d3a71736423
(Fkill_buffer): Use internal_delete_file.
Richard M. Stallman <rms@gnu.org>
parents:
9950
diff
changeset
|
1545 internal_delete_file (b->auto_save_file_name); |
333 | 1546 } |
1547 | |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1548 if (b->base_buffer) |
333 | 1549 { |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1550 /* 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
|
1551 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
|
1552 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
|
1553 for (m = BUF_MARKERS (b); m; ) |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1554 { |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1555 struct Lisp_Marker *next = m->next; |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1556 if (m->buffer == b) |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1557 unchain_marker (m); |
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1558 m = next; |
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1559 } |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1560 } |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1561 else |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1562 { |
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1563 /* 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
|
1564 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
|
1565 for (m = BUF_MARKERS (b); m; ) |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1566 { |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1567 struct Lisp_Marker *next = m->next; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1568 m->buffer = 0; |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1569 m->next = NULL; |
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1570 m = next; |
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 BUF_MARKERS (b) = NULL; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1573 BUF_INTERVALS (b) = NULL_INTERVAL; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1574 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1575 /* Perhaps we should explicitly free the interval tree here... */ |
333 | 1576 } |
1291
7c32612174c3
* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents:
1281
diff
changeset
|
1577 |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1578 /* 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
|
1579 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
|
1580 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
|
1581 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
|
1582 swap_out_buffer_local_variables (b); |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
1583 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
|
1584 |
333 | 1585 b->name = Qnil; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1586 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
1587 BLOCK_INPUT; |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1588 if (! b->base_buffer) |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
1589 free_buffer_text (b); |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1590 |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1591 if (b->newline_cache) |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1592 { |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1593 free_region_cache (b->newline_cache); |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1594 b->newline_cache = 0; |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1595 } |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1596 if (b->width_run_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->width_run_cache); |
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1599 b->width_run_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 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
|
1602 UNBLOCK_INPUT; |
333 | 1603 b->undo_list = Qnil; |
1604 | |
1605 return Qt; | |
1606 } | |
1607 | |
550 | 1608 /* Move the assoc for buffer BUF to the front of buffer-alist. Since |
1609 we do this each time BUF is selected visibly, the more recently | |
1610 selected buffers are always closer to the front of the list. This | |
1611 means that other_buffer is more likely to choose a relevant buffer. */ | |
333 | 1612 |
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
1613 void |
333 | 1614 record_buffer (buf) |
1615 Lisp_Object buf; | |
1616 { | |
1617 register Lisp_Object link, prev; | |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1618 Lisp_Object frame; |
25664
832aeb9c3996
(Fother_buffer): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25653
diff
changeset
|
1619 frame = selected_frame; |
333 | 1620 |
1621 prev = Qnil; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1622 for (link = Vbuffer_alist; CONSP (link); link = XCDR (link)) |
333 | 1623 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1624 if (EQ (XCDR (XCAR (link)), buf)) |
333 | 1625 break; |
1626 prev = link; | |
1627 } | |
1628 | |
550 | 1629 /* Effectively do Vbuffer_alist = Fdelq (link, Vbuffer_alist); |
1630 we cannot use Fdelq itself here because it allows quitting. */ | |
333 | 1631 |
485 | 1632 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
|
1633 Vbuffer_alist = XCDR (Vbuffer_alist); |
333 | 1634 else |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
1635 XSETCDR (prev, XCDR (XCDR (prev))); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1636 |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
1637 XSETCDR (link, Vbuffer_alist); |
333 | 1638 Vbuffer_alist = link; |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1639 |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1640 /* 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
|
1641 |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1642 prev = Qnil; |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1643 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
|
1644 link = XCDR (link)) |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1645 { |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1646 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
|
1647 { |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1648 if (NILP (prev)) |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1649 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
|
1650 else |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1651 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
|
1652 break; |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1653 } |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1654 prev = link; |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1655 } |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
1656 |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1657 /* 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
|
1658 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1659 prev = Qnil; |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1660 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
|
1661 link = XCDR (link)) |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1662 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1663 if (EQ (XCAR (link), buf)) |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1664 break; |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1665 prev = link; |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1666 } |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1667 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1668 /* Effectively do delq. */ |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1669 |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1670 if (CONSP (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 if (NILP (prev)) |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1673 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
|
1674 XCDR (frame_buffer_list (frame))); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1675 else |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
1676 XSETCDR (prev, XCDR (XCDR (prev))); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1677 |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
1678 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
|
1679 set_frame_buffer_list (frame, link); |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1680 } |
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1681 else |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1682 set_frame_buffer_list (frame, Fcons (buf, frame_buffer_list (frame))); |
333 | 1683 } |
1684 | |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1685 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
|
1686 doc: /* Set an appropriate major mode for BUFFER. |
40605 | 1687 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
|
1688 according to `default-major-mode'. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1689 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
|
1690 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
|
1691 (buffer) |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1692 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
|
1693 { |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1694 int count; |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1695 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
|
1696 |
76791
6ef15c3befe4
(Fset_buffer_major_mode): Check that BUFFER is valid.
Juanma Barranquero <lekktu@gmail.com>
parents:
76557
diff
changeset
|
1697 CHECK_BUFFER (buffer); |
6ef15c3befe4
(Fset_buffer_major_mode): Check that BUFFER is valid.
Juanma Barranquero <lekktu@gmail.com>
parents:
76557
diff
changeset
|
1698 |
39974
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1699 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
|
1700 && 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
|
1701 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
|
1702 else |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1703 { |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1704 function = buffer_defaults.major_mode; |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1705 if (NILP (function) |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1706 && 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
|
1707 function = current_buffer->major_mode; |
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1708 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1709 |
48635 | 1710 if (NILP (function) || EQ (function, Qfundamental_mode)) |
1711 return Qnil; | |
1712 | |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46199
diff
changeset
|
1713 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
|
1714 |
48635 | 1715 /* To select a nonfundamental mode, |
1716 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
|
1717 |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1718 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
|
1719 |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1720 Fset_buffer (buffer); |
48635 | 1721 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
|
1722 |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1723 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
|
1724 } |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1725 |
25181
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1726 /* If switching buffers in WINDOW would be an error, return |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1727 a C string saying what the error would be. */ |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1728 |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1729 char * |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1730 no_switch_window (window) |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1731 Lisp_Object window; |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1732 { |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1733 Lisp_Object tem; |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1734 if (EQ (minibuf_window, window)) |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1735 return "Cannot switch buffers in minibuffer window"; |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1736 tem = Fwindow_dedicated_p (window); |
43712
223f1f5d160d
(syms_of_buffer): Allow non-string `mode-name'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43630
diff
changeset
|
1737 if (EQ (tem, Qt)) |
25181
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1738 return "Cannot switch buffers in a dedicated window"; |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1739 return NULL; |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1740 } |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1741 |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1742 /* 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
|
1743 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
|
1744 |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1745 Lisp_Object |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1746 switch_to_buffer_1 (buffer, norecord) |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1747 Lisp_Object buffer, norecord; |
333 | 1748 { |
1749 register Lisp_Object buf; | |
1750 | |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1751 if (NILP (buffer)) |
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1752 buf = Fother_buffer (Fcurrent_buffer (), Qnil, Qnil); |
333 | 1753 else |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1754 { |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1755 buf = Fget_buffer (buffer); |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1756 if (NILP (buf)) |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1757 { |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1758 buf = Fget_buffer_create (buffer); |
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1759 Fset_buffer_major_mode (buf); |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1760 } |
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1761 } |
333 | 1762 Fset_buffer (buf); |
485 | 1763 if (NILP (norecord)) |
333 | 1764 record_buffer (buf); |
1765 | |
1766 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
|
1767 ? 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
|
1768 : selected_window, |
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
1769 buf, Qnil); |
333 | 1770 |
16840
299b0e0f0a93
Fix typo editing previous change.
Richard M. Stallman <rms@gnu.org>
parents:
16830
diff
changeset
|
1771 return buf; |
333 | 1772 } |
1773 | |
94249
982b68f17589
(Fswitch_to_buffer): Change interactive spec to call
Juri Linkov <juri@jurta.org>
parents:
93544
diff
changeset
|
1774 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
|
1775 "(list (read-buffer-to-switch \"Switch to buffer: \"))", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1776 doc: /* Select buffer BUFFER in the current window. |
56396
f1ddf2e65cd3
(Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56172
diff
changeset
|
1777 If BUFFER does not identify an existing buffer, |
f1ddf2e65cd3
(Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56172
diff
changeset
|
1778 then this function creates a buffer with that name. |
f1ddf2e65cd3
(Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56172
diff
changeset
|
1779 |
f1ddf2e65cd3
(Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56172
diff
changeset
|
1780 When called from Lisp, BUFFER may be a buffer, a string \(a buffer name), |
f1ddf2e65cd3
(Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56172
diff
changeset
|
1781 or nil. If BUFFER is nil, then this function chooses a buffer |
f1ddf2e65cd3
(Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56172
diff
changeset
|
1782 using `other-buffer'. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1783 Optional second arg NORECORD non-nil means |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1784 do not put this buffer at the front of the list of recently selected ones. |
56396
f1ddf2e65cd3
(Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56172
diff
changeset
|
1785 This function returns the buffer it switched to. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1786 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1787 WARNING: This is NOT the way to work on another buffer temporarily |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1788 within a Lisp program! Use `set-buffer' instead. That avoids messing with |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1789 the window-buffer correspondences. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1790 (buffer, norecord) |
25181
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1791 Lisp_Object buffer, norecord; |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1792 { |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1793 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
|
1794 |
51939
d38453fdf2a0
(copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51867
diff
changeset
|
1795 if (EQ (buffer, Fwindow_buffer (selected_window))) |
72503
6ccb18aa8a5d
(Fswitch_to_buffer): Move buffer to front of
Nick Roberts <nickrob@snap.net.nz>
parents:
72486
diff
changeset
|
1796 { |
72524
49a6e184d20a
(Fswitch_to_buffer): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
72503
diff
changeset
|
1797 /* 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
|
1798 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
|
1799 |
49a6e184d20a
(Fswitch_to_buffer): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
72503
diff
changeset
|
1800 /* But do put this buffer at the front of the buffer list, |
49a6e184d20a
(Fswitch_to_buffer): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
72503
diff
changeset
|
1801 unless that has been inhibited. Note that even if |
49a6e184d20a
(Fswitch_to_buffer): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
72503
diff
changeset
|
1802 BUFFER is at the front of the main buffer-list already, |
49a6e184d20a
(Fswitch_to_buffer): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
72503
diff
changeset
|
1803 we still want to move it to the front of the frame's buffer list. */ |
49a6e184d20a
(Fswitch_to_buffer): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
72503
diff
changeset
|
1804 if (NILP (norecord)) |
72503
6ccb18aa8a5d
(Fswitch_to_buffer): Move buffer to front of
Nick Roberts <nickrob@snap.net.nz>
parents:
72486
diff
changeset
|
1805 record_buffer (buffer); |
6ccb18aa8a5d
(Fswitch_to_buffer): Move buffer to front of
Nick Roberts <nickrob@snap.net.nz>
parents:
72486
diff
changeset
|
1806 return Fset_buffer (buffer); |
6ccb18aa8a5d
(Fswitch_to_buffer): Move buffer to front of
Nick Roberts <nickrob@snap.net.nz>
parents:
72486
diff
changeset
|
1807 } |
51939
d38453fdf2a0
(copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51867
diff
changeset
|
1808 |
25181
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1809 err = no_switch_window (selected_window); |
92767
b0c32527b009
(Fswitch_to_buffer): Fall back on pop-to-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92237
diff
changeset
|
1810 if (err) |
b0c32527b009
(Fswitch_to_buffer): Fall back on pop-to-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92237
diff
changeset
|
1811 /* If can't display in current window, let pop-to-buffer |
b0c32527b009
(Fswitch_to_buffer): Fall back on pop-to-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92237
diff
changeset
|
1812 try some other window. */ |
b0c32527b009
(Fswitch_to_buffer): Fall back on pop-to-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92237
diff
changeset
|
1813 return call3 (intern ("pop-to-buffer"), buffer, Qnil, 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
|
1814 |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1815 return switch_to_buffer_1 (buffer, norecord); |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1816 } |
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1817 |
333 | 1818 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
|
1819 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
|
1820 () |
333 | 1821 { |
1822 register Lisp_Object buf; | |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
1823 XSETBUFFER (buf, current_buffer); |
333 | 1824 return buf; |
1825 } | |
1826 | |
25491
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1827 /* Set the current buffer to B. |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1828 |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1829 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
|
1830 global unchanged information in beg_unchanged and end_unchanged. |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1831 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
|
1832 information on a buffer-basis. Every action affecting other |
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1833 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
|
1834 time, and that increments windows_or_buffers_changed. */ |
333 | 1835 |
1836 void | |
1837 set_buffer_internal (b) | |
1838 register struct buffer *b; | |
1839 { | |
25368
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
1840 if (current_buffer != b) |
25491
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1841 set_buffer_internal_1 (b); |
11889
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1842 } |
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 /* 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
|
1845 This is used by redisplay. */ |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1846 |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1847 void |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1848 set_buffer_internal_1 (b) |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1849 register struct buffer *b; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1850 { |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1851 register struct buffer *old_buf; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1852 register Lisp_Object tail, valcontents; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1853 Lisp_Object tem; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1854 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
1855 #ifdef USE_MMAP_FOR_BUFFERS |
31416
9b8c5bea5e8d
(set_buffer_internal_1) [REL_ALLOC_MMAP]: If
Gerd Moellmann <gerd@gnu.org>
parents:
31412
diff
changeset
|
1856 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
|
1857 enlarge_buffer_text (b, 0); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
1858 #endif /* USE_MMAP_FOR_BUFFERS */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1859 |
11889
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1860 if (current_buffer == b) |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1861 return; |
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1862 |
333 | 1863 old_buf = current_buffer; |
1864 current_buffer = b; | |
1865 last_known_column_point = -1; /* invalidate indentation cache */ | |
1866 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1867 if (old_buf) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1868 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1869 /* 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
|
1870 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
|
1871 if (old_buf->base_buffer) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1872 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
|
1873 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1874 /* 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
|
1875 when it is not current, update them now. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1876 if (! NILP (old_buf->pt_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1877 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1878 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1879 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1880 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
|
1881 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
|
1882 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1883 if (! NILP (old_buf->begv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1884 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1885 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1886 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1887 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
|
1888 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
|
1889 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1890 if (! NILP (old_buf->zv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1891 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1892 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1893 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1894 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
|
1895 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
|
1896 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1897 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1898 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1899 /* 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
|
1900 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
|
1901 if (b->base_buffer) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1902 b->undo_list = b->base_buffer->undo_list; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1903 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1904 /* 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
|
1905 when it is not current, fetch them now. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1906 if (! NILP (b->pt_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1907 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1908 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
|
1909 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
|
1910 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1911 if (! NILP (b->begv_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1912 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1913 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
|
1914 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
|
1915 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1916 if (! NILP (b->zv_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1917 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1918 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
|
1919 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
|
1920 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1921 |
333 | 1922 /* Look down buffer's list of local Lisp variables |
1923 to find and update any that forward into C variables. */ | |
1924 | |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1925 for (tail = b->local_var_alist; CONSP (tail); tail = XCDR (tail)) |
333 | 1926 { |
39581
6d9fa06012a6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
39337
diff
changeset
|
1927 valcontents = SYMBOL_VALUE (XCAR (XCAR (tail))); |
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
|
1928 if ((BUFFER_LOCAL_VALUEP (valcontents)) |
21141
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
1929 && (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
|
1930 (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem)))) |
333 | 1931 /* Just reference the variable |
1932 to cause it to become set for this buffer. */ | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1933 Fsymbol_value (XCAR (XCAR (tail))); |
333 | 1934 } |
1935 | |
1936 /* Do the same with any others that were local to the previous buffer */ | |
1937 | |
1938 if (old_buf) | |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1939 for (tail = old_buf->local_var_alist; CONSP (tail); tail = XCDR (tail)) |
333 | 1940 { |
39581
6d9fa06012a6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
39337
diff
changeset
|
1941 valcontents = SYMBOL_VALUE (XCAR (XCAR (tail))); |
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
|
1942 if ((BUFFER_LOCAL_VALUEP (valcontents)) |
21141
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
1943 && (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
|
1944 (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem)))) |
333 | 1945 /* Just reference the variable |
1946 to cause it to become set for this buffer. */ | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1947 Fsymbol_value (XCAR (XCAR (tail))); |
333 | 1948 } |
1949 } | |
1950 | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1951 /* 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
|
1952 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
|
1953 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1954 void |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1955 set_buffer_temp (b) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1956 struct buffer *b; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1957 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1958 register struct buffer *old_buf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1959 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1960 if (current_buffer == b) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1961 return; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1962 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1963 old_buf = current_buffer; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1964 current_buffer = b; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1965 |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1966 if (old_buf) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1967 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1968 /* 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
|
1969 when it is not current, update them now. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1970 if (! NILP (old_buf->pt_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1971 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1972 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1973 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1974 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
|
1975 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
|
1976 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1977 if (! NILP (old_buf->begv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1978 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1979 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1980 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1981 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
|
1982 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
|
1983 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1984 if (! NILP (old_buf->zv_marker)) |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1985 { |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1986 Lisp_Object obuf; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1987 XSETBUFFER (obuf, old_buf); |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1988 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
|
1989 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
|
1990 } |
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 /* 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
|
1994 when it is not current, fetch them now. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1995 if (! NILP (b->pt_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1996 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1997 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
|
1998 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
|
1999 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
2000 if (! NILP (b->begv_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
2001 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
2002 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
|
2003 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
|
2004 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
2005 if (! NILP (b->zv_marker)) |
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
2006 { |
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
2007 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
|
2008 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
|
2009 } |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
2010 } |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
2011 |
333 | 2012 DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2013 doc: /* Make the buffer BUFFER current for editing operations. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2014 BUFFER may be a buffer or the name of an existing buffer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2015 See also `save-excursion' when you want to make a buffer current temporarily. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2016 This function does not display the buffer, so its effect ends |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2017 when the current command terminates. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2018 Use `switch-to-buffer' or `pop-to-buffer' to switch buffers permanently. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2019 (buffer) |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
2020 register Lisp_Object buffer; |
333 | 2021 { |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
2022 register Lisp_Object buf; |
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
2023 buf = Fget_buffer (buffer); |
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
2024 if (NILP (buf)) |
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
2025 nsberror (buffer); |
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
2026 if (NILP (XBUFFER (buf)->name)) |
333 | 2027 error ("Selecting deleted buffer"); |
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
2028 set_buffer_internal (XBUFFER (buf)); |
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
2029 return buf; |
333 | 2030 } |
20698
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2031 |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2032 /* 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
|
2033 |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2034 Lisp_Object |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2035 set_buffer_if_live (buffer) |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2036 Lisp_Object buffer; |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2037 { |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2038 if (! NILP (XBUFFER (buffer)->name)) |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2039 Fset_buffer (buffer); |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2040 return Qnil; |
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2041 } |
333 | 2042 |
2043 DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only, | |
2044 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
|
2045 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
|
2046 () |
333 | 2047 { |
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
2048 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
|
2049 && NILP (Vinhibit_read_only)) |
71968
b0505e901bff
(Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents:
70931
diff
changeset
|
2050 xsignal1 (Qbuffer_read_only, Fcurrent_buffer ()); |
333 | 2051 return Qnil; |
2052 } | |
2053 | |
2054 DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "", | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2055 doc: /* Put BUFFER at the end of the list of all buffers. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2056 There it is the least likely candidate for `other-buffer' to return; |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2057 thus, the least likely buffer for \\[switch-to-buffer] to select by default. |
59891
0e1b2e676d71
(Fbury_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
59833
diff
changeset
|
2058 You can specify a buffer name as BUFFER, or an actual buffer object. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2059 If BUFFER is nil or omitted, bury the current buffer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2060 Also, if BUFFER is nil or omitted, remove the current buffer from the |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2061 selected window if it is displayed there. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2062 (buffer) |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
2063 register Lisp_Object buffer; |
333 | 2064 { |
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
2065 /* Figure out what buffer we're going to bury. */ |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
2066 if (NILP (buffer)) |
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
2067 { |
39802
efbac46c874c
(Fbury_buffer): Don't try to remove the buffer from the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
2068 Lisp_Object tem; |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
2069 XSETBUFFER (buffer, current_buffer); |
18485
d6e8b92585e9
(Fbury_buffer): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18455
diff
changeset
|
2070 |
39802
efbac46c874c
(Fbury_buffer): Don't try to remove the buffer from the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
2071 tem = Fwindow_buffer (selected_window); |
18485
d6e8b92585e9
(Fbury_buffer): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18455
diff
changeset
|
2072 /* 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
|
2073 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
|
2074 { |
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
2075 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
|
2076 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
|
2077 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
|
2078 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
|
2079 else |
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
2080 Fdelete_window (selected_window); |
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
2081 } |
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
2082 } |
333 | 2083 else |
2084 { | |
2085 Lisp_Object buf1; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
2086 |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
2087 buf1 = Fget_buffer (buffer); |
485 | 2088 if (NILP (buf1)) |
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
2089 nsberror (buffer); |
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
2090 buffer = buf1; |
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
2091 } |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
2092 |
28991
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2093 /* 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
|
2094 buffer is killed. */ |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2095 if (!NILP (XBUFFER (buffer)->name)) |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2096 { |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2097 Lisp_Object aelt, link; |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2098 |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2099 aelt = Frassq (buffer, Vbuffer_alist); |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2100 link = Fmemq (aelt, Vbuffer_alist); |
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2101 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
|
2102 XSETCDR (link, Qnil); |
28991
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2103 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
|
2104 |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83407
diff
changeset
|
2105 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
|
2106 = 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
|
2107 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
|
2108 = 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
|
2109 } |
17234
bda734eef575
(Fbury_buffer): Call frames_bury_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
17220
diff
changeset
|
2110 |
333 | 2111 return Qnil; |
2112 } | |
2113 | |
1953
714df59790af
(Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents:
1952
diff
changeset
|
2114 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
|
2115 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
|
2116 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
|
2117 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
|
2118 () |
333 | 2119 { |
2120 Fwiden (); | |
26056
9c4556ef15de
(Fget_buffer_create, Fmake_indirect_buffer, Fkill_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
25744
diff
changeset
|
2121 |
9c4556ef15de
(Fget_buffer_create, Fmake_indirect_buffer, Fkill_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
25744
diff
changeset
|
2122 del_range (BEG, Z); |
25626
acfb741e6e24
(Ferase_buffer): Don't erase the minibuffer prompt.
Richard M. Stallman <rms@gnu.org>
parents:
25546
diff
changeset
|
2123 |
333 | 2124 current_buffer->last_window_start = 1; |
2125 /* Prevent warnings, or suspension of auto saving, that would happen | |
2126 if future size is less than past size. Use of erase-buffer | |
2127 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
|
2128 XSETFASTINT (current_buffer->save_length, 0); |
333 | 2129 return Qnil; |
2130 } | |
2131 | |
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
2132 void |
333 | 2133 validate_region (b, e) |
2134 register Lisp_Object *b, *e; | |
2135 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
2136 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
|
2137 CHECK_NUMBER_COERCE_MARKER (*e); |
333 | 2138 |
2139 if (XINT (*b) > XINT (*e)) | |
2140 { | |
9335
8cf58b38d244
(validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents:
9296
diff
changeset
|
2141 Lisp_Object tem; |
8cf58b38d244
(validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents:
9296
diff
changeset
|
2142 tem = *b; *b = *e; *e = tem; |
333 | 2143 } |
2144 | |
2145 if (!(BEGV <= XINT (*b) && XINT (*b) <= XINT (*e) | |
2146 && XINT (*e) <= ZV)) | |
2147 args_out_of_range (*b, *e); | |
2148 } | |
2149 | |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2150 /* 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
|
2151 and return the adjusted position. */ |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2152 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2153 static int |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2154 advance_to_char_boundary (byte_pos) |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2155 int byte_pos; |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2156 { |
21085
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2157 int c; |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2158 |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2159 if (byte_pos == BEG) |
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2160 /* 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
|
2161 return BEG; |
21085
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 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
|
2164 if (! CHAR_HEAD_P (c)) |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2165 { |
25508 | 2166 /* 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
|
2167 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
|
2168 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
|
2169 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2170 do |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2171 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2172 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 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
|
2174 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2175 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
|
2176 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
|
2177 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
|
2178 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
|
2179 /* 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
|
2180 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
|
2181 not, BYTE_POS was unchanged. */ |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2182 } |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2183 |
20935
2fc5eb0799fe
(advance_to_char_boundary): Make the behaviour
Kenichi Handa <handa@m17n.org>
parents:
20868
diff
changeset
|
2184 return byte_pos; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2185 } |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2186 |
92215
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2187 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
|
2188 1, 1, 0, |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2189 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
|
2190 (buffer) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2191 Lisp_Object buffer; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2192 { |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2193 struct buffer *other_buffer; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2194 CHECK_BUFFER (buffer); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2195 other_buffer = XBUFFER (buffer); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2196 |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2197 /* Actually, it probably works just fine. |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2198 * if (other_buffer == current_buffer) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2199 * 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
|
2200 |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2201 /* 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
|
2202 *both* indirect. */ |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2203 if (other_buffer->base_buffer |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2204 || current_buffer->base_buffer) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2205 error ("Cannot swap indirect buffers's text"); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2206 |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2207 { /* This is probably harder to make work. */ |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2208 struct buffer *other; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2209 for (other = all_buffers; other; other = other->next) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2210 if (other->base_buffer == other_buffer |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2211 || other->base_buffer == current_buffer) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2212 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
|
2213 } |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2214 |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2215 #define swapfield(field, type) \ |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2216 do { \ |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2217 type tmp##field = other_buffer->field; \ |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2218 other_buffer->field = current_buffer->field; \ |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2219 current_buffer->field = tmp##field; \ |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2220 } while (0) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2221 |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2222 swapfield (own_text, struct buffer_text); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2223 eassert (current_buffer->text == ¤t_buffer->own_text); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2224 eassert (other_buffer->text == &other_buffer->own_text); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2225 swapfield (pt, EMACS_INT); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2226 swapfield (pt_byte, EMACS_INT); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2227 swapfield (begv, EMACS_INT); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2228 swapfield (begv_byte, EMACS_INT); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2229 swapfield (zv, EMACS_INT); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2230 swapfield (zv_byte, EMACS_INT); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2231 eassert (!current_buffer->base_buffer); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2232 eassert (!other_buffer->base_buffer); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2233 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
|
2234 swapfield (newline_cache, struct region_cache *); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2235 swapfield (width_run_cache, struct region_cache *); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2236 current_buffer->prevent_redisplay_optimizations_p = 1; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2237 other_buffer->prevent_redisplay_optimizations_p = 1; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2238 swapfield (overlays_before, struct Lisp_Overlay *); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2239 swapfield (overlays_after, struct Lisp_Overlay *); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2240 swapfield (overlay_center, EMACS_INT); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2241 swapfield (undo_list, Lisp_Object); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2242 swapfield (mark, Lisp_Object); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2243 if (MARKERP (current_buffer->mark) && XMARKER (current_buffer->mark)->buffer) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2244 XMARKER (current_buffer->mark)->buffer = current_buffer; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2245 if (MARKERP (other_buffer->mark) && XMARKER (other_buffer->mark)->buffer) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2246 XMARKER (other_buffer->mark)->buffer = other_buffer; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2247 swapfield (enable_multibyte_characters, Lisp_Object); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2248 /* 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
|
2249 Hopefully they're just nil anyway. */ |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2250 swapfield (pt_marker, Lisp_Object); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2251 swapfield (begv_marker, Lisp_Object); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2252 swapfield (zv_marker, Lisp_Object); |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2253 current_buffer->point_before_scroll = Qnil; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2254 other_buffer->point_before_scroll = Qnil; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2255 |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2256 current_buffer->text->modiff++; other_buffer->text->modiff++; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2257 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
|
2258 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
|
2259 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
|
2260 current_buffer->text->end_unchanged = current_buffer->text->gpt; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2261 other_buffer->text->beg_unchanged = current_buffer->text->gpt; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2262 other_buffer->text->end_unchanged = current_buffer->text->gpt; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2263 { |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2264 struct Lisp_Marker *m; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2265 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
|
2266 if (m->buffer == other_buffer) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2267 m->buffer = current_buffer; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2268 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
|
2269 if (m->buffer == current_buffer) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2270 m->buffer = other_buffer; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2271 } |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2272 if (current_buffer->text->intervals) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2273 (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
|
2274 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
|
2275 if (other_buffer->text->intervals) |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2276 (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
|
2277 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
|
2278 |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2279 return Qnil; |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2280 } |
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
2281 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2282 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
|
2283 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2284 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
|
2285 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
|
2286 If FLAG is nil, this makes the buffer a single-byte buffer. |
89483 | 2287 In these cases, the buffer contents remain unchanged as a sequence of |
2288 bytes but the contents viewed as characters do change. | |
2289 If FLAG is `to', this makes the buffer a multibyte buffer by changing | |
89909 | 2290 all eight-bit bytes to eight-bit characters. |
53816
0987c11386f1
(Fset_buffer_multibyte): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
53815
diff
changeset
|
2291 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
|
2292 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
|
2293 (flag) |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2294 Lisp_Object flag; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2295 { |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2296 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
|
2297 struct buffer *other; |
51391
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2298 int begv, zv; |
51394
d1641e2dfc5b
(Fset_buffer_multibyte): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
51391
diff
changeset
|
2299 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
|
2300 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
|
2301 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
|
2302 struct gcpro gcpro1; |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2303 |
24240
6ea9058180ec
(Fset_buffer_multibyte): Error if buffer is multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
23760
diff
changeset
|
2304 if (current_buffer->base_buffer) |
6ea9058180ec
(Fset_buffer_multibyte): Error if buffer is multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
23760
diff
changeset
|
2305 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
|
2306 |
21506
a44f9f59c656
(Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
2307 /* Do nothing if nothing actually changes. */ |
a44f9f59c656
(Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
2308 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
|
2309 return flag; |
a44f9f59c656
(Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
2310 |
72486
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2311 GCPRO1 (old_undo); |
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2312 |
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2313 /* 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
|
2314 instead. */ |
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2315 current_buffer->undo_list = Qt; |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2316 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2317 /* 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
|
2318 clear_charpos_cache (current_buffer); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2319 |
51391
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2320 if (NILP (flag)) |
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2321 begv = BEGV_BYTE, zv = ZV_BYTE; |
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2322 else |
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2323 begv = BEGV, zv = ZV; |
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2324 |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2325 if (narrowed) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2326 Fwiden (); |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2327 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2328 if (NILP (flag)) |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2329 { |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2330 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
|
2331 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
|
2332 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2333 /* 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
|
2334 to calculate the old correspondences. */ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2335 set_intervals_multibyte (0); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2336 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2337 current_buffer->enable_multibyte_characters = Qnil; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2338 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2339 Z = Z_BYTE; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2340 BEGV = BEGV_BYTE; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2341 ZV = ZV_BYTE; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2342 GPT = GPT_BYTE; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2343 TEMP_SET_PT_BOTH (PT_BYTE, PT_BYTE); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2344 |
55242
d57364949309
(syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents:
55140
diff
changeset
|
2345 |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2346 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
|
2347 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
|
2348 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2349 /* 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
|
2350 pos = BEG; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2351 stop = GPT; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2352 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
|
2353 while (1) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2354 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2355 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
|
2356 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2357 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
|
2358 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2359 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
|
2360 break; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2361 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
|
2362 stop = Z; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2363 } |
88354
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2364 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
|
2365 p++, pos++; |
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2366 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
|
2367 { |
88453
4e78ee207f40
(Fset_buffer_multibyte): Fix 8-bit char handling.
Kenichi Handa <handa@m17n.org>
parents:
88354
diff
changeset
|
2368 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
|
2369 /* 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
|
2370 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
|
2371 code. */ |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2372 bytes--; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2373 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
|
2374 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
|
2375 *p++ = c; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2376 pos++; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2377 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
|
2378 begv -= bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2379 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
|
2380 zv -= bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2381 stop = Z; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2382 } |
89483 | 2383 else |
88354
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2384 { |
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2385 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
|
2386 p += bytes, pos += bytes; |
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2387 } |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2388 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2389 if (narrowed) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2390 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
|
2391 } |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2392 else |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2393 { |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2394 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
|
2395 int pos, stop; |
88354
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2396 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
|
2397 |
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2398 /* 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
|
2399 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
|
2400 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
|
2401 |
89483 | 2402 if (EQ (flag, Qt) |
88944
8628701201ae
(Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88547
diff
changeset
|
2403 && 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
|
2404 && ! 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
|
2405 { |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2406 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
|
2407 |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2408 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
|
2409 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
|
2410 { |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2411 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
|
2412 |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2413 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
|
2414 } |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2415 } |
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2416 |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2417 /* 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
|
2418 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
|
2419 pos = BEG; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2420 stop = GPT; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2421 p = BEG_ADDR; |
88354
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2422 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
|
2423 while (1) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2424 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2425 int bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2426 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2427 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
|
2428 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2429 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
|
2430 break; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2431 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
|
2432 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
|
2433 stop = Z; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2434 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
2435 |
88944
8628701201ae
(Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88547
diff
changeset
|
2436 if (ASCII_BYTE_P (*p)) |
8628701201ae
(Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88547
diff
changeset
|
2437 p++, pos++; |
89483 | 2438 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
|
2439 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
|
2440 else |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2441 { |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2442 unsigned char tmp[MAX_MULTIBYTE_LENGTH]; |
88944
8628701201ae
(Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88547
diff
changeset
|
2443 int c; |
8628701201ae
(Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88547
diff
changeset
|
2444 |
89483 | 2445 c = BYTE8_TO_CHAR (*p); |
88507
e3a506b5f300
(Fset_buffer_multibyte): Convert 8-bit bytes to
Kenichi Handa <handa@m17n.org>
parents:
88453
diff
changeset
|
2446 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
|
2447 *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
|
2448 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
|
2449 bytes--; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2450 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
|
2451 /* 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
|
2452 pos = GPT; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2453 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
|
2454 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
|
2455 begv += bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2456 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
|
2457 zv += bytes; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2458 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
|
2459 pt += bytes; |
88453
4e78ee207f40
(Fset_buffer_multibyte): Fix 8-bit char handling.
Kenichi Handa <handa@m17n.org>
parents:
88354
diff
changeset
|
2460 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
|
2461 stop = Z; |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2462 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2463 } |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2464 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2465 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
|
2466 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
|
2467 |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2468 if (narrowed) |
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2469 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
|
2470 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2471 /* 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
|
2472 set_intervals_multibyte needs it too. */ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2473 current_buffer->enable_multibyte_characters = Qt; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2474 |
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2475 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
|
2476 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
|
2477 |
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2478 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
|
2479 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2480 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
|
2481 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
|
2482 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
|
2483 else |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2484 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
|
2485 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2486 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
|
2487 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
|
2488 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
|
2489 else |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2490 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
|
2491 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2492 { |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2493 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
|
2494 int pt; |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2495 |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2496 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
|
2497 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
|
2498 else |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2499 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
|
2500 TEMP_SET_PT_BOTH (pt, pt_byte); |
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2501 } |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2502 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2503 tail = markers = BUF_MARKERS (current_buffer); |
22021 | 2504 |
2505 /* This prevents BYTE_TO_CHAR (that is, buf_bytepos_to_charpos) from | |
2506 getting confused by the markers that have not yet been updated. | |
2507 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
|
2508 BUF_MARKERS (current_buffer) = NULL; |
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2509 |
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2510 for (; tail; tail = tail->next) |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2511 { |
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2512 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
|
2513 tail->charpos = BYTE_TO_CHAR (tail->bytepos); |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2514 } |
22023
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2515 |
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2516 /* 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
|
2517 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
|
2518 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
|
2519 abort (); |
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2520 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2521 BUF_MARKERS (current_buffer) = markers; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2522 |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2523 /* 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
|
2524 between chars and bytes. */ |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2525 set_intervals_multibyte (1); |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2526 } |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2527 |
72486
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2528 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
|
2529 { |
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2530 /* 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
|
2531 extern Lisp_Object Qapply; |
72532
71e0aa245bce
(Fset_buffer_multibyte): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents:
72524
diff
changeset
|
2532 current_buffer->undo_list = Fcons (list3 (Qapply, |
71e0aa245bce
(Fset_buffer_multibyte): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents:
72524
diff
changeset
|
2533 intern ("set-buffer-multibyte"), |
71e0aa245bce
(Fset_buffer_multibyte): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents:
72524
diff
changeset
|
2534 NILP (flag) ? Qt : Qnil), |
71e0aa245bce
(Fset_buffer_multibyte): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents:
72524
diff
changeset
|
2535 old_undo); |
72486
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2536 } |
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2537 |
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2538 UNGCPRO; |
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2539 |
26970
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2540 /* 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
|
2541 showing that buffer must be updated thoroughly. */ |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2542 current_buffer->prevent_redisplay_optimizations_p = 1; |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2543 ++windows_or_buffers_changed; |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2544 |
24604
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
2545 /* 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
|
2546 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
|
2547 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
|
2548 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
|
2549 { |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2550 other->enable_multibyte_characters |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2551 = current_buffer->enable_multibyte_characters; |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2552 other->prevent_redisplay_optimizations_p = 1; |
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2553 } |
24604
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
2554 |
29456
1aa0c1122f75
(Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents:
29380
diff
changeset
|
2555 /* 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
|
2556 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
|
2557 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
|
2558 |
49974
3420da3e4b0f
(Fset_buffer_multibyte): Pay attention to the buffer
Kenichi Handa <handa@m17n.org>
parents:
49664
diff
changeset
|
2559 #ifdef subprocesses |
49664
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2560 /* 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
|
2561 { |
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2562 Lisp_Object process; |
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2563 |
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2564 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
|
2565 if (PROCESSP (process)) |
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2566 setup_process_coding_systems (process); |
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2567 } |
49974
3420da3e4b0f
(Fset_buffer_multibyte): Pay attention to the buffer
Kenichi Handa <handa@m17n.org>
parents:
49664
diff
changeset
|
2568 #endif /* subprocesses */ |
49664
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2569 |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2570 return flag; |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2571 } |
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2572 |
333 | 2573 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
|
2574 0, 0, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2575 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
|
2576 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
|
2577 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
|
2578 `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
|
2579 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
|
2580 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
|
2581 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2582 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
|
2583 calling this function. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2584 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2585 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
|
2586 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
|
2587 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2588 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
|
2589 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
|
2590 () |
333 | 2591 { |
6205
88e41d7d1e27
(Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents:
6169
diff
changeset
|
2592 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
|
2593 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
|
2594 |
409f76c92cb2
(reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87215
diff
changeset
|
2595 /* 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
|
2596 remain swapped in, in their symbols. */ |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2597 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2598 swap_out_buffer_local_variables (current_buffer); |
333 | 2599 |
2600 /* Actually eliminate all local bindings of this buffer. */ | |
2601 | |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
2602 reset_buffer_local_variables (current_buffer, 0); |
333 | 2603 |
2604 /* Force mode-line redisplay. Useful here because all major mode | |
2605 commands call this function. */ | |
2606 update_mode_lines++; | |
2607 | |
2608 return Qnil; | |
2609 } | |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2610 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2611 /* 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
|
2612 for their current values. */ |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2613 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2614 static void |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2615 swap_out_buffer_local_variables (b) |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2616 struct buffer *b; |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2617 { |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2618 Lisp_Object oalist, alist, sym, tem, buffer; |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2619 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2620 XSETBUFFER (buffer, b); |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2621 oalist = b->local_var_alist; |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2622 |
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
|
2623 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
|
2624 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2625 sym = XCAR (XCAR (alist)); |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2626 |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2627 /* Need not do anything if some other buffer's binding is now encached. */ |
39581
6d9fa06012a6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
39337
diff
changeset
|
2628 tem = XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->buffer; |
86230
79043dac5524
(Fbuffer_local_value): Remove redundant test.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85328
diff
changeset
|
2629 if (EQ (tem, buffer)) |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2630 { |
86230
79043dac5524
(Fbuffer_local_value): Remove redundant test.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85328
diff
changeset
|
2631 /* 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
|
2632 swap it out! */ |
79043dac5524
(Fbuffer_local_value): Remove redundant test.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85328
diff
changeset
|
2633 swap_in_global_binding (sym); |
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2634 } |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2635 } |
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2636 } |
333 | 2637 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2638 /* 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
|
2639 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
|
2640 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
|
2641 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
|
2642 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
|
2643 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
|
2644 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
|
2645 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
|
2646 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
|
2647 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2648 *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
|
2649 when this function is called. |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2650 |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2651 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
|
2652 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
|
2653 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
|
2654 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
|
2655 |
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2656 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
|
2657 *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
|
2658 default (BEGV or ZV). */ |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2659 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2660 int |
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2661 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
|
2662 EMACS_INT pos; |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2663 int extend; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2664 Lisp_Object **vec_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2665 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
|
2666 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
|
2667 EMACS_INT *prev_ptr; |
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2668 int change_req; |
333 | 2669 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2670 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
|
2671 struct Lisp_Overlay *tail; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2672 int idx = 0; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2673 int len = *len_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2674 Lisp_Object *vec = *vec_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2675 int next = ZV; |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2676 int prev = BEGV; |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2677 int inhibit_storing = 0; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2678 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2679 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
|
2680 { |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2681 int startpos, endpos; |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2682 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2683 XSETMISC (overlay, tail); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2684 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2685 start = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2686 end = OVERLAY_END (overlay); |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2687 endpos = OVERLAY_POSITION (end); |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2688 if (endpos < pos) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2689 { |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2690 if (prev < endpos) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2691 prev = endpos; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2692 break; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2693 } |
25184
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2694 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
|
2695 /* 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
|
2696 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
|
2697 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
|
2698 prev = startpos; |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2699 if (endpos == pos) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2700 continue; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2701 if (startpos <= pos) |
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 if (idx == len) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2704 { |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2705 /* The supplied vector is full. |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2706 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
|
2707 if (extend) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2708 { |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2709 /* 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
|
2710 len *= 2; |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2711 if (len == 0) |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2712 len = 4; |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2713 *len_ptr = len; |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2714 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
|
2715 *vec_ptr = vec; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2716 } |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2717 else |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2718 inhibit_storing = 1; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2719 } |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2720 |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2721 if (!inhibit_storing) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2722 vec[idx] = overlay; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2723 /* 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
|
2724 idx++; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2725 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2726 else if (startpos < next) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2727 next = startpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2728 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2729 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2730 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
|
2731 { |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2732 int startpos, endpos; |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2733 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2734 XSETMISC (overlay, tail); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2735 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2736 start = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2737 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2738 startpos = OVERLAY_POSITION (start); |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2739 if (pos < startpos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2740 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2741 if (startpos < next) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2742 next = startpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2743 break; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2744 } |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2745 endpos = OVERLAY_POSITION (end); |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2746 if (pos < endpos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2747 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2748 if (idx == len) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2749 { |
2839
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 { |
46920
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2752 /* 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
|
2753 len *= 2; |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2754 if (len == 0) |
46920
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2755 len = 4; |
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
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 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
|
2767 |
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2768 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
|
2769 prev = startpos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2770 } |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2771 else if (endpos < pos && endpos > prev) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2772 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
|
2773 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
|
2774 && (!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
|
2775 prev = startpos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2776 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2777 |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2778 if (next_ptr) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2779 *next_ptr = next; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2780 if (prev_ptr) |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2781 *prev_ptr = prev; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2782 return idx; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2783 } |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2784 |
92975
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2785 /* 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
|
2786 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
|
2787 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
|
2788 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
2789 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
|
2790 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
|
2791 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
|
2792 or ZV if there are no more overlays. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2793 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
|
2794 or BEGV if there are no previous overlays. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2795 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
|
2796 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2797 *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
|
2798 when this function is called. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2799 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2800 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
|
2801 If EXTEND is zero, we never extend the vector, |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2802 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
|
2803 But we still return the total number of overlays. */ |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2804 |
50304
d9d826db650f
(overlays_in): Declare static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50014
diff
changeset
|
2805 static int |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2806 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
|
2807 int beg, end; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2808 int extend; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2809 Lisp_Object **vec_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2810 int *len_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2811 int *next_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2812 int *prev_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2813 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2814 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
|
2815 struct Lisp_Overlay *tail; |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2816 int idx = 0; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2817 int len = *len_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2818 Lisp_Object *vec = *vec_ptr; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2819 int next = ZV; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2820 int prev = BEGV; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2821 int inhibit_storing = 0; |
92975
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2822 int end_is_Z = end == Z; |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2823 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2824 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
|
2825 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2826 int startpos, endpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2827 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2828 XSETMISC (overlay, tail); |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2829 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2830 ostart = OVERLAY_START (overlay); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2831 oend = OVERLAY_END (overlay); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2832 endpos = OVERLAY_POSITION (oend); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2833 if (endpos < beg) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2834 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2835 if (prev < endpos) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2836 prev = endpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2837 break; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2838 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2839 startpos = OVERLAY_POSITION (ostart); |
92975
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2840 /* 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
|
2841 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
|
2842 end of the buffer. */ |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2843 if ((beg < endpos && startpos < end) |
92975
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2844 || (startpos == endpos |
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2845 && (beg == endpos || (end_is_Z && endpos == end)))) |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2846 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2847 if (idx == len) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2848 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2849 /* The supplied vector is full. |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2850 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
|
2851 if (extend) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2852 { |
46920
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2853 /* 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
|
2854 len *= 2; |
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2855 if (len == 0) |
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2856 len = 4; |
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2857 *len_ptr = len; |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2858 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2859 *vec_ptr = vec; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2860 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2861 else |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2862 inhibit_storing = 1; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2863 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2864 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2865 if (!inhibit_storing) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2866 vec[idx] = overlay; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2867 /* 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
|
2868 idx++; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2869 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2870 else if (startpos < next) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2871 next = startpos; |
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 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2874 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
|
2875 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2876 int startpos, endpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2877 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2878 XSETMISC (overlay, tail); |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2879 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2880 ostart = OVERLAY_START (overlay); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2881 oend = OVERLAY_END (overlay); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2882 startpos = OVERLAY_POSITION (ostart); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2883 if (end < startpos) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2884 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2885 if (startpos < next) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2886 next = startpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2887 break; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2888 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2889 endpos = OVERLAY_POSITION (oend); |
92975
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2890 /* 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
|
2891 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
|
2892 end of the buffer. */ |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2893 if ((beg < endpos && startpos < end) |
92975
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2894 || (startpos == endpos |
ca18807830f1
(overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents:
92767
diff
changeset
|
2895 && (beg == endpos || (end_is_Z && endpos == end)))) |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2896 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2897 if (idx == len) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2898 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2899 if (extend) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2900 { |
46920
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2901 /* 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
|
2902 len *= 2; |
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2903 if (len == 0) |
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2904 len = 4; |
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2905 *len_ptr = len; |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2906 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2907 *vec_ptr = vec; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2908 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2909 else |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2910 inhibit_storing = 1; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2911 } |
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 if (!inhibit_storing) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2914 vec[idx] = overlay; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2915 idx++; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2916 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2917 else if (endpos < beg && endpos > prev) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2918 prev = endpos; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2919 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2920 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2921 if (next_ptr) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2922 *next_ptr = next; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2923 if (prev_ptr) |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2924 *prev_ptr = prev; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2925 return idx; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2926 } |
36584
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2927 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2928 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2929 /* 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
|
2930 `mouse-face' property overlapping OVERLAY. */ |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2931 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2932 int |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2933 mouse_face_overlay_overlaps (overlay) |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2934 Lisp_Object overlay; |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2935 { |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2936 int start = OVERLAY_POSITION (OVERLAY_START (overlay)); |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2937 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
|
2938 int n, i, size; |
36584
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2939 Lisp_Object *v, tem; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
2940 |
37463
7db9a70334b7
(mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents:
37011
diff
changeset
|
2941 size = 10; |
7db9a70334b7
(mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents:
37011
diff
changeset
|
2942 v = (Lisp_Object *) alloca (size * sizeof *v); |
7db9a70334b7
(mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents:
37011
diff
changeset
|
2943 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
|
2944 if (n > size) |
36584
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2945 { |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2946 v = (Lisp_Object *) alloca (n * sizeof *v); |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2947 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
|
2948 } |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2949 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2950 for (i = 0; i < n; ++i) |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2951 if (!EQ (v[i], overlay) |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2952 && (tem = Foverlay_get (overlay, Qmouse_face), |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2953 !NILP (tem))) |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2954 break; |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2955 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2956 return i < n; |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2957 } |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2958 |
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2959 |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2960 |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2961 /* 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
|
2962 int |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2963 overlay_touches_p (pos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2964 int pos; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2965 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2966 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
|
2967 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
|
2968 |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2969 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
|
2970 { |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2971 int endpos; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2972 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2973 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
|
2974 if (!OVERLAYP (overlay)) |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2975 abort (); |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2976 |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2977 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2978 if (endpos < pos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2979 break; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2980 if (endpos == pos || OVERLAY_POSITION (OVERLAY_START (overlay)) == pos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2981 return 1; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2982 } |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2983 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2984 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
|
2985 { |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2986 int startpos; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2987 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2988 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
|
2989 if (!OVERLAYP (overlay)) |
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2990 abort (); |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2991 |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2992 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2993 if (pos < startpos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2994 break; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2995 if (startpos == pos || OVERLAY_POSITION (OVERLAY_END (overlay)) == pos) |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2996 return 1; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2997 } |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2998 return 0; |
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2999 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3000 |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3001 struct sortvec |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3002 { |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3003 Lisp_Object overlay; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3004 int beg, end; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3005 int priority; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3006 }; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3007 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3008 static int |
21514 | 3009 compare_overlays (v1, v2) |
3010 const void *v1, *v2; | |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3011 { |
21514 | 3012 const struct sortvec *s1 = (const struct sortvec *) v1; |
3013 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
|
3014 if (s1->priority != s2->priority) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3015 return s1->priority - s2->priority; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3016 if (s1->beg != s2->beg) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3017 return s1->beg - s2->beg; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3018 if (s1->end != s2->end) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3019 return s2->end - s1->end; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3020 return 0; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3021 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3022 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3023 /* 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
|
3024 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
|
3025 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
|
3026 int |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3027 sort_overlays (overlay_vec, noverlays, w) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3028 Lisp_Object *overlay_vec; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3029 int noverlays; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3030 struct window *w; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3031 { |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3032 int i, j; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3033 struct sortvec *sortvec; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3034 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
|
3035 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3036 /* 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
|
3037 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3038 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
|
3039 { |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3040 Lisp_Object tem; |
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3041 Lisp_Object overlay; |
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3042 |
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3043 overlay = overlay_vec[i]; |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3044 if (OVERLAY_VALID (overlay) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3045 && OVERLAY_POSITION (OVERLAY_START (overlay)) > 0 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3046 && OVERLAY_POSITION (OVERLAY_END (overlay)) > 0) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3047 { |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3048 /* 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
|
3049 overlays that are limited to some other window. */ |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3050 if (w) |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3051 { |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3052 Lisp_Object window; |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3053 |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3054 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
|
3055 if (WINDOWP (window) && XWINDOW (window) != w) |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3056 continue; |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3057 } |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3058 |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3059 /* 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
|
3060 sortvec[j].overlay = overlay; |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3061 sortvec[j].beg = OVERLAY_POSITION (OVERLAY_START (overlay)); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3062 sortvec[j].end = OVERLAY_POSITION (OVERLAY_END (overlay)); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3063 tem = Foverlay_get (overlay, Qpriority); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3064 if (INTEGERP (tem)) |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3065 sortvec[j].priority = XINT (tem); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3066 else |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3067 sortvec[j].priority = 0; |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
3068 j++; |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3069 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3070 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3071 noverlays = j; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3072 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3073 /* 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
|
3074 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3075 if (noverlays > 1) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3076 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
|
3077 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3078 for (i = 0; i < noverlays; i++) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3079 overlay_vec[i] = sortvec[i].overlay; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3080 return (noverlays); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3081 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
3082 |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3083 struct sortstr |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3084 { |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3085 Lisp_Object string, string2; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3086 int size; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3087 int priority; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3088 }; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3089 |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3090 struct sortstrlist |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3091 { |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3092 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
|
3093 int size; /* Allocated length of that array. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3094 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
|
3095 int bytes; /* Total length of the strings in buf. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3096 }; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3097 |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3098 /* Buffers for storing information about the overlays touching a given |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3099 position. These could be automatic variables in overlay_strings, but |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3100 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
|
3101 allocating and freeing it. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3102 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
|
3103 static unsigned char *overlay_str_buf; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3104 |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3105 /* Allocated length of overlay_str_buf. */ |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3106 static int overlay_str_len; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3107 |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3108 /* A comparison function suitable for passing to qsort. */ |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3109 static int |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3110 cmp_for_strings (as1, as2) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3111 char *as1, *as2; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3112 { |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3113 struct sortstr *s1 = (struct sortstr *)as1; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3114 struct sortstr *s2 = (struct sortstr *)as2; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3115 if (s1->size != s2->size) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3116 return s2->size - s1->size; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3117 if (s1->priority != s2->priority) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3118 return s1->priority - s2->priority; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3119 return 0; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3120 } |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3121 |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3122 static void |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3123 record_overlay_string (ssl, str, str2, pri, size) |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3124 struct sortstrlist *ssl; |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3125 Lisp_Object str, str2, pri; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3126 int size; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3127 { |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3128 int nbytes; |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3129 |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3130 if (ssl->used == ssl->size) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3131 { |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3132 if (ssl->buf) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3133 ssl->size *= 2; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3134 else |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3135 ssl->size = 5; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3136 ssl->buf = ((struct sortstr *) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3137 xrealloc (ssl->buf, ssl->size * sizeof (struct sortstr))); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3138 } |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3139 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
|
3140 ssl->buf[ssl->used].string2 = str2; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3141 ssl->buf[ssl->used].size = size; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3142 ssl->buf[ssl->used].priority = (INTEGERP (pri) ? XINT (pri) : 0); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3143 ssl->used++; |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3144 |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3145 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
|
3146 nbytes = SCHARS (str); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3147 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
|
3148 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
|
3149 SBYTES (str)); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3150 else |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3151 nbytes = SBYTES (str); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3152 |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3153 ssl->bytes += nbytes; |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3154 |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3155 if (STRINGP (str2)) |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3156 { |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3157 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
|
3158 nbytes = SCHARS (str2); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3159 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
|
3160 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
|
3161 SBYTES (str2)); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3162 else |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3163 nbytes = SBYTES (str2); |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3164 |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3165 ssl->bytes += nbytes; |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3166 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3167 } |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3168 |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3169 /* 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
|
3170 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
|
3171 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
|
3172 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
|
3173 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
|
3174 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
|
3175 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
|
3176 |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3177 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
|
3178 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
|
3179 subsequent calls. */ |
16243
b311d8755530
(overlay_strings): Declare pstr using unsigned char.
Richard M. Stallman <rms@gnu.org>
parents:
16213
diff
changeset
|
3180 |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3181 int |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3182 overlay_strings (pos, w, pstr) |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3183 EMACS_INT pos; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3184 struct window *w; |
16243
b311d8755530
(overlay_strings): Declare pstr using unsigned char.
Richard M. Stallman <rms@gnu.org>
parents:
16213
diff
changeset
|
3185 unsigned char **pstr; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3186 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3187 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
|
3188 struct Lisp_Overlay *ov; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3189 int startpos, endpos; |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3190 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
|
3191 |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3192 overlay_heads.used = overlay_heads.bytes = 0; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3193 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
|
3194 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
|
3195 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3196 XSETMISC (overlay, ov); |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3197 eassert (OVERLAYP (overlay)); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3198 |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3199 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3200 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3201 if (endpos < pos) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3202 break; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3203 if (endpos != pos && startpos != pos) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3204 continue; |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3205 window = Foverlay_get (overlay, Qwindow); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3206 if (WINDOWP (window) && XWINDOW (window) != w) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3207 continue; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3208 if (startpos == pos |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3209 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3210 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
|
3211 (startpos == endpos |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3212 ? 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
|
3213 : Qnil), |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3214 Foverlay_get (overlay, Qpriority), |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3215 endpos - startpos); |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3216 else if (endpos == pos |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3217 && (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
|
3218 record_overlay_string (&overlay_tails, str, Qnil, |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3219 Foverlay_get (overlay, Qpriority), |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3220 endpos - startpos); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3221 } |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3222 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
|
3223 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3224 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
|
3225 eassert (OVERLAYP (overlay)); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3226 |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3227 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3228 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3229 if (startpos > pos) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3230 break; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3231 if (endpos != pos && startpos != pos) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3232 continue; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3233 window = Foverlay_get (overlay, Qwindow); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3234 if (WINDOWP (window) && XWINDOW (window) != w) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3235 continue; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3236 if (startpos == pos |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3237 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3238 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
|
3239 (startpos == endpos |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3240 ? 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
|
3241 : Qnil), |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3242 Foverlay_get (overlay, Qpriority), |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3243 endpos - startpos); |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3244 else if (endpos == pos |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3245 && (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
|
3246 record_overlay_string (&overlay_tails, str, Qnil, |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3247 Foverlay_get (overlay, Qpriority), |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3248 endpos - startpos); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3249 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3250 if (overlay_tails.used > 1) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3251 qsort (overlay_tails.buf, overlay_tails.used, sizeof (struct sortstr), |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3252 cmp_for_strings); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3253 if (overlay_heads.used > 1) |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3254 qsort (overlay_heads.buf, overlay_heads.used, sizeof (struct sortstr), |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3255 cmp_for_strings); |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3256 if (overlay_heads.bytes || overlay_tails.bytes) |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3257 { |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3258 Lisp_Object tem; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3259 int i; |
18603
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
3260 unsigned char *p; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3261 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
|
3262 |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3263 if (total > overlay_str_len) |
18603
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
3264 { |
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
3265 overlay_str_len = total; |
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
3266 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
|
3267 total); |
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
3268 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3269 p = overlay_str_buf; |
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3270 for (i = overlay_tails.used; --i >= 0;) |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3271 { |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3272 int nbytes; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3273 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
|
3274 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
|
3275 SBYTES (tem), |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3276 STRING_MULTIBYTE (tem), multibyte); |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3277 p += nbytes; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3278 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3279 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
|
3280 { |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3281 int nbytes; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3282 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
|
3283 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
|
3284 SBYTES (tem), |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3285 STRING_MULTIBYTE (tem), multibyte); |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3286 p += nbytes; |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3287 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
|
3288 if (STRINGP (tem)) |
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3289 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3290 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
|
3291 SBYTES (tem), |
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3292 STRING_MULTIBYTE (tem), multibyte); |
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3293 p += nbytes; |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3294 } |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3295 } |
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3296 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
|
3297 abort (); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3298 if (pstr) |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3299 *pstr = overlay_str_buf; |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3300 return total; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3301 } |
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3302 return 0; |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3303 } |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3304 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3305 /* Shift overlays in BUF's overlay lists, to center the lists at POS. */ |
333 | 3306 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3307 void |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3308 recenter_overlay_lists (buf, pos) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3309 struct buffer *buf; |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3310 EMACS_INT pos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3311 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3312 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
|
3313 struct Lisp_Overlay *prev, *tail, *next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3314 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3315 /* 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
|
3316 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3317 /* 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
|
3318 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
|
3319 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
|
3320 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
|
3321 for (tail = buf->overlays_before; tail; prev = tail, tail = next) |
333 | 3322 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3323 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
|
3324 XSETMISC (overlay, tail); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3325 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3326 /* 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
|
3327 if (!OVERLAY_VALID (overlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3328 #if 1 |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3329 abort (); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3330 #else |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3331 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3332 /* 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
|
3333 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
|
3334 XCDR (prev) = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3335 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3336 buf->overlays_before = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3337 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3338 continue; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3339 } |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3340 #endif |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3341 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3342 beg = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3343 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3344 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3345 if (OVERLAY_POSITION (end) > pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3346 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3347 /* OVERLAY needs to be moved. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3348 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
|
3349 struct Lisp_Overlay *other, *other_prev; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3350 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3351 /* 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
|
3352 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
|
3353 prev->next = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3354 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3355 buf->overlays_before = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3356 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3357 /* 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
|
3358 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
|
3359 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
|
3360 other_prev = other, other = other->next) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3361 { |
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
3362 Lisp_Object otherbeg, otheroverlay; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3363 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3364 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
|
3365 eassert (OVERLAY_VALID (otheroverlay)); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3366 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3367 otherbeg = OVERLAY_START (otheroverlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3368 if (OVERLAY_POSITION (otherbeg) >= where) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3369 break; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3370 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3371 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3372 /* 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
|
3373 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
|
3374 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
|
3375 other_prev->next = tail; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3376 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3377 buf->overlays_after = tail; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3378 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3379 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3380 else |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3381 /* 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
|
3382 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
|
3383 so stop now. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3384 break; |
333 | 3385 } |
3386 | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3387 /* 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
|
3388 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
|
3389 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
|
3390 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3391 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
|
3392 XSETMISC (overlay, tail); |
333 | 3393 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3394 /* 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
|
3395 if (!OVERLAY_VALID (overlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3396 #if 1 |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3397 abort (); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3398 #else |
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 /* 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
|
3401 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
|
3402 XCDR (prev) = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3403 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3404 buf->overlays_after = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3405 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3406 continue; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3407 } |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3408 #endif |
333 | 3409 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3410 beg = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3411 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3412 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3413 /* Stop looking, when we know that nothing further |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3414 can possibly end before POS. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3415 if (OVERLAY_POSITION (beg) > pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3416 break; |
333 | 3417 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3418 if (OVERLAY_POSITION (end) <= pos) |
333 | 3419 { |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3420 /* OVERLAY needs to be moved. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3421 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
|
3422 struct Lisp_Overlay *other, *other_prev; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3423 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3424 /* 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
|
3425 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
|
3426 prev->next = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3427 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3428 buf->overlays_after = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3429 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3430 /* 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
|
3431 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
|
3432 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
|
3433 other_prev = other, other = other->next) |
333 | 3434 { |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3435 Lisp_Object otherend, otheroverlay; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3436 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3437 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
|
3438 eassert (OVERLAY_VALID (otheroverlay)); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3439 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3440 otherend = OVERLAY_END (otheroverlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3441 if (OVERLAY_POSITION (otherend) <= where) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3442 break; |
333 | 3443 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3444 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3445 /* 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
|
3446 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
|
3447 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
|
3448 other_prev->next = tail; |
333 | 3449 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3450 buf->overlays_before = tail; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3451 tail = prev; |
333 | 3452 } |
3453 } | |
3454 | |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3455 buf->overlay_center = pos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3456 } |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3457 |
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3458 void |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3459 adjust_overlays_for_insert (pos, length) |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3460 EMACS_INT pos; |
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3461 EMACS_INT length; |
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3462 { |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3463 /* 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
|
3464 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
|
3465 if (current_buffer->overlay_center >= pos) |
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3466 current_buffer->overlay_center += length; |
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3467 } |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3468 |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3469 void |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3470 adjust_overlays_for_delete (pos, length) |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3471 EMACS_INT pos; |
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3472 EMACS_INT length; |
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3473 { |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3474 if (current_buffer->overlay_center < pos) |
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3475 /* 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
|
3476 after-lists are still consistent. */ |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3477 ; |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3478 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
|
3479 /* 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
|
3480 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
|
3481 given the new value. */ |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3482 current_buffer->overlay_center -= length; |
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3483 else |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3484 /* 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
|
3485 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
|
3486 and also update the center point. */ |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3487 recenter_overlay_lists (current_buffer, pos); |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3488 } |
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3489 |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3490 /* 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
|
3491 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
|
3492 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
|
3493 list and reinserted in its proper place. |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3494 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
|
3495 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
|
3496 void |
54555
b136a4512609
* insdel.c (adjust_markers_for_insert): Call fix_start_end_in_overlays.
Masatake YAMATO <jet@gyve.org>
parents:
54266
diff
changeset
|
3497 fix_start_end_in_overlays (start, end) |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3498 register int start, end; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3499 { |
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
3500 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
|
3501 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
|
3502 /* 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
|
3503 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
|
3504 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
|
3505 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
|
3506 /* '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
|
3507 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
|
3508 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
|
3509 struct Lisp_Overlay *tail, *parent; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3510 int startpos, endpos; |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3511 |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3512 /* 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
|
3513 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
|
3514 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
|
3515 (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
|
3516 (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
|
3517 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
|
3518 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
|
3519 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
|
3520 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3521 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
|
3522 |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3523 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
|
3524 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
|
3525 |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3526 /* 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
|
3527 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
|
3528 { |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3529 startpos = endpos; |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3530 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
|
3531 Qnil); |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3532 } |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3533 |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3534 if (endpos < start) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3535 break; |
55242
d57364949309
(syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents:
55140
diff
changeset
|
3536 |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3537 if (endpos < end |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3538 || (startpos >= start && startpos < end)) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3539 { |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3540 /* 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
|
3541 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
|
3542 if (endpos < current_buffer->overlay_center) |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3543 { |
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 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
|
3545 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
|
3546 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
|
3547 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
|
3548 afterp = tail; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3549 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3550 else |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3551 { |
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 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
|
3553 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
|
3554 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
|
3555 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
|
3556 beforep = tail; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3557 } |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3558 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
|
3559 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
|
3560 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
|
3561 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
|
3562 tail = tail->next; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3563 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3564 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
|
3565 parent = tail, tail = parent->next; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3566 } |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3567 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
|
3568 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3569 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
|
3570 |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3571 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
|
3572 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
|
3573 |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3574 /* 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
|
3575 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
|
3576 { |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3577 startpos = endpos; |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3578 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
|
3579 Qnil); |
54772
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3580 } |
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3581 |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3582 if (startpos >= end) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3583 break; |
54772
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3584 |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3585 if (startpos >= start |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3586 || (endpos >= start && endpos < end)) |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3587 { |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3588 if (endpos < current_buffer->overlay_center) |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3589 { |
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 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
|
3591 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
|
3592 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
|
3593 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
|
3594 afterp = tail; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3595 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3596 else |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3597 { |
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 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
|
3599 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
|
3600 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
|
3601 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
|
3602 beforep = tail; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3603 } |
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 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
|
3605 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
|
3606 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
|
3607 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
|
3608 tail = tail->next; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3609 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3610 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
|
3611 parent = tail, tail = parent->next; |
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3612 } |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3613 |
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3614 /* 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
|
3615 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
|
3616 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
|
3617 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3618 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
|
3619 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
|
3620 } |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3621 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
|
3622 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3623 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
|
3624 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3625 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
|
3626 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
|
3627 } |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3628 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
|
3629 } |
17022 | 3630 |
3631 /* We have two types of overlay: the one whose ending marker is | |
3632 after-insertion-marker (this is the usual case) and the one whose | |
3633 ending marker is before-insertion-marker. When `overlays_before' | |
3634 contains overlays of the latter type and the former type in this | |
3635 order and both overlays end at inserting position, inserting a text | |
3636 increases only the ending marker of the latter type, which results | |
3637 in incorrect ordering of `overlays_before'. | |
3638 | |
3639 This function fixes ordering of overlays in the slot | |
3640 `overlays_before' of the buffer *BP. Before the insertion, `point' | |
3641 was at PREV, and now is at POS. */ | |
3642 | |
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
3643 void |
17022 | 3644 fix_overlays_before (bp, prev, pos) |
3645 struct buffer *bp; | |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3646 EMACS_INT prev, pos; |
17022 | 3647 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3648 /* 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
|
3649 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
|
3650 Lisp_Object tem; |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3651 EMACS_INT end; |
17022 | 3652 |
3653 /* After the insertion, the several overlays may be in incorrect | |
3654 order. The possibility is that, in the list `overlays_before', | |
3655 an overlay which ends at POS appears after an overlay which ends | |
3656 at PREV. Since POS is greater than PREV, we must fix the | |
3657 ordering of these overlays, by moving overlays ends at POS before | |
3658 the overlays ends at PREV. */ | |
3659 | |
3660 /* At first, find a place where disordered overlays should be linked | |
3661 in. It is where an overlay which end before POS exists. (i.e. an | |
3662 overlay whose ending marker is after-insertion-marker if disorder | |
3663 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
|
3664 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
|
3665 && (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
|
3666 (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
|
3667 { |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3668 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
|
3669 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
|
3670 } |
17022 | 3671 |
3672 /* If we don't find such an overlay, | |
3673 or the found one ends before PREV, | |
3674 or the found one is the last one in the list, | |
3675 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
|
3676 if (!tail || end < prev || !tail->next) |
17022 | 3677 return; |
3678 | |
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
|
3679 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
|
3680 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
|
3681 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
|
3682 |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3683 /* Now, end position of overlays in the list TAIL should be before |
17022 | 3684 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
|
3685 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
|
3686 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
|
3687 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
|
3688 while (tail) |
17022 | 3689 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3690 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
|
3691 end = OVERLAY_POSITION (OVERLAY_END (tem)); |
17022 | 3692 |
3693 if (end == pos) | |
3694 { /* 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
|
3695 struct Lisp_Overlay *found = tail; |
17022 | 3696 |
3697 /* 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
|
3698 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
|
3699 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
|
3700 /* 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
|
3701 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
|
3702 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
|
3703 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3704 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
|
3705 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
|
3706 } |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3707 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
|
3708 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3709 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
|
3710 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
|
3711 } |
17022 | 3712 } |
3713 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
|
3714 { |
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3715 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
|
3716 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
|
3717 } |
17022 | 3718 else /* No more disordered overlay. */ |
3719 break; | |
3720 } | |
3721 } | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3722 |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3723 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
|
3724 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
|
3725 (object) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3726 Lisp_Object object; |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3727 { |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3728 return (OVERLAYP (object) ? Qt : Qnil); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3729 } |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3730 |
13446
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3731 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
|
3732 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
|
3733 If omitted, BUFFER defaults to the current buffer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3734 BEG and END may be integers or markers. |
64412
a1807609d4c2
(Fmake_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
3735 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
|
3736 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
|
3737 \(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
|
3738 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
|
3739 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
|
3740 \(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
|
3741 (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
|
3742 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
|
3743 Lisp_Object front_advance, rear_advance; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3744 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3745 Lisp_Object overlay; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3746 struct buffer *b; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3747 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3748 if (NILP (buffer)) |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
3749 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
|
3750 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3751 CHECK_BUFFER (buffer); |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3752 if (MARKERP (beg) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3753 && ! 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
|
3754 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
|
3755 if (MARKERP (end) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3756 && ! 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
|
3757 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
|
3758 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3759 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
|
3760 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
|
3761 |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3762 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
|
3763 { |
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3764 Lisp_Object temp; |
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3765 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
|
3766 } |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3767 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3768 b = XBUFFER (buffer); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3769 |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3770 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
|
3771 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
|
3772 |
13446
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3773 if (!NILP (front_advance)) |
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3774 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
|
3775 if (!NILP (rear_advance)) |
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3776 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
|
3777 |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3778 overlay = allocate_misc (); |
11244
f3b11dc9014e
(Fmake_overlay): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11214
diff
changeset
|
3779 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
|
3780 XOVERLAY (overlay)->start = beg; |
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3781 XOVERLAY (overlay)->end = end; |
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3782 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
|
3783 XOVERLAY (overlay)->next = NULL; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3784 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
3785 /* 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
|
3786 end = OVERLAY_END (overlay); |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3787 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
|
3788 { |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3789 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
|
3790 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
|
3791 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
|
3792 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3793 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
|
3794 { |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3795 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
|
3796 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
|
3797 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
|
3798 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3799 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3800 /* 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
|
3801 recenter_overlay_lists (b, b->overlay_center); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3802 |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3803 /* 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
|
3804 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
|
3805 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3806 return overlay; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3807 } |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3808 |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3809 /* 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
|
3810 |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3811 static void |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3812 modify_overlay (buf, start, end) |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3813 struct buffer *buf; |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3814 EMACS_INT start, end; |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3815 { |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3816 if (start > end) |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3817 { |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3818 int temp = start; |
39333
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3819 start = end; |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3820 end = temp; |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3821 } |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3822 |
27012
520f982f3a9a
(modify_overlay): Always compute unchanged info.
Gerd Moellmann <gerd@gnu.org>
parents:
26970
diff
changeset
|
3823 BUF_COMPUTE_UNCHANGED (buf, start, end); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
3824 |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3825 /* 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
|
3826 we must do other windows. */ |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3827 if (buf != XBUFFER (XWINDOW (selected_window)->buffer)) |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3828 windows_or_buffers_changed = 1; |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3829 /* 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
|
3830 else if (buffer_shared > 1) |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3831 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
|
3832 /* 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
|
3833 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
|
3834 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
|
3835 windows_or_buffers_changed = 1; |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3836 |
19801
7482ad23e430
(modify_overlay): Update overlay_modiff of proper buffer.
Richard M. Stallman <rms@gnu.org>
parents:
19581
diff
changeset
|
3837 ++BUF_OVERLAY_MODIFF (buf); |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3838 } |
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3839 |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3840 |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3841 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
|
3842 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3843 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
|
3844 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
|
3845 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
|
3846 { |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3847 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
|
3848 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
|
3849 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
|
3850 { |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3851 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
|
3852 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
|
3853 else |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3854 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
|
3855 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
|
3856 break; |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3857 } |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3858 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
|
3859 } |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3860 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3861 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
|
3862 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
|
3863 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
|
3864 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
|
3865 buffer. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3866 (overlay, beg, end, buffer) |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3867 Lisp_Object overlay, beg, end, buffer; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3868 { |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3869 struct buffer *b, *ob; |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3870 Lisp_Object obuffer; |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46199
diff
changeset
|
3871 int count = SPECPDL_INDEX (); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3872 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3873 CHECK_OVERLAY (overlay); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3874 if (NILP (buffer)) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3875 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
|
3876 if (NILP (buffer)) |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
3877 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
|
3878 CHECK_BUFFER (buffer); |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3879 |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3880 if (MARKERP (beg) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3881 && ! 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
|
3882 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
|
3883 if (MARKERP (end) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3884 && ! 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
|
3885 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
|
3886 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3887 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
|
3888 CHECK_NUMBER_COERCE_MARKER (end); |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3889 |
8839 | 3890 if (XINT (beg) == XINT (end) && ! NILP (Foverlay_get (overlay, Qevaporate))) |
3891 return Fdelete_overlay (overlay); | |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3892 |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3893 if (XINT (beg) > XINT (end)) |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3894 { |
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3895 Lisp_Object temp; |
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3896 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
|
3897 } |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3898 |
8839 | 3899 specbind (Qinhibit_quit, Qt); |
3900 | |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3901 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
|
3902 b = XBUFFER (buffer); |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
3903 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
|
3904 |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3905 /* 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
|
3906 if (!EQ (buffer, obuffer)) |
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3907 { |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3908 /* Redisplay where the overlay was. */ |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3909 if (!NILP (obuffer)) |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3910 { |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3911 int o_beg; |
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3912 int o_end; |
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3913 |
18105
bc690c1e1950
(Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents:
18009
diff
changeset
|
3914 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
|
3915 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
|
3916 |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3917 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
|
3918 } |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3919 |
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3920 /* 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
|
3921 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
|
3922 } |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3923 else |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3924 /* 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
|
3925 { |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3926 int o_beg, o_end; |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3927 |
18105
bc690c1e1950
(Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents:
18009
diff
changeset
|
3928 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
|
3929 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
|
3930 |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3931 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
|
3932 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
|
3933 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
|
3934 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
|
3935 else |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3936 { |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3937 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
|
3938 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
|
3939 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
|
3940 } |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3941 } |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3942 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3943 if (!NILP (obuffer)) |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3944 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3945 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
|
3946 = 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
|
3947 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
|
3948 = 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
|
3949 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
|
3950 } |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3951 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3952 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
|
3953 Fset_marker (OVERLAY_END (overlay), end, buffer); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3954 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
3955 /* Put the overlay on the wrong list. */ |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3956 end = OVERLAY_END (overlay); |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3957 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
|
3958 { |
52253
79185e10e92f
(Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents:
52012
diff
changeset
|
3959 XOVERLAY (overlay)->next = b->overlays_after; |
79185e10e92f
(Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents:
52012
diff
changeset
|
3960 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
|
3961 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3962 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
|
3963 { |
52253
79185e10e92f
(Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents:
52012
diff
changeset
|
3964 XOVERLAY (overlay)->next = b->overlays_before; |
79185e10e92f
(Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents:
52012
diff
changeset
|
3965 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
|
3966 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3967 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3968 /* 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
|
3969 recenter_overlay_lists (b, b->overlay_center); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3970 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3971 return unbind_to (count, overlay); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3972 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3973 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3974 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
|
3975 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
|
3976 (overlay) |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3977 Lisp_Object overlay; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3978 { |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3979 Lisp_Object buffer; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3980 struct buffer *b; |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46199
diff
changeset
|
3981 int count = SPECPDL_INDEX (); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3982 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3983 CHECK_OVERLAY (overlay); |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3984 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3985 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
|
3986 if (NILP (buffer)) |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3987 return Qnil; |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3988 |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3989 b = XBUFFER (buffer); |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3990 specbind (Qinhibit_quit, Qt); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
3991 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3992 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
|
3993 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
|
3994 eassert (XOVERLAY (overlay)->next == NULL); |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3995 modify_overlay (b, |
21898 | 3996 marker_position (OVERLAY_START (overlay)), |
3997 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
|
3998 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
|
3999 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
|
4000 |
39337 | 4001 /* 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
|
4002 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
|
4003 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
|
4004 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
|
4005 if (!windows_or_buffers_changed |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
4006 && (!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
|
4007 || !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
|
4008 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
|
4009 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
4010 return unbind_to (count, Qnil); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4011 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4012 |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4013 /* Overlay dissection functions. */ |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4014 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4015 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
|
4016 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
|
4017 (overlay) |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4018 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4019 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4020 CHECK_OVERLAY (overlay); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4021 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4022 return (Fmarker_position (OVERLAY_START (overlay))); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4023 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4024 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4025 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
|
4026 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
|
4027 (overlay) |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4028 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4029 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4030 CHECK_OVERLAY (overlay); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4031 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4032 return (Fmarker_position (OVERLAY_END (overlay))); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4033 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4034 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4035 DEFUN ("overlay-buffer", Foverlay_buffer, Soverlay_buffer, 1, 1, 0, |
60217 | 4036 doc: /* Return the buffer OVERLAY belongs to. |
4037 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
|
4038 (overlay) |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4039 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4040 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4041 CHECK_OVERLAY (overlay); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4042 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4043 return Fmarker_buffer (OVERLAY_START (overlay)); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4044 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4045 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4046 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
|
4047 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
|
4048 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
|
4049 OVERLAY. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4050 (overlay) |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4051 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4052 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4053 CHECK_OVERLAY (overlay); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
4054 |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
4055 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
|
4056 } |
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 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4059 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
|
4060 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
|
4061 (pos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4062 Lisp_Object pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4063 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4064 int noverlays; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4065 Lisp_Object *overlay_vec; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4066 int len; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4067 Lisp_Object result; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4068 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4069 CHECK_NUMBER_COERCE_MARKER (pos); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4070 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4071 len = 10; |
30911
c1de0fc3a34b
(Fget_buffer_create, Fmake_indirect_buffer): Avoid
Dave Love <fx@gnu.org>
parents:
30695
diff
changeset
|
4072 /* 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
|
4073 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
|
4074 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4075 /* 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
|
4076 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
|
4077 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
|
4078 (EMACS_INT *) 0, (EMACS_INT *) 0, 0); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4079 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4080 /* Make a list of them all. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4081 result = Flist (noverlays, overlay_vec); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4082 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
4083 xfree (overlay_vec); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4084 return result; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4085 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4086 |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4087 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
|
4088 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
|
4089 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
|
4090 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
|
4091 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
|
4092 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
|
4093 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
|
4094 (beg, end) |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4095 Lisp_Object beg, end; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4096 { |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4097 int noverlays; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4098 Lisp_Object *overlay_vec; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4099 int len; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4100 Lisp_Object result; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4101 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4102 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
|
4103 CHECK_NUMBER_COERCE_MARKER (end); |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4104 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4105 len = 10; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4106 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object)); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4107 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4108 /* 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
|
4109 Store the length in len. */ |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4110 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
|
4111 (int *) 0, (int *) 0); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4112 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4113 /* Make a list of them all. */ |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4114 result = Flist (noverlays, overlay_vec); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4115 |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4116 xfree (overlay_vec); |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4117 return result; |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4118 } |
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4119 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4120 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
|
4121 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4122 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
|
4123 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
|
4124 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
|
4125 (pos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4126 Lisp_Object pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4127 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4128 int noverlays; |
92237
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92215
diff
changeset
|
4129 EMACS_INT endpos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4130 Lisp_Object *overlay_vec; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4131 int len; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4132 int i; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4133 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4134 CHECK_NUMBER_COERCE_MARKER (pos); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4135 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4136 len = 10; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4137 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
|
4138 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4139 /* 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
|
4140 Store the length in len. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4141 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
|
4142 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
|
4143 &endpos, (EMACS_INT *) 0, 1); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4144 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4145 /* If any of these overlays ends before endpos, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4146 use its ending point instead. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4147 for (i = 0; i < noverlays; i++) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4148 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4149 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
|
4150 EMACS_INT oendpos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4151 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4152 oend = OVERLAY_END (overlay_vec[i]); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4153 oendpos = OVERLAY_POSITION (oend); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4154 if (oendpos < endpos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4155 endpos = oendpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4156 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4157 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
4158 xfree (overlay_vec); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4159 return make_number (endpos); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4160 } |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4161 |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4162 DEFUN ("previous-overlay-change", Fprevious_overlay_change, |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4163 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
|
4164 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
|
4165 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
|
4166 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
|
4167 (pos) |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4168 Lisp_Object pos; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4169 { |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4170 int noverlays; |
92237
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92215
diff
changeset
|
4171 EMACS_INT prevpos; |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4172 Lisp_Object *overlay_vec; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4173 int len; |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4174 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4175 CHECK_NUMBER_COERCE_MARKER (pos); |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4176 |
12214
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
4177 /* 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
|
4178 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
|
4179 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
|
4180 return pos; |
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
4181 |
30360
92f92a541686
(Fprevious_overlay_change): Avoid memory leak.
Gerd Moellmann <gerd@gnu.org>
parents:
29456
diff
changeset
|
4182 len = 10; |
92f92a541686
(Fprevious_overlay_change): Avoid memory leak.
Gerd Moellmann <gerd@gnu.org>
parents:
29456
diff
changeset
|
4183 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
|
4184 |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4185 /* 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
|
4186 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
|
4187 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
|
4188 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
|
4189 (EMACS_INT *) 0, &prevpos, 1); |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4190 |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4191 xfree (overlay_vec); |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4192 return make_number (prevpos); |
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4193 } |
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 /* These functions are for debugging overlays. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4196 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4197 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
|
4198 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
|
4199 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
|
4200 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
|
4201 Recentering overlays moves overlays between these lists. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
4202 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
|
4203 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
|
4204 () |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4205 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4206 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
|
4207 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
|
4208 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
|
4209 { |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4210 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
|
4211 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
|
4212 } |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4213 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
|
4214 { |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4215 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
|
4216 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
|
4217 } |
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4218 return Fcons (Fnreverse (before), Fnreverse (after)); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4219 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4220 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4221 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
|
4222 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
|
4223 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
|
4224 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
|
4225 (pos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4226 Lisp_Object pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4227 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4228 CHECK_NUMBER_COERCE_MARKER (pos); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4229 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
4230 recenter_overlay_lists (current_buffer, XINT (pos)); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4231 return Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4232 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4233 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4234 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
|
4235 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
|
4236 (overlay, prop) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4237 Lisp_Object overlay, prop; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4238 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4239 CHECK_OVERLAY (overlay); |
45683
9e40bb8e9a60
(Foverlay_get): Use lookup_char_property.
Colin Walters <walters@gnu.org>
parents:
45626
diff
changeset
|
4240 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
|
4241 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4242 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4243 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
|
4244 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
|
4245 (overlay, prop, value) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4246 Lisp_Object overlay, prop, value; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4247 { |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
4248 Lisp_Object tail, buffer; |
8839 | 4249 int changed; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4250 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4251 CHECK_OVERLAY (overlay); |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
4252 |
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
4253 buffer = Fmarker_buffer (OVERLAY_START (overlay)); |
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
4254 |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
4255 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
|
4256 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
|
4257 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
|
4258 if (EQ (XCAR (tail), prop)) |
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
4259 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4260 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
|
4261 XSETCAR (XCDR (tail), value); |
8839 | 4262 goto found; |
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
4263 } |
8839 | 4264 /* It wasn't in the list, so add it to the front. */ |
4265 changed = !NILP (value); | |
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
4266 XOVERLAY (overlay)->plist |
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
4267 = Fcons (prop, Fcons (value, XOVERLAY (overlay)->plist)); |
8839 | 4268 found: |
4269 if (! NILP (buffer)) | |
4270 { | |
4271 if (changed) | |
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
4272 modify_overlay (XBUFFER (buffer), |
39333
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
4273 marker_position (OVERLAY_START (overlay)), |
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
4274 marker_position (OVERLAY_END (overlay))); |
8839 | 4275 if (EQ (prop, Qevaporate) && ! NILP (value) |
4276 && (OVERLAY_POSITION (OVERLAY_START (overlay)) | |
4277 == OVERLAY_POSITION (OVERLAY_END (overlay)))) | |
4278 Fdelete_overlay (overlay); | |
4279 } | |
69153
1f7111323584
* buffer.c (Foverlay_put): Mark buffer as changed.
Chong Yidong <cyd@stupidchicken.com>
parents:
69144
diff
changeset
|
4280 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4281 return value; |
333 | 4282 } |
4283 | |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4284 /* Subroutine of report_overlay_modification. */ |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4285 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4286 /* Lisp vector holding overlay hook functions to call. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4287 Vector elements come in pairs. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4288 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
|
4289 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
|
4290 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4291 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
|
4292 as we call overlay hook functions. |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4293 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
|
4294 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
|
4295 static Lisp_Object last_overlay_modification_hooks; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4296 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4297 /* 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
|
4298 static int last_overlay_modification_hooks_used; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4299 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4300 /* Add one functionlist/overlay pair |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4301 to the end of last_overlay_modification_hooks. */ |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4302 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4303 static void |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4304 add_overlay_mod_hooklist (functionlist, overlay) |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4305 Lisp_Object functionlist, overlay; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4306 { |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4307 int oldsize = XVECTOR (last_overlay_modification_hooks)->size; |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4308 |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4309 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
|
4310 last_overlay_modification_hooks = larger_vector |
9b00632ffdf2
(add_overlay_mod_hooklist): Use larger_vector.
Eli Zaretskii <eliz@gnu.org>
parents:
85114
diff
changeset
|
4311 (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
|
4312 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
|
4313 functionlist); last_overlay_modification_hooks_used++; |
d1e53221c4aa
* xselect.c (x_handle_dnd_message):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91367
diff
changeset
|
4314 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
|
4315 overlay); last_overlay_modification_hooks_used++; |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4316 } |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4317 |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4318 /* Run the modification-hooks of overlays that include |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4319 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
|
4320 If this change is an insertion, also |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4321 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
|
4322 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
|
4323 |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4324 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
|
4325 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
|
4326 |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4327 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
|
4328 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
|
4329 the position after the inserted new text, |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4330 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
|
4331 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4332 void |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4333 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
|
4334 Lisp_Object start, end; |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4335 int after; |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4336 Lisp_Object arg1, arg2, arg3; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4337 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4338 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
|
4339 struct Lisp_Overlay *tail; |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4340 /* 1 if this change is an insertion. */ |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4341 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
|
4342 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
|
4343 |
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4344 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
|
4345 tail = NULL; |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4346 |
51939
d38453fdf2a0
(copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51867
diff
changeset
|
4347 /* 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
|
4348 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
|
4349 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
|
4350 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
|
4351 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
|
4352 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
|
4353 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
|
4354 |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4355 if (!after) |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4356 { |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4357 /* 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
|
4358 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
|
4359 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
|
4360 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
|
4361 { |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4362 int startpos, endpos; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4363 Lisp_Object ostart, oend; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4364 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4365 XSETMISC (overlay, tail); |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4366 |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4367 ostart = OVERLAY_START (overlay); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4368 oend = OVERLAY_END (overlay); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4369 endpos = OVERLAY_POSITION (oend); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4370 if (XFASTINT (start) > endpos) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4371 break; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4372 startpos = OVERLAY_POSITION (ostart); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4373 if (insertion && (XFASTINT (start) == startpos |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4374 || XFASTINT (end) == startpos)) |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4375 { |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4376 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
|
4377 if (!NILP (prop)) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4378 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
|
4379 } |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4380 if (insertion && (XFASTINT (start) == endpos |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4381 || XFASTINT (end) == endpos)) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4382 { |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4383 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
|
4384 if (!NILP (prop)) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4385 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
|
4386 } |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4387 /* 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
|
4388 for both insertion and deletion. */ |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4389 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
|
4390 { |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4391 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
|
4392 if (!NILP (prop)) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4393 add_overlay_mod_hooklist (prop, overlay); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4394 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4395 } |
55242
d57364949309
(syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents:
55140
diff
changeset
|
4396 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4397 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
|
4398 { |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4399 int startpos, endpos; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4400 Lisp_Object ostart, oend; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4401 |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4402 XSETMISC (overlay, tail); |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4403 |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4404 ostart = OVERLAY_START (overlay); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4405 oend = OVERLAY_END (overlay); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4406 startpos = OVERLAY_POSITION (ostart); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4407 endpos = OVERLAY_POSITION (oend); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4408 if (XFASTINT (end) < startpos) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4409 break; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4410 if (insertion && (XFASTINT (start) == startpos |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4411 || XFASTINT (end) == startpos)) |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4412 { |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4413 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
|
4414 if (!NILP (prop)) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4415 add_overlay_mod_hooklist (prop, overlay); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4416 } |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4417 if (insertion && (XFASTINT (start) == endpos |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4418 || XFASTINT (end) == endpos)) |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4419 { |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4420 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
|
4421 if (!NILP (prop)) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4422 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
|
4423 } |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4424 /* 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
|
4425 for both insertion and deletion. */ |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4426 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
|
4427 { |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4428 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
|
4429 if (!NILP (prop)) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4430 add_overlay_mod_hooklist (prop, overlay); |
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4431 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4432 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4433 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4434 |
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4435 GCPRO4 (overlay, arg1, arg2, arg3); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4436 { |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4437 /* 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
|
4438 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
|
4439 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
|
4440 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
|
4441 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
|
4442 int i; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4443 |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4444 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
|
4445 copy, size * sizeof (Lisp_Object)); |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4446 gcpro1.var = copy; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4447 gcpro1.nvars = size; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4448 |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4449 for (i = 0; i < size;) |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4450 { |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4451 Lisp_Object prop, overlay; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4452 prop = copy[i++]; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4453 overlay = copy[i++]; |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4454 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
|
4455 } |
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4456 } |
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4457 UNGCPRO; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4458 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4459 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4460 static void |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4461 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
|
4462 Lisp_Object list, overlay; |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4463 int after; |
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4464 Lisp_Object arg1, arg2, arg3; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4465 { |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4466 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4467 |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4468 GCPRO4 (list, arg1, arg2, arg3); |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4469 |
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
4470 while (CONSP (list)) |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4471 { |
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4472 if (NILP (arg3)) |
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
4473 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
|
4474 else |
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
4475 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
|
4476 list = XCDR (list); |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4477 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4478 UNGCPRO; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4479 } |
8839 | 4480 |
4481 /* Delete any zero-sized overlays at position POS, if the `evaporate' | |
4482 property is set. */ | |
4483 void | |
4484 evaporate_overlays (pos) | |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
4485 EMACS_INT pos; |
8839 | 4486 { |
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4487 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
|
4488 struct Lisp_Overlay *tail; |
8839 | 4489 |
4490 hit_list = Qnil; | |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
4491 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
|
4492 for (tail = current_buffer->overlays_before; tail; tail = tail->next) |
8839 | 4493 { |
4494 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
|
4495 XSETMISC (overlay, tail); |
8839 | 4496 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
4497 if (endpos < pos) | |
4498 break; | |
4499 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
|
4500 && ! NILP (Foverlay_get (overlay, Qevaporate))) |
8839 | 4501 hit_list = Fcons (overlay, hit_list); |
4502 } | |
4503 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
|
4504 for (tail = current_buffer->overlays_after; tail; tail = tail->next) |
8839 | 4505 { |
4506 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
|
4507 XSETMISC (overlay, tail); |
8839 | 4508 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
4509 if (startpos > pos) | |
4510 break; | |
4511 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
|
4512 && ! NILP (Foverlay_get (overlay, Qevaporate))) |
8839 | 4513 hit_list = Fcons (overlay, hit_list); |
4514 } | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4515 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
|
4516 Fdelete_overlay (XCAR (hit_list)); |
8839 | 4517 } |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4518 |
9464
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
4519 /* 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
|
4520 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
|
4521 |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4522 void |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
4523 buffer_slot_type_mismatch (newval, type) |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
4524 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
|
4525 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
|
4526 { |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
4527 Lisp_Object predicate; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4528 |
86285
59344cb482f3
* lisp.h (struct Lisp_Buffer_Objfwd): Add a `slottype' field.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86230
diff
changeset
|
4529 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
|
4530 { |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
4531 case Lisp_Int: predicate = Qintegerp; break; |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
4532 case Lisp_String: predicate = Qstringp; break; |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
4533 case Lisp_Symbol: predicate = Qsymbolp; break; |
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
4534 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
|
4535 } |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4536 |
95112
0835cb21d60e
* lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
4537 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
|
4538 } |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4539 |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4540 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4541 /*********************************************************************** |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4542 Allocation with mmap |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4543 ***********************************************************************/ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4544 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4545 #ifdef USE_MMAP_FOR_BUFFERS |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4546 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4547 #include <sys/types.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4548 #include <sys/mman.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4549 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4550 #ifndef MAP_ANON |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4551 #ifdef MAP_ANONYMOUS |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4552 #define MAP_ANON MAP_ANONYMOUS |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4553 #else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4554 #define MAP_ANON 0 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4555 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4556 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4557 |
33645
e822f94eb7d9
(MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents:
33598
diff
changeset
|
4558 #ifndef MAP_FAILED |
e822f94eb7d9
(MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents:
33598
diff
changeset
|
4559 #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
|
4560 #endif |
e822f94eb7d9
(MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents:
33598
diff
changeset
|
4561 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4562 #include <stdio.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4563 #include <errno.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4564 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4565 #if MAP_ANON == 0 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4566 #include <fcntl.h> |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4567 #endif |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4568 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4569 #include "coding.h" |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4570 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4571 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4572 /* 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
|
4573 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
|
4574 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
|
4575 trying to enlarge regions. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4576 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4577 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
|
4578 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
|
4579 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4580 +-----------------------+ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4581 | struct mmap_info + | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4582 | padding | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4583 +-----------------------+ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4584 | user data | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4585 | | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4586 | | |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4587 +-----------------------+ */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4588 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4589 struct mmap_region |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4590 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4591 /* User-specified size. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4592 size_t nbytes_specified; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4593 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4594 /* Number of bytes mapped */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4595 size_t nbytes_mapped; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4596 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4597 /* 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
|
4598 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
|
4599 after this structure. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4600 POINTER_TYPE **var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4601 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4602 /* 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
|
4603 struct mmap_region *next, *prev; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4604 }; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4605 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4606 /* 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
|
4607 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4608 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
|
4609 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4610 /* 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
|
4611 /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
|
4612 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4613 static int mmap_fd; |
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 /* 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
|
4616 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4617 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
|
4618 static int mmap_fd_1; |
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 /* Page size on this system. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4621 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4622 static int mmap_page_size; |
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 /* 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
|
4625 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4626 static int mmap_initialized_p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4627 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4628 /* 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
|
4629 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4630 #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
|
4631 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4632 /* 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
|
4633 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4634 #define MMAP_REGION_STRUCT_SIZE \ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4635 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
|
4636 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4637 /* 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
|
4638 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
|
4639 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4640 #define MMAP_REGION(P) \ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4641 ((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
|
4642 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4643 /* 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
|
4644 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
|
4645 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4646 #define MMAP_USER_AREA(P) \ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4647 ((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
|
4648 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4649 #define MEM_ALIGN sizeof (double) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4650 |
48090 | 4651 /* Predicate returning true if part of the address range [START .. END] |
4652 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
|
4653 memory mapping. |
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4654 |
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4655 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
|
4656 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
|
4657 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
|
4658 |
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4659 #ifndef MMAP_ALLOCATED_P |
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4660 #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
|
4661 #endif |
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4662 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4663 /* Function prototypes. */ |
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_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
|
4666 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
|
4667 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
|
4668 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
|
4669 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
|
4670 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
|
4671 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
|
4672 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4673 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4674 /* 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
|
4675 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
|
4676 is at END - 1. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4677 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4678 static struct mmap_region * |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4679 mmap_find (start, end) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4680 POINTER_TYPE *start, *end; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4681 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4682 struct mmap_region *r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4683 char *s = (char *) start, *e = (char *) end; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4684 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4685 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
|
4686 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4687 char *rstart = (char *) r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4688 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
|
4689 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4690 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
|
4691 (s >= rstart && s < rend) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4692 /* 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
|
4693 || (e > rstart && e <= rend) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4694 /* 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
|
4695 || (rstart >= s && rstart < e) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4696 /* 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
|
4697 || (rend > s && rend <= e)) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4698 break; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4699 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4700 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4701 return r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4702 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4703 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4704 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4705 /* 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
|
4706 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
|
4707 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4708 static int |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4709 mmap_free_1 (r) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4710 struct mmap_region *r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4711 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4712 if (r->next) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4713 r->next->prev = r->prev; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4714 if (r->prev) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4715 r->prev->next = r->next; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4716 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4717 mmap_regions = r->next; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4718 |
33675
cd12ade4547d
(mmap_free_1): Avoid a compiler warning.
Gerd Moellmann <gerd@gnu.org>
parents:
33645
diff
changeset
|
4719 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
|
4720 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4721 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
|
4722 return 0; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4723 } |
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 return 1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4726 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4727 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4728 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4729 /* 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
|
4730 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
|
4731 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4732 static int |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4733 mmap_enlarge (r, npages) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4734 struct mmap_region *r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4735 int npages; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4736 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4737 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
|
4738 size_t nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4739 int success = 0; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4740 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4741 if (npages < 0) |
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 /* 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
|
4744 nbytes = - npages * mmap_page_size; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4745 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
|
4746 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
|
4747 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4748 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4749 r->nbytes_mapped -= nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4750 success = 1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4751 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4752 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4753 else if (npages > 0) |
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 nbytes = npages * mmap_page_size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4756 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4757 /* 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
|
4758 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
|
4759 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
|
4760 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
|
4761 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
|
4762 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4763 POINTER_TYPE *p; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4764 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4765 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
|
4766 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
|
4767 if (p == MAP_FAILED) |
33598
d2ed1317ec06
(mmap_enlarge): Don't print a message on stderr
Gerd Moellmann <gerd@gnu.org>
parents:
32856
diff
changeset
|
4768 ; /* 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
|
4769 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
|
4770 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4771 /* 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
|
4772 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
|
4773 no use for it. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4774 if (munmap (p, nbytes) == -1) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4775 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
|
4776 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4777 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4778 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4779 r->nbytes_mapped += nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4780 success = 1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4781 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4782 } |
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 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4785 return success; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4786 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4787 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4788 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4789 /* 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
|
4790 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
|
4791 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
|
4792 of mapped regions. |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4793 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4794 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
|
4795 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
|
4796 when Emacs starts. */ |
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 void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4799 mmap_set_vars (restore_p) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4800 int restore_p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4801 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4802 struct mmap_region *r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4803 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4804 if (restore_p) |
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 mmap_regions = mmap_regions_1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4807 mmap_fd = mmap_fd_1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4808 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
|
4809 *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
|
4810 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4811 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4812 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4813 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
|
4814 *r->var = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4815 mmap_regions_1 = mmap_regions; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4816 mmap_regions = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4817 mmap_fd_1 = mmap_fd; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4818 mmap_fd = -1; |
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 } |
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 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4823 /* 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
|
4824 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
|
4825 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
|
4826 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4827 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
|
4828 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4829 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
|
4830 return null. */ |
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 static POINTER_TYPE * |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4833 mmap_alloc (var, nbytes) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4834 POINTER_TYPE **var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4835 size_t nbytes; |
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 void *p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4838 size_t map; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4839 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4840 mmap_init (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4841 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4842 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
|
4843 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
|
4844 mmap_fd, 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4845 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4846 if (p == MAP_FAILED) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4847 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4848 if (errno != ENOMEM) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4849 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
|
4850 p = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4851 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4852 else |
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 struct mmap_region *r = (struct mmap_region *) p; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4855 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4856 r->nbytes_specified = nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4857 r->nbytes_mapped = map; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4858 r->var = var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4859 r->prev = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4860 r->next = mmap_regions; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4861 if (r->next) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4862 r->next->prev = r; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4863 mmap_regions = r; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4864 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4865 p = MMAP_USER_AREA (p); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4866 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4867 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4868 return *var = p; |
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 |
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 /* 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
|
4873 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
|
4874 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
|
4875 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
|
4876 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4877 static POINTER_TYPE * |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4878 mmap_realloc (var, nbytes) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4879 POINTER_TYPE **var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4880 size_t nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4881 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4882 POINTER_TYPE *result; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4883 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4884 mmap_init (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4885 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4886 if (*var == NULL) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4887 result = mmap_alloc (var, nbytes); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4888 else if (nbytes == 0) |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4889 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4890 mmap_free (var); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4891 result = mmap_alloc (var, nbytes); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4892 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4893 else |
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 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
|
4896 size_t room = r->nbytes_mapped - MMAP_REGION_STRUCT_SIZE; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4897 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4898 if (room < nbytes) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4899 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4900 /* Must enlarge. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4901 POINTER_TYPE *old_ptr = *var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4902 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4903 /* 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
|
4904 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
|
4905 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
|
4906 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
|
4907 / mmap_page_size))) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4908 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4909 r->nbytes_specified = nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4910 *var = result = old_ptr; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4911 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4912 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
|
4913 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4914 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
|
4915 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
|
4916 result = *var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4917 r = MMAP_REGION (result); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4918 r->nbytes_specified = nbytes; |
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 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4921 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4922 *var = old_ptr; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4923 result = NULL; |
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 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4926 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
|
4927 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4928 /* Shrinking by at least a page. Let's give some |
46588 | 4929 memory back to the system. |
4930 | |
4931 The extra parens are to make the division happens first, | |
4932 on positive values, so we know it will round towards | |
4933 zero. */ | |
46585
8d0730b0e14c
(mmap_realloc): When shrinking, make sure number of
Ken Raeburn <raeburn@raeburn.org>
parents:
46445
diff
changeset
|
4934 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
|
4935 result = *var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4936 r->nbytes_specified = nbytes; |
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 else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4939 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4940 /* Leave it alone. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4941 result = *var; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4942 r->nbytes_specified = nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4943 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4944 } |
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 return result; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4947 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4948 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4949 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4950 /* 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
|
4951 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
|
4952 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4953 static void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4954 mmap_free (var) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4955 POINTER_TYPE **var; |
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 mmap_init (); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4958 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4959 if (*var) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4960 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4961 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
|
4962 *var = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4963 } |
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 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4966 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4967 /* 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
|
4968 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4969 static void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4970 mmap_init () |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4971 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4972 #if MAP_ANON == 0 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4973 /* 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
|
4974 in a dumped Emacs. */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4975 if (mmap_fd <= 0) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4976 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4977 /* 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
|
4978 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
|
4979 if (mmap_fd == -1) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4980 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
|
4981 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4982 #endif /* MAP_ANON == 0 */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4983 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4984 if (mmap_initialized_p) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4985 return; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4986 mmap_initialized_p = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4987 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4988 #if MAP_ANON != 0 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4989 mmap_fd = -1; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4990 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4991 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4992 mmap_page_size = getpagesize (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4993 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4994 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4995 #endif /* USE_MMAP_FOR_BUFFERS */ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4996 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4997 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4998 |
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 Buffer-text Allocation |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5001 ***********************************************************************/ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5002 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5003 #ifdef REL_ALLOC |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5004 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
|
5005 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
|
5006 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
|
5007 #endif /* REL_ALLOC */ |
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 /* 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
|
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 alloc_buffer_text (b, nbytes) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5014 struct buffer *b; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5015 size_t nbytes; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5016 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5017 POINTER_TYPE *p; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5018 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5019 BLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5020 #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
|
5021 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
|
5022 #elif defined REL_ALLOC |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5023 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
|
5024 #else |
31612
2050f93e8cef
(alloc_buffer_text): Fix xmalloc call.
Dave Love <fx@gnu.org>
parents:
31604
diff
changeset
|
5025 p = xmalloc (nbytes); |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5026 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5027 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5028 if (p == NULL) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5029 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5030 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5031 memory_full (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5032 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5033 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5034 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
|
5035 UNBLOCK_INPUT; |
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 /* 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
|
5039 shrink it. */ |
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 void |
93117
87f463ae1530
(enlarge_buffer_text): Fix int -> EMACS_INT.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92975
diff
changeset
|
5042 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
|
5043 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5044 POINTER_TYPE *p; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5045 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
|
5046 + delta); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5047 BLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5048 #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
|
5049 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
|
5050 #elif defined REL_ALLOC |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5051 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
|
5052 #else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5053 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
|
5054 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5055 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5056 if (p == NULL) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5057 { |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5058 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5059 memory_full (); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5060 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5061 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5062 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
|
5063 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5064 } |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5065 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5066 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5067 /* 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
|
5068 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5069 static void |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5070 free_buffer_text (b) |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5071 struct buffer *b; |
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 BLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5074 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5075 #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
|
5076 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
|
5077 #elif defined REL_ALLOC |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5078 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
|
5079 #else |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5080 xfree (b->text->beg); |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5081 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5082 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5083 BUF_BEG_ADDR (b) = NULL; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5084 UNBLOCK_INPUT; |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5085 } |
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 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5088 |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5089 /*********************************************************************** |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5090 Initialization |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5091 ***********************************************************************/ |
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5092 |
21514 | 5093 void |
333 | 5094 init_buffer_once () |
5095 { | |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5096 int idx; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5097 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5098 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
|
5099 |
333 | 5100 /* Make sure all markable slots in buffer_defaults |
5101 are initialized reasonably, so mark_buffer won't choke. */ | |
5102 reset_buffer (&buffer_defaults); | |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
5103 reset_buffer_local_variables (&buffer_defaults, 1); |
333 | 5104 reset_buffer (&buffer_local_symbols); |
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
5105 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
|
5106 /* Prevent GC from getting confused. */ |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
5107 buffer_defaults.text = &buffer_defaults.own_text; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
5108 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
|
5109 BUF_INTERVALS (&buffer_defaults) = 0; |
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
5110 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
|
5111 XSETPVECTYPE (&buffer_defaults, PVEC_BUFFER); |
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
5112 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
|
5113 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
|
5114 XSETBUFFER (Vbuffer_local_symbols, &buffer_local_symbols); |
333 | 5115 |
5116 /* Set up the default values of various buffer slots. */ | |
5117 /* Must do these before making the first buffer! */ | |
5118 | |
28636
19c81f320db5
(Fmake_indirect_buffer): Escape newline in doc.
Dave Love <fx@gnu.org>
parents:
28625
diff
changeset
|
5119 /* real setup is done in bindings.el */ |
333 | 5120 buffer_defaults.mode_line_format = build_string ("%-"); |
25546 | 5121 buffer_defaults.header_line_format = Qnil; |
333 | 5122 buffer_defaults.abbrev_mode = Qnil; |
5123 buffer_defaults.overwrite_mode = Qnil; | |
5124 buffer_defaults.case_fold_search = Qt; | |
5125 buffer_defaults.auto_fill_function = Qnil; | |
5126 buffer_defaults.selective_display = Qnil; | |
5127 #ifndef old | |
5128 buffer_defaults.selective_display_ellipses = Qt; | |
5129 #endif | |
5130 buffer_defaults.abbrev_table = Qnil; | |
5131 buffer_defaults.display_table = Qnil; | |
5132 buffer_defaults.undo_list = Qnil; | |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
5133 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
|
5134 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
|
5135 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
|
5136 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
|
5137 buffer_defaults.overlays_after = NULL; |
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
5138 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
|
5139 |
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
|
5140 XSETFASTINT (buffer_defaults.tab_width, 8); |
333 | 5141 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
|
5142 buffer_defaults.word_wrap = Qnil; |
333 | 5143 buffer_defaults.ctl_arrow = Qt; |
17022 | 5144 buffer_defaults.direction_reversed = Qnil; |
28322
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
5145 buffer_defaults.cursor_type = Qt; |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
5146 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
|
5147 buffer_defaults.cursor_in_non_selected_windows = Qt; |
333 | 5148 |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
5149 #ifdef DOS_NT |
7270
0f79f4bd3c62
(init_buffer_once): Initialize buffer_file_type field right.
Richard M. Stallman <rms@gnu.org>
parents:
7062
diff
changeset
|
5150 buffer_defaults.buffer_file_type = Qnil; /* TEXT */ |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5151 #endif |
17124
fdad8ea24563
(init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents:
17022
diff
changeset
|
5152 buffer_defaults.enable_multibyte_characters = Qt; |
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5153 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
|
5154 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
|
5155 XSETFASTINT (buffer_defaults.left_margin, 0); |
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
5156 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
|
5157 buffer_defaults.file_truename = Qnil; |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
5158 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
|
5159 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
|
5160 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
|
5161 buffer_defaults.left_fringe_width = Qnil; |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5162 buffer_defaults.right_fringe_width = Qnil; |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5163 buffer_defaults.fringes_outside_margins = Qnil; |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5164 buffer_defaults.scroll_bar_width = Qnil; |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5165 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
|
5166 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
|
5167 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
|
5168 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
|
5169 buffer_defaults.fringe_cursor_alist = Qnil; |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5170 buffer_defaults.scroll_up_aggressively = Qnil; |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5171 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
|
5172 buffer_defaults.display_time = Qnil; |
333 | 5173 |
5174 /* Assign the local-flags to the slots that have default values. | |
5175 The local flag is a bit that is used in the buffer | |
5176 to say that it has its own local value for the slot. | |
5177 The local flag bits are in the local_var_flags slot of the buffer. */ | |
5178 | |
5179 /* 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
|
5180 if (sizeof (EMACS_INT) != sizeof (Lisp_Object)) abort (); |
333 | 5181 |
5182 /* 0 means not a lisp var, -1 means always local, else mask */ | |
5183 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
|
5184 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
|
5185 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
|
5186 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
|
5187 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
|
5188 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
|
5189 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
|
5190 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
|
5191 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
|
5192 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
|
5193 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
|
5194 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
|
5195 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
|
5196 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
|
5197 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
|
5198 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
|
5199 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
|
5200 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
|
5201 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
|
5202 |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5203 idx = 1; |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5204 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
|
5205 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
|
5206 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
|
5207 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
|
5208 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
|
5209 XSETFASTINT (buffer_local_flags.selective_display, idx); ++idx; |
333 | 5210 #ifndef old |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5211 XSETFASTINT (buffer_local_flags.selective_display_ellipses, idx); ++idx; |
333 | 5212 #endif |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5213 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
|
5214 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
|
5215 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
|
5216 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
|
5217 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
|
5218 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
|
5219 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
|
5220 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
|
5221 #ifdef DOS_NT |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5222 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
|
5223 /* 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
|
5224 buffer_permanent_local_flags[idx++] = 1; |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5225 #endif |
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5226 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
|
5227 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
|
5228 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
|
5229 XSETFASTINT (buffer_local_flags.direction_reversed, idx); ++idx; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5230 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
|
5231 /* 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
|
5232 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
|
5233 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
|
5234 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
|
5235 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
|
5236 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
|
5237 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
|
5238 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
|
5239 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
|
5240 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
|
5241 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
|
5242 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
|
5243 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
|
5244 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
|
5245 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
|
5246 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
|
5247 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
|
5248 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
|
5249 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
|
5250 |
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5251 /* Need more room? */ |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
5252 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
|
5253 abort (); |
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
5254 last_per_buffer_idx = idx; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5255 |
333 | 5256 Vbuffer_alist = Qnil; |
5257 current_buffer = 0; | |
5258 all_buffers = 0; | |
5259 | |
5260 QSFundamental = build_string ("Fundamental"); | |
5261 | |
5262 Qfundamental_mode = intern ("fundamental-mode"); | |
5263 buffer_defaults.major_mode = Qfundamental_mode; | |
5264 | |
5265 Qmode_class = intern ("mode-class"); | |
5266 | |
5267 Qprotected_field = intern ("protected-field"); | |
5268 | |
5269 Qpermanent_local = intern ("permanent-local"); | |
5270 | |
5271 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
|
5272 Fput (Qkill_buffer_hook, Qpermanent_local, Qt); |
333 | 5273 |
48635 | 5274 Qucs_set_table_for_input = intern ("ucs-set-table-for-input"); |
5275 | |
333 | 5276 Vprin1_to_string_buffer = Fget_buffer_create (build_string (" prin1")); |
14396 | 5277 |
333 | 5278 /* super-magic invisible buffer */ |
5279 Vbuffer_alist = Qnil; | |
5280 | |
648 | 5281 Fset_buffer (Fget_buffer_create (build_string ("*scratch*"))); |
23399
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
5282 |
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
5283 inhibit_modification_hooks = 0; |
333 | 5284 } |
5285 | |
21514 | 5286 void |
333 | 5287 init_buffer () |
5288 { | |
1563
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
5289 char *pwd; |
3463
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
5290 Lisp_Object temp; |
66043
7e251d472f1c
(init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents:
65439
diff
changeset
|
5291 int len; |
333 | 5292 |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5293 #ifdef USE_MMAP_FOR_BUFFERS |
31412
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5294 { |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5295 /* 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
|
5296 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
|
5297 Map new memory. */ |
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5298 struct buffer *b; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5299 |
31412
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5300 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
|
5301 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
|
5302 enlarge_buffer_text (b, 0); |
31412
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5303 } |
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5304 #endif /* USE_MMAP_FOR_BUFFERS */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5305 |
333 | 5306 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
|
5307 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
|
5308 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
|
5309 |
65411
29cca0143d6f
(init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
5310 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
|
5311 |
65438
170f43effa81
(init_buffer): Grow buffer to add directory separator
Romain Francoise <romain@orebokech.com>
parents:
65422
diff
changeset
|
5312 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
|
5313 fatal ("`get_current_dir_name' failed: %s\n", strerror (errno)); |
333 | 5314 |
5315 /* Maybe this should really use some standard subroutine | |
5316 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
|
5317 len = strlen (pwd); |
7e251d472f1c
(init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents:
65439
diff
changeset
|
5318 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
|
5319 { |
65438
170f43effa81
(init_buffer): Grow buffer to add directory separator
Romain Francoise <romain@orebokech.com>
parents:
65422
diff
changeset
|
5320 /* Grow buffer to add directory separator and '\0'. */ |
66043
7e251d472f1c
(init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents:
65439
diff
changeset
|
5321 pwd = (char *) xrealloc (pwd, len + 2); |
7e251d472f1c
(init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents:
65439
diff
changeset
|
5322 pwd[len] = DIRECTORY_SEP; |
7e251d472f1c
(init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents:
65439
diff
changeset
|
5323 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
|
5324 } |
16384
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
5325 |
65411
29cca0143d6f
(init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
5326 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
|
5327 if (! NILP (buffer_defaults.enable_multibyte_characters)) |
65439
1ffe6d4d0fc4
(init_buffer): Fix typos.
Romain Francoise <romain@orebokech.com>
parents:
65438
diff
changeset
|
5328 /* 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
|
5329 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
|
5330 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
|
5331 current_buffer->directory |
567ca4ca8574
(init_buffer): Set current_buffer->directory to a
Kenichi Handa <handa@m17n.org>
parents:
58501
diff
changeset
|
5332 = 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
|
5333 |
16384
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
5334 /* 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
|
5335 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
|
5336 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
|
5337 if (! NILP (temp) |
52fbf5fad62e
(init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents:
19977
diff
changeset
|
5338 /* 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
|
5339 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
|
5340 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
|
5341 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
|
5342 && 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
|
5343 current_buffer->directory |
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
5344 = 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
|
5345 |
3463
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
5346 temp = get_minibuffer (0); |
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
5347 XBUFFER (temp)->directory = current_buffer->directory; |
65411
29cca0143d6f
(init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
5348 |
29cca0143d6f
(init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
5349 free (pwd); |
333 | 5350 } |
5351 | |
85011
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5352 /* 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
|
5353 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
|
5354 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
|
5355 |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5356 /* 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
|
5357 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
|
5358 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
|
5359 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
|
5360 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
|
5361 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
|
5362 #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
|
5363 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
|
5364 |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5365 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
|
5366 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
|
5367 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
|
5368 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
|
5369 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
|
5370 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
|
5371 { |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5372 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
|
5373 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
|
5374 |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5375 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
|
5376 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
|
5377 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
|
5378 |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5379 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
|
5380 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
|
5381 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
|
5382 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
|
5383 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
|
5384 |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5385 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
|
5386 /* 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
|
5387 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
|
5388 abort (); |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5389 } |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5390 |
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5391 |
333 | 5392 /* initialize the buffer routines */ |
21514 | 5393 void |
333 | 5394 syms_of_buffer () |
5395 { | |
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
5396 staticpro (&last_overlay_modification_hooks); |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
5397 last_overlay_modification_hooks |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
5398 = Fmake_vector (make_number (10), Qnil); |
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
5399 |
333 | 5400 staticpro (&Vbuffer_defaults); |
5401 staticpro (&Vbuffer_local_symbols); | |
5402 staticpro (&Qfundamental_mode); | |
5403 staticpro (&Qmode_class); | |
5404 staticpro (&QSFundamental); | |
5405 staticpro (&Vbuffer_alist); | |
5406 staticpro (&Qprotected_field); | |
5407 staticpro (&Qpermanent_local); | |
87977
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
5408 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
|
5409 staticpro (&Qpermanent_local_hook); |
333 | 5410 staticpro (&Qkill_buffer_hook); |
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5411 Qoverlayp = intern ("overlayp"); |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
5412 staticpro (&Qoverlayp); |
8839 | 5413 Qevaporate = intern ("evaporate"); |
5414 staticpro (&Qevaporate); | |
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5415 Qmodification_hooks = intern ("modification-hooks"); |
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
5416 staticpro (&Qmodification_hooks); |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
5417 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
|
5418 staticpro (&Qinsert_in_front_hooks); |
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
5419 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
|
5420 staticpro (&Qinsert_behind_hooks); |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5421 Qget_file_buffer = intern ("get-file-buffer"); |
5433 | 5422 staticpro (&Qget_file_buffer); |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
5423 Qpriority = intern ("priority"); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
5424 staticpro (&Qpriority); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
5425 Qwindow = intern ("window"); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
5426 staticpro (&Qwindow); |
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
5427 Qbefore_string = intern ("before-string"); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
5428 staticpro (&Qbefore_string); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
5429 Qafter_string = intern ("after-string"); |
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
5430 staticpro (&Qafter_string); |
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5431 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
|
5432 staticpro (&Qfirst_change_hook); |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5433 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
|
5434 staticpro (&Qbefore_change_functions); |
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5435 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
|
5436 staticpro (&Qafter_change_functions); |
87977
0f04103be3bf
(reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents:
87843
diff
changeset
|
5437 /* The next one is initialized in init_buffer_once. */ |
48635 | 5438 staticpro (&Qucs_set_table_for_input); |
333 | 5439 |
50014
3b2576528809
(Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents:
49974
diff
changeset
|
5440 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
|
5441 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
|
5442 |
333 | 5443 Fput (Qprotected_field, Qerror_conditions, |
5444 Fcons (Qprotected_field, Fcons (Qerror, Qnil))); | |
5445 Fput (Qprotected_field, Qerror_message, | |
5446 build_string ("Attempt to modify a protected field")); | |
5447 | |
5448 /* All these use DEFVAR_LISP_NOPRO because the slots in | |
5449 buffer_defaults will all be marked via Vbuffer_defaults. */ | |
5450 | |
5451 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
|
5452 &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
|
5453 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
|
5454 This is the same as (default-value 'mode-line-format). */); |
333 | 5455 |
25546 | 5456 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
|
5457 &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
|
5458 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
|
5459 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
|
5460 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5461 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
|
5462 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
|
5463 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
|
5464 |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
5465 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
|
5466 &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
|
5467 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
|
5468 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
|
5469 |
62069
a0a348c8b14b
(init_buffer_once): Set cursor_in_non_selected_windows default value.
Kim F. Storm <storm@cua.dk>
parents:
62030
diff
changeset
|
5470 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
|
5471 &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
|
5472 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
|
5473 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
|
5474 |
333 | 5475 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
|
5476 &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
|
5477 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
|
5478 This is the same as (default-value 'abbrev-mode). */); |
333 | 5479 |
5480 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
|
5481 &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
|
5482 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
|
5483 This is the same as (default-value 'ctl-arrow). */); |
333 | 5484 |
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
5485 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
|
5486 &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
|
5487 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
|
5488 This is the same as (default-value 'direction-reversed). */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5489 |
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
5490 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
|
5491 &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
|
5492 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
|
5493 This is the same as (default-value 'enable-multibyte-characters). */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5494 |
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
5495 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
|
5496 &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
|
5497 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
|
5498 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
|
5499 |
333 | 5500 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
|
5501 &buffer_defaults.truncate_lines, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5502 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
|
5503 This is the same as (default-value 'truncate-lines). */); |
333 | 5504 |
5505 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
|
5506 &buffer_defaults.fill_column, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5507 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
|
5508 This is the same as (default-value 'fill-column). */); |
333 | 5509 |
5510 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
|
5511 &buffer_defaults.left_margin, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5512 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
|
5513 This is the same as (default-value 'left-margin). */); |
333 | 5514 |
5515 DEFVAR_LISP_NOPRO ("default-tab-width", | |
74720 | 5516 &buffer_defaults.tab_width, |
74721
24338a0d4577
Whitespace change (again).
Juanma Barranquero <lekktu@gmail.com>
parents:
74720
diff
changeset
|
5517 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
|
5518 This is the same as (default-value 'tab-width). */); |
333 | 5519 |
5520 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
|
5521 &buffer_defaults.case_fold_search, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5522 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
|
5523 This is the same as (default-value 'case-fold-search). */); |
333 | 5524 |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
5525 #ifdef DOS_NT |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5526 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
|
5527 &buffer_defaults.buffer_file_type, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5528 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
|
5529 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
|
5530 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
|
5531 #endif |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5532 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5533 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
|
5534 &buffer_defaults.left_margin_cols, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5535 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
|
5536 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
|
5537 |
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5538 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
|
5539 &buffer_defaults.right_margin_cols, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5540 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
|
5541 This is the same as (default-value 'right-margin-width). */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5542 |
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5543 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
|
5544 &buffer_defaults.left_fringe_width, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5545 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
|
5546 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
|
5547 |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5548 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
|
5549 &buffer_defaults.right_fringe_width, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5550 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
|
5551 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
|
5552 |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5553 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
|
5554 &buffer_defaults.fringes_outside_margins, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5555 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
|
5556 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
|
5557 |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5558 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
|
5559 &buffer_defaults.scroll_bar_width, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5560 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
|
5561 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
|
5562 |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5563 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
|
5564 &buffer_defaults.vertical_scroll_bar_type, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5565 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
|
5566 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
|
5567 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5568 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
|
5569 &buffer_defaults.indicate_empty_lines, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5570 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
|
5571 This is the same as (default-value 'indicate-empty-lines). */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5572 |
53602
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5573 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
|
5574 &buffer_defaults.indicate_buffer_boundaries, |
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5575 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
|
5576 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
|
5577 |
69047
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5578 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
|
5579 &buffer_defaults.fringe_indicator_alist, |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5580 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
|
5581 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
|
5582 |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5583 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
|
5584 &buffer_defaults.fringe_cursor_alist, |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5585 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
|
5586 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
|
5587 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5588 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
|
5589 &buffer_defaults.scroll_up_aggressively, |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5590 doc: /* Default value of `scroll-up-aggressively'. |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5591 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
|
5592 This is the same as (default-value 'scroll-up-aggressively). */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5593 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5594 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
|
5595 &buffer_defaults.scroll_down_aggressively, |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5596 doc: /* Default value of `scroll-down-aggressively'. |
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5597 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
|
5598 This is the same as (default-value 'scroll-down-aggressively). */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5599 |
25546 | 5600 DEFVAR_PER_BUFFER ("header-line-format", |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5601 ¤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
|
5602 Qnil, |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5603 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
|
5604 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
|
5605 the mode line appears at the bottom. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5606 |
333 | 5607 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
|
5608 Qnil, |
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5609 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
|
5610 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
|
5611 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
|
5612 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
|
5613 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
|
5614 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
|
5615 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
|
5616 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
|
5617 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
|
5618 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
|
5619 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
|
5620 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
|
5621 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
|
5622 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
|
5623 with the specified properties PROPS applied. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5624 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
|
5625 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
|
5626 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
|
5627 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
|
5628 recursively and the results are effectively concatenated. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5629 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
|
5630 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
|
5631 to the width specified by that number. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5632 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
|
5633 (%-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
|
5634 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
|
5635 %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
|
5636 %F -- print frame name. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5637 %* -- print %, * or hyphen. %+ -- print *, % or hyphen. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5638 %& is like %*, but ignore read-only-ness. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5639 % 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
|
5640 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
|
5641 %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
|
5642 %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
|
5643 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
|
5644 `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
|
5645 %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
|
5646 %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
|
5647 %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
|
5648 %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
|
5649 or print Bottom or All. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5650 %n -- print Narrow if appropriate. |
70931
83b791ca7b11
(mode-line-format): Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
70816
diff
changeset
|
5651 %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
|
5652 %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
|
5653 %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
|
5654 %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
|
5655 %@ -- 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
|
5656 remote machine. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5657 %[ -- print one [ for each recursive editing level. %] similar. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5658 %% -- print %. %- -- print infinitely many dashes. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5659 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
|
5660 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5661 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
|
5662 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
|
5663 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
|
5664 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
|
5665 |
5358b2582e78
(syms_of_buffer) <default-major-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56976
diff
changeset
|
5666 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
|
5667 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
|
5668 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
|
5669 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
|
5670 `buffer-read-only' and `buffer-file-coding-system' to be set up. */); |
333 | 5671 |
5672 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
|
5673 make_number (Lisp_Symbol), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5674 doc: /* Symbol for current buffer's major mode. */); |
333 | 5675 |
5676 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
|
5677 Qnil, |
87843
e1d6c4e34d2c
(syms_of_buffer) <mode-name>: Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
5678 doc: /* Pretty name of current buffer's major mode. |
91711 | 5679 Usually a string. See `mode-line-format' for other possible forms. |
5680 Use the function `format-mode-line' to get the value as a string. */); | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5681 |
85011
1d35aa875508
* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83648
diff
changeset
|
5682 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
|
5683 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
|
5684 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5685 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
|
5686 doc: /* Non-nil turns on automatic expansion of abbrevs as they are inserted. */); |
333 | 5687 |
5688 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
|
5689 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5690 doc: /* *Non-nil if searches and matches should ignore case. */); |
333 | 5691 |
5692 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
|
5693 make_number (Lisp_Int), |
46864
df9f70dd69a4
(syms_of_buffer) <fill-column>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
46599
diff
changeset
|
5694 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
|
5695 Interactively, you can set the buffer local value using \\[set-fill-column]. */); |
333 | 5696 |
5697 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
|
5698 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
|
5699 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
|
5700 Linefeed indents to this column in Fundamental mode. */); |
333 | 5701 |
5702 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
|
5703 make_number (Lisp_Int), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5704 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
|
5705 |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5706 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
|
5707 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
|
5708 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
|
5709 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
|
5710 in the current display table (if there is one). */); |
333 | 5711 |
17022 | 5712 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
|
5713 ¤t_buffer->enable_multibyte_characters, |
50304
d9d826db650f
(overlays_in): Declare static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50014
diff
changeset
|
5714 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5715 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
|
5716 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
|
5717 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
|
5718 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5719 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
|
5720 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
|
5721 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
|
5722 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
|
5723 `(elisp)Text Representations'. */); |
50304
d9d826db650f
(overlays_in): Declare static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50014
diff
changeset
|
5724 XSYMBOL (intern ("enable-multibyte-characters"))->constant = 1; |
17022 | 5725 |
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5726 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
|
5727 ¤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
|
5728 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
|
5729 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
|
5730 and other functions that use `write-region'. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5731 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
|
5732 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5733 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
|
5734 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
|
5735 for the buffer file. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5736 |
43630
a4789f07d85d
(syms_of_buffer) <buffer-file-coding-system>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
42982
diff
changeset
|
5737 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
|
5738 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
|
5739 |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5740 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
|
5741 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5742 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
|
5743 |
17022 | 5744 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
|
5745 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5746 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
|
5747 |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5748 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
|
5749 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
|
5750 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
|
5751 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5752 Note that this is overridden by the variable |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5753 `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
|
5754 and this buffer is not full-frame width. */); |
333 | 5755 |
96233
514e5b8b3fbf
(syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents:
95826
diff
changeset
|
5756 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
|
5757 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
|
5758 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
|
5759 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
|
5760 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
|
5761 |
514e5b8b3fbf
(syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents:
95826
diff
changeset
|
5762 This variable has no effect if long lines are truncated (see |
514e5b8b3fbf
(syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents:
95826
diff
changeset
|
5763 `truncate-lines' and `truncate-partial-width-windows'). */); |
514e5b8b3fbf
(syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents:
95826
diff
changeset
|
5764 |
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
5765 #ifdef DOS_NT |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5766 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
|
5767 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5768 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
|
5769 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
|
5770 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
|
5771 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
|
5772 #endif |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5773 |
333 | 5774 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
|
5775 make_number (Lisp_String), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5776 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
|
5777 To interactively change the default directory, use command `cd'. */); |
333 | 5778 |
5779 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
|
5780 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5781 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
|
5782 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
|
5783 the `auto-fill-chars' table. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5784 NOTE: This variable is not a hook; |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5785 its value may not be a list of functions. */); |
333 | 5786 |
5787 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
|
5788 make_number (Lisp_String), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5789 doc: /* Name of file visited in current buffer, or nil if not visiting a file. */); |
333 | 5790 |
10751
dea8f022819d
(syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents:
10668
diff
changeset
|
5791 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
|
5792 make_number (Lisp_String), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5793 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
|
5794 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
|
5795 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
|
5796 |
333 | 5797 DEFVAR_PER_BUFFER ("buffer-auto-save-file-name", |
1041 | 5798 ¤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
|
5799 make_number (Lisp_String), |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5800 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
|
5801 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
|
5802 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5803 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
|
5804 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
|
5805 |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5806 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
|
5807 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
|
5808 Backing up is done before the first time the file is saved. */); |
333 | 5809 |
5810 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
|
5811 make_number (Lisp_Int), |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5812 doc: /* Length of current buffer when last read in, saved or auto-saved. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5813 0 initially. */); |
333 | 5814 |
5815 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
|
5816 Qnil, |
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5817 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
|
5818 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
|
5819 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
|
5820 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
|
5821 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
|
5822 in a file, save the ^M as a newline. */); |
333 | 5823 |
5824 #ifndef old | |
5825 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
|
5826 ¤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
|
5827 Qnil, |
40567
7c28809db274
(selective-display-ellipses): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents:
40108
diff
changeset
|
5828 doc: /* Non-nil means display ... on previous line when a line is invisible. */); |
333 | 5829 #endif |
5830 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5831 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
|
5832 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
|
5833 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
|
5834 `overwrite-mode-binary', or nil. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5835 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
|
5836 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
|
5837 until the tab is filled in. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5838 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
|
5839 |
333 | 5840 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
|
5841 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5842 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
|
5843 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5844 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
|
5845 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
|
5846 `set-window-display-table' and `window-display-table'. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5847 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5848 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
|
5849 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
|
5850 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
|
5851 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5852 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
|
5853 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
|
5854 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
|
5855 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
|
5856 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
|
5857 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
|
5858 |
76557
b99f6ff8775b
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
76526
diff
changeset
|
5859 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
|
5860 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
|
5861 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5862 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
|
5863 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5864 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
|
5865 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
|
5866 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
|
5867 (extra-slot 2, a single character); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5868 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
|
5869 a single character); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5870 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
|
5871 a vector of characters); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5872 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
|
5873 (extra-slot 5, a single character). |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5874 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5875 See also the functions `display-table-slot' and `set-display-table-slot'. */); |
333 | 5876 |
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5877 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
|
5878 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5879 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
|
5880 A value of nil means no marginal area. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5881 |
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5882 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
|
5883 Qnil, |
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5884 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
|
5885 A value of nil means no marginal area. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5886 |
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5887 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
|
5888 Qnil, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5889 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
|
5890 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
|
5891 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
|
5892 |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5893 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
|
5894 Qnil, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5895 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
|
5896 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
|
5897 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
|
5898 |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5899 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
|
5900 Qnil, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5901 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
|
5902 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
|
5903 |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5904 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
|
5905 Qnil, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5906 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
|
5907 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
|
5908 |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5909 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
|
5910 Qnil, |
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5911 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
|
5912 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
|
5913 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
|
5914 |
59114
3f2406abbe2a
(Fbuffer_disable_undo): Deleted (moved to simple.el).
Richard M. Stallman <rms@gnu.org>
parents:
58618
diff
changeset
|
5915 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
|
5916 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
|
5917 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
|
5918 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5919 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
|
5920 ¤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
|
5921 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
|
5922 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
|
5923 window-systems. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5924 |
53602
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5925 DEFVAR_PER_BUFFER ("indicate-buffer-boundaries", |
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5926 ¤t_buffer->indicate_buffer_boundaries, Qnil, |
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5927 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
|
5928 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
|
5929 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
|
5930 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
|
5931 arrow bitmaps. |
57245
8c66fdb3c3ba
(syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents:
57138
diff
changeset
|
5932 |
8c66fdb3c3ba
(syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents:
57138
diff
changeset
|
5933 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
|
5934 are displayed in the left or right fringe, resp. Any other value |
60248 | 5935 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
|
5936 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
|
5937 |
8f225aca7c72
(syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57705
diff
changeset
|
5938 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
|
5939 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
|
5940 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
|
5941 `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
|
5942 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
|
5943 this indicator. |
8c66fdb3c3ba
(syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents:
57138
diff
changeset
|
5944 |
8c66fdb3c3ba
(syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents:
57138
diff
changeset
|
5945 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
|
5946 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
|
5947 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
|
5948 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
|
5949 |
69047
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5950 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
|
5951 ¤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
|
5952 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
|
5953 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
|
5954 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
|
5955 fringe indicator. |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5956 |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5957 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
|
5958 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
|
5959 `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
|
5960 |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5961 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
|
5962 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
|
5963 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
|
5964 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
|
5965 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
|
5966 \(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
|
5967 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
|
5968 |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5969 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
|
5970 ¤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
|
5971 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
|
5972 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
|
5973 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
|
5974 cursor type in the fringe. |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5975 |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5976 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
|
5977 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
|
5978 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
|
5979 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
|
5980 |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5981 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
|
5982 cursor type. */); |
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5983 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5984 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
|
5985 ¤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
|
5986 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
|
5987 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
|
5988 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
|
5989 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
|
5990 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
|
5991 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
|
5992 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
|
5993 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
|
5994 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
|
5995 between 0.0 and 1.0, inclusive. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5996 |
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5997 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
|
5998 ¤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
|
5999 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
|
6000 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
|
6001 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
|
6002 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
|
6003 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
|
6004 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
|
6005 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
|
6006 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
|
6007 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
|
6008 between 0.0 and 1.0, inclusive. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
6009 |
333 | 6010 /*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol, |
6011 "Don't ask."); | |
6012 */ | |
6013 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6014 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
|
6015 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
|
6016 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
|
6017 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
|
6018 \(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
|
6019 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
|
6020 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6021 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
|
6022 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
|
6023 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
|
6024 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
|
6025 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
|
6026 accomplishing an equivalent result by using other variables. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6027 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6028 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
|
6029 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
|
6030 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
|
6031 Vbefore_change_functions = Qnil; |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
6032 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6033 DEFVAR_LISP ("after-change-functions", &Vafter_change_functions, |
44790
56ce64222cbe
(syms_of_buffer): Doc fix.
Colin Walters <walters@gnu.org>
parents:
44784
diff
changeset
|
6034 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
|
6035 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
|
6036 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
|
6037 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
|
6038 \(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
|
6039 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
|
6040 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
|
6041 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6042 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
|
6043 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
|
6044 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
|
6045 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
|
6046 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
|
6047 accomplishing an equivalent result by using other variables. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6048 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6049 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
|
6050 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
|
6051 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
|
6052 Vafter_change_functions = Qnil; |
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
6053 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6054 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
|
6055 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
|
6056 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
|
6057 Vfirst_change_hook = Qnil; |
333 | 6058 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6059 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
|
6060 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
|
6061 Recent changes come first; older changes follow newer. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6062 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6063 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
|
6064 position BEG and ends at position END. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6065 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6066 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
|
6067 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
|
6068 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
|
6069 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6070 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
|
6071 \"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
|
6072 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
|
6073 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
|
6074 obsolete. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6075 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6076 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
|
6077 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
|
6078 and VALUE is the old value. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6079 |
59833
62b43d677801
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
59780
diff
changeset
|
6080 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
|
6081 \(apply FUN-NAME ARGS). |
62b43d677801
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
59780
diff
changeset
|
6082 |
62b43d677801
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
59780
diff
changeset
|
6083 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
|
6084 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
|
6085 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
|
6086 this change. |
59780
9d293bf75d6c
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
59194
diff
changeset
|
6087 |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6088 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
|
6089 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
|
6090 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6091 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
|
6092 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
|
6093 point at POSITION. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6094 |
74160
6e1dfb25e826
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73173
diff
changeset
|
6095 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
|
6096 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
|
6097 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6098 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
|
6099 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6100 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
|
6101 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
|
6102 |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6103 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
|
6104 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
|
6105 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6106 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
|
6107 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
|
6108 `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
|
6109 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
|
6110 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
|
6111 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
|
6112 longer to update the display. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6113 |
57705
804f28bbd89c
(syms_of_buffer): Fix a few typos.
David Kastrup <dak@gnu.org>
parents:
57245
diff
changeset
|
6114 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
|
6115 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
|
6116 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
|
6117 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
|
6118 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
|
6119 same, fixed screen width. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6120 |
57705
804f28bbd89c
(syms_of_buffer): Fix a few typos.
David Kastrup <dak@gnu.org>
parents:
57245
diff
changeset
|
6121 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
|
6122 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
|
6123 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
|
6124 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
|
6125 |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6126 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
|
6127 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
|
6128 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
|
6129 functions; it should only affect their performance. */); |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6130 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6131 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
|
6132 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
|
6133 |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6134 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
|
6135 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
|
6136 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
|
6137 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
|
6138 |
56976
b3aa8cb4c381
(reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56669
diff
changeset
|
6139 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
|
6140 ¤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
|
6141 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
|
6142 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
|
6143 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
|
6144 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
|
6145 |
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
6146 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
|
6147 ¤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
|
6148 doc: /* Invisibility spec of this buffer. |
39971
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6149 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
|
6150 if it has a non-nil `invisible' property. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6151 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
|
6152 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
|
6153 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
|
6154 then characters with property value PROP are invisible, |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6155 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
|
6156 |
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
6157 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
|
6158 ¤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
|
6159 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
|
6160 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
|
6161 |
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
6162 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
|
6163 ¤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
|
6164 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
|
6165 The function `set-window-buffer' updates this variable |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6166 to the value obtained by calling `current-time'. |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6167 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
|
6168 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6169 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
|
6170 doc: /* */); |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
6171 Vtransient_mark_mode = Qnil; |
93544
b75140e5e267
(Vtransient_mark_mode): Move docstring to simple.el to
Chong Yidong <cyd@stupidchicken.com>
parents:
93117
diff
changeset
|
6172 /* 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
|
6173 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
|
6174 define-minor-mode. */ |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
6175 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6176 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
|
6177 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
|
6178 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
|
6179 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
|
6180 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
|
6181 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
|
6182 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
|
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 ("cursor-type", ¤t_buffer->cursor_type, Qnil, |
74680
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
6185 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
|
6186 Values are interpreted as follows: |
820d9cd6761a
Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6187 |
64572
339bbffbcd05
(syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64469
diff
changeset
|
6188 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
|
6189 nil don't display a cursor |
339bbffbcd05
(syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64469
diff
changeset
|
6190 box display a filled box cursor |
339bbffbcd05
(syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64469
diff
changeset
|
6191 hollow display a hollow box cursor |
339bbffbcd05
(syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64469
diff
changeset
|
6192 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
|
6193 (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
|
6194 hbar display a horizontal bar cursor with default height |
63570
7b153a401f5c
Finish previous change.
Richard M. Stallman <rms@gnu.org>
parents:
63545
diff
changeset
|
6195 (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
|
6196 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
|
6197 |
4c14a5806a68
(syms_of_buffer) <cursor-type>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45393
diff
changeset
|
6198 When the buffer is displayed in a nonselected window, |
4c14a5806a68
(syms_of_buffer) <cursor-type>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45393
diff
changeset
|
6199 this variable has no effect; the cursor appears as a hollow box. */); |
28322
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
6200 |
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
6201 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
|
6202 ¤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
|
6203 doc: /* Additional space to put between lines when displaying a buffer. |
55242
d57364949309
(syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents:
55140
diff
changeset
|
6204 The space is measured in pixels, and put below lines on window systems. |
d57364949309
(syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents:
55140
diff
changeset
|
6205 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
|
6206 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
|
6207 |
62030
bc82609e1655
(syms_of_buffer): Define cursor-in-non-selected-windows.
Richard M. Stallman <rms@gnu.org>
parents:
61445
diff
changeset
|
6208 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
|
6209 ¤t_buffer->cursor_in_non_selected_windows, Qnil, |
74680
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
6210 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
|
6211 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
|
6212 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6213 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
|
6214 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
|
6215 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
|
6216 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
|
6217 Vkill_buffer_query_functions = Qnil; |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
6218 |
72299
e97bfa736263
* buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents:
71968
diff
changeset
|
6219 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
|
6220 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
|
6221 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
|
6222 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
|
6223 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
|
6224 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
|
6225 |
14506
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
6226 defsubr (&Sbuffer_live_p); |
333 | 6227 defsubr (&Sbuffer_list); |
6228 defsubr (&Sget_buffer); | |
6229 defsubr (&Sget_file_buffer); | |
6230 defsubr (&Sget_buffer_create); | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
6231 defsubr (&Smake_indirect_buffer); |
392 | 6232 defsubr (&Sgenerate_new_buffer_name); |
333 | 6233 defsubr (&Sbuffer_name); |
6234 /*defsubr (&Sbuffer_number);*/ | |
6235 defsubr (&Sbuffer_file_name); | |
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
6236 defsubr (&Sbuffer_base_buffer); |
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
6237 defsubr (&Sbuffer_local_value); |
333 | 6238 defsubr (&Sbuffer_local_variables); |
6239 defsubr (&Sbuffer_modified_p); | |
6240 defsubr (&Sset_buffer_modified_p); | |
6241 defsubr (&Sbuffer_modified_tick); | |
72592
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
6242 defsubr (&Sbuffer_chars_modified_tick); |
333 | 6243 defsubr (&Srename_buffer); |
6244 defsubr (&Sother_buffer); | |
6245 defsubr (&Sbuffer_enable_undo); | |
6246 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
|
6247 defsubr (&Sset_buffer_major_mode); |
333 | 6248 defsubr (&Sswitch_to_buffer); |
6249 defsubr (&Scurrent_buffer); | |
6250 defsubr (&Sset_buffer); | |
6251 defsubr (&Sbarf_if_buffer_read_only); | |
6252 defsubr (&Sbury_buffer); | |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
6253 defsubr (&Serase_buffer); |
92215
4a11735d1bdb
(Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91781
diff
changeset
|
6254 defsubr (&Sbuffer_swap_text); |
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
6255 defsubr (&Sset_buffer_multibyte); |
333 | 6256 defsubr (&Skill_all_local_variables); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6257 |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
6258 defsubr (&Soverlayp); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6259 defsubr (&Smake_overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6260 defsubr (&Sdelete_overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6261 defsubr (&Smove_overlay); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
6262 defsubr (&Soverlay_start); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
6263 defsubr (&Soverlay_end); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
6264 defsubr (&Soverlay_buffer); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
6265 defsubr (&Soverlay_properties); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6266 defsubr (&Soverlays_at); |
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
6267 defsubr (&Soverlays_in); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6268 defsubr (&Snext_overlay_change); |
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
6269 defsubr (&Sprevious_overlay_change); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6270 defsubr (&Soverlay_recenter); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6271 defsubr (&Soverlay_lists); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6272 defsubr (&Soverlay_get); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6273 defsubr (&Soverlay_put); |
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
6274 defsubr (&Srestore_buffer_modified_p); |
333 | 6275 } |
6276 | |
21514 | 6277 void |
333 | 6278 keys_of_buffer () |
6279 { | |
6280 initial_define_key (control_x_map, 'b', "switch-to-buffer"); | |
6281 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
|
6282 |
2c5f3537a1cc
(syms_of_buffer): Don't do (put 'erase-buffer 'disabled t) here.
Roland McGrath <roland@gnu.org>
parents:
5502
diff
changeset
|
6283 /* 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
|
6284 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
|
6285 Fput (intern ("erase-buffer"), Qdisabled, Qt); |
333 | 6286 } |
52401 | 6287 |
6288 /* arch-tag: e48569bf-69a9-4b65-a23b-8e68769436e1 | |
6289 (do not change this comment) */ |