Mercurial > emacs
annotate src/buffer.c @ 90918:e9f94688a064
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 781-792)
- Update from CVS
- Merge from gnus--rel--5.10
- Merge from emacs--rel--22
* emacs--rel--22 (patch 33-41)
* gnus--rel--5.10 (patch 226-228)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-219
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 11 Jun 2007 00:58:11 +0000 |
| parents | e6fdae9180d4 f49a56c237e0 |
| children | 3371fc48749b |
| 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, |
| 75348 | 4 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. |
| 333 | 5 |
| 6 This file is part of GNU Emacs. | |
| 7 | |
| 8 GNU Emacs is free software; you can redistribute it and/or modify | |
| 9 it under the terms of the GNU General Public License as published by | |
|
1953
714df59790af
(Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents:
1952
diff
changeset
|
10 the Free Software Foundation; either version 2, or (at your option) |
| 333 | 11 any later version. |
| 12 | |
| 13 GNU Emacs is distributed in the hope that it will be useful, | |
| 14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 16 GNU General Public License for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 19 along with GNU Emacs; see the file COPYING. If not, write to | |
| 64084 | 20 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 21 Boston, MA 02110-1301, USA. */ | |
| 333 | 22 |
|
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
26056
diff
changeset
|
23 #include <config.h> |
| 333 | 24 |
|
1563
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/types.h> |
|
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
26 #include <sys/stat.h> |
| 333 | 27 #include <sys/param.h> |
| 19581 | 28 #include <errno.h> |
| 31886 | 29 #include <stdio.h> |
| 19581 | 30 |
|
31102
6a0caa788013
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30911
diff
changeset
|
31 #ifndef USE_CRT_DLL |
| 19581 | 32 extern int errno; |
|
31102
6a0caa788013
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30911
diff
changeset
|
33 #endif |
| 333 | 34 |
| 35 | |
| 21514 | 36 #ifdef HAVE_UNISTD_H |
| 37 #include <unistd.h> | |
| 38 #endif | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
39 |
| 333 | 40 #include "lisp.h" |
|
1308
2660a7053836
* buffer.c: #include intervals.h.
Joseph Arceneaux <jla@gnu.org>
parents:
1291
diff
changeset
|
41 #include "intervals.h" |
| 333 | 42 #include "window.h" |
| 43 #include "commands.h" | |
| 44 #include "buffer.h" | |
|
88354
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
45 #include "character.h" |
|
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
46 #include "region-cache.h" |
| 333 | 47 #include "indent.h" |
| 2480 | 48 #include "blockinput.h" |
|
31102
6a0caa788013
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30911
diff
changeset
|
49 #include "keyboard.h" |
|
39748
42b7a798ff79
Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39581
diff
changeset
|
50 #include "keymap.h" |
|
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
51 #include "frame.h" |
| 333 | 52 |
| 53 struct buffer *current_buffer; /* the current buffer */ | |
| 54 | |
| 55 /* First buffer in chain of all buffers (in reverse order of creation). | |
| 56 Threaded through ->next. */ | |
| 57 | |
| 58 struct buffer *all_buffers; | |
| 59 | |
| 60 /* This structure holds the default values of the buffer-local variables | |
| 61 defined with DEFVAR_PER_BUFFER, that have special slots in each buffer. | |
| 62 The default value occupies the same slot in this structure | |
| 63 as an individual buffer's value occupies in that buffer. | |
| 64 Setting the default value also goes through the alist of buffers | |
| 65 and stores into each buffer that does not say it has a local value. */ | |
| 66 | |
|
53655
4f64423a6040
(buffer_defaults, buffer_local_symbols): Use DECL_ALIGN.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53602
diff
changeset
|
67 DECL_ALIGN (struct buffer, buffer_defaults); |
| 333 | 68 |
| 69 /* A Lisp_Object pointer to the above, used for staticpro */ | |
| 70 | |
| 71 static Lisp_Object Vbuffer_defaults; | |
| 72 | |
| 73 /* This structure marks which slots in a buffer have corresponding | |
| 74 default values in buffer_defaults. | |
| 75 Each such slot has a nonzero value in this structure. | |
| 76 The value has only one nonzero bit. | |
| 77 | |
| 78 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
|
79 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
|
80 is turned on in the buffer's local_flags array. |
| 333 | 81 |
| 82 If a slot in this structure is -1, then even though there may | |
| 83 be a DEFVAR_PER_BUFFER for the slot, there is no default value for it; | |
| 84 and the corresponding slot in buffer_defaults is not used. | |
| 85 | |
| 86 If a slot is -2, then there is no DEFVAR_PER_BUFFER for it, | |
| 87 but there is a default value which is copied into each buffer. | |
| 88 | |
| 89 If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is | |
| 90 zero, that is a bug */ | |
| 91 | |
| 92 struct buffer buffer_local_flags; | |
| 93 | |
| 94 /* This structure holds the names of symbols whose values may be | |
| 95 buffer-local. It is indexed and accessed in the same way as the above. */ | |
| 96 | |
|
53655
4f64423a6040
(buffer_defaults, buffer_local_symbols): Use DECL_ALIGN.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53602
diff
changeset
|
97 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
|
98 |
| 333 | 99 /* A Lisp_Object pointer to the above, used for staticpro */ |
| 100 static Lisp_Object Vbuffer_local_symbols; | |
| 101 | |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
102 /* This structure holds the required types for the values in the |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
103 buffer-local slots. If a slot contains Qnil, then the |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
104 corresponding buffer slot may contain a value of any type. If a |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
105 slot contains an integer, then prospective values' tags must be |
|
20995
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
106 equal to that integer (except nil is always allowed). |
|
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
107 When a tag does not match, the function |
|
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
108 buffer_slot_type_mismatch will signal an error. |
|
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
109 |
|
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
110 If a slot here contains -1, the corresponding variable is read-only. */ |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
111 struct buffer buffer_local_types; |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
112 |
|
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
113 /* 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
|
114 are permanent locals. */ |
|
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
115 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
|
116 |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
117 /* Number of per-buffer variables used. */ |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
118 |
|
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
119 int last_per_buffer_idx; |
|
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
120 |
| 333 | 121 Lisp_Object Fset_buffer (); |
| 392 | 122 void set_buffer_internal (); |
|
11889
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
123 void set_buffer_internal_1 (); |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
124 static void call_overlay_mod_hooks (); |
|
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
125 static void swap_out_buffer_local_variables (); |
|
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
126 static void reset_buffer_local_variables (); |
| 333 | 127 |
| 128 /* Alist of all buffer names vs the buffers. */ | |
| 129 /* This used to be a variable, but is no longer, | |
| 130 to prevent lossage due to user rplac'ing this alist or its elements. */ | |
| 131 Lisp_Object Vbuffer_alist; | |
| 132 | |
| 133 /* 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
|
134 Lisp_Object Vbefore_change_functions; |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
135 Lisp_Object Vafter_change_functions; |
| 333 | 136 |
|
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
137 Lisp_Object Vtransient_mark_mode; |
|
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
138 |
|
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
139 /* 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
|
140 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
|
141 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
|
142 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
|
143 |
|
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
144 /* 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
|
145 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
|
146 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
|
147 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
|
148 |
|
72299
e97bfa736263
* buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents:
71968
diff
changeset
|
149 /* 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
|
150 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
|
151 |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
152 /* List of functions to call before changing an unmodified buffer. */ |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
153 Lisp_Object Vfirst_change_hook; |
|
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
154 |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
155 Lisp_Object Qfirst_change_hook; |
|
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
156 Lisp_Object Qbefore_change_functions; |
|
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
157 Lisp_Object Qafter_change_functions; |
| 48635 | 158 Lisp_Object Qucs_set_table_for_input; |
| 333 | 159 |
|
23399
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
160 /* If nonzero, all modification hooks are suppressed. */ |
|
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
161 int inhibit_modification_hooks; |
|
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
162 |
| 333 | 163 Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; |
| 164 | |
| 165 Lisp_Object Qprotected_field; | |
| 166 | |
| 167 Lisp_Object QSFundamental; /* A string "Fundamental" */ | |
| 168 | |
| 169 Lisp_Object Qkill_buffer_hook; | |
| 170 | |
| 5433 | 171 Lisp_Object Qget_file_buffer; |
| 172 | |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
173 Lisp_Object Qoverlayp; |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
174 |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
175 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
|
176 |
|
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
177 Lisp_Object Qmodification_hooks; |
|
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
178 Lisp_Object Qinsert_in_front_hooks; |
|
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
179 Lisp_Object Qinsert_behind_hooks; |
|
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
180 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
181 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
|
182 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
|
183 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
|
184 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
|
185 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
|
186 |
| 88547 | 187 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
|
188 |
| 333 | 189 /* For debugging; temporary. See set_buffer_internal. */ |
| 190 /* Lisp_Object Qlisp_mode, Vcheck_symbol; */ | |
| 191 | |
|
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
192 void |
| 333 | 193 nsberror (spec) |
| 194 Lisp_Object spec; | |
| 195 { | |
|
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
196 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
|
197 error ("No buffer named %s", SDATA (spec)); |
| 333 | 198 error ("Invalid buffer argument"); |
| 199 } | |
| 200 | |
|
14506
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
201 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
|
202 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
|
203 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
|
204 (object) |
|
14506
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
205 Lisp_Object object; |
|
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
206 { |
|
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
207 return ((BUFFERP (object) && ! NILP (XBUFFER (object)->name)) |
|
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
208 ? Qt : Qnil); |
|
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
209 } |
|
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
210 |
|
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
211 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
|
212 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
|
213 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
|
214 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
|
215 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
|
216 (frame) |
|
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
217 Lisp_Object frame; |
| 333 | 218 { |
|
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
219 Lisp_Object framelist, general; |
|
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
220 general = Fmapcar (Qcdr, Vbuffer_alist); |
|
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
221 |
|
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
222 if (FRAMEP (frame)) |
|
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
223 { |
|
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
224 Lisp_Object tail; |
|
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
225 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
226 CHECK_FRAME (frame); |
|
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
227 |
|
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
228 framelist = Fcopy_sequence (XFRAME (frame)->buffer_list); |
|
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
229 |
|
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
230 /* Remove from GENERAL any buffer that duplicates one in FRAMELIST. */ |
|
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
231 tail = framelist; |
|
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
232 while (! NILP (tail)) |
|
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
233 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
234 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
|
235 tail = XCDR (tail); |
|
18455
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
236 } |
|
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
237 return nconc2 (framelist, general); |
|
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
238 } |
|
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
239 |
|
9f5626727351
(Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
18178
diff
changeset
|
240 return general; |
| 333 | 241 } |
| 242 | |
|
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
243 /* 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
|
244 (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
|
245 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
|
246 |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
247 static Lisp_Object |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
248 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
|
249 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
|
250 Lisp_Object list; |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
251 { |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
252 register Lisp_Object tail; |
|
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
253 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
|
254 { |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
255 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
|
256 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
|
257 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
|
258 if (!NILP (tem)) |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
259 return elt; |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
260 } |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
261 return Qnil; |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
262 } |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
263 |
| 333 | 264 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
|
265 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
|
266 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
|
267 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
|
268 (name) |
| 333 | 269 register Lisp_Object name; |
| 270 { | |
|
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
271 if (BUFFERP (name)) |
| 333 | 272 return name; |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
273 CHECK_STRING (name); |
| 333 | 274 |
|
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
275 return Fcdr (assoc_ignore_text_properties (name, Vbuffer_alist)); |
| 333 | 276 } |
| 277 | |
| 278 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
|
279 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
|
280 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
|
281 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
|
282 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
|
283 (filename) |
| 333 | 284 register Lisp_Object filename; |
| 285 { | |
| 286 register Lisp_Object tail, buf, tem; | |
| 5433 | 287 Lisp_Object handler; |
| 288 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
289 CHECK_STRING (filename); |
| 333 | 290 filename = Fexpand_file_name (filename, Qnil); |
| 291 | |
| 5433 | 292 /* If the file name has special constructs in it, |
| 293 call the corresponding file handler. */ | |
|
7028
6915bf781a38
Pass operation to Ffind_file_name_handler.
Karl Heuer <kwzh@gnu.org>
parents:
6785
diff
changeset
|
294 handler = Ffind_file_name_handler (filename, Qget_file_buffer); |
| 5433 | 295 if (!NILP (handler)) |
| 296 return call2 (handler, Qget_file_buffer, filename); | |
| 297 | |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
298 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
| 333 | 299 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
300 buf = Fcdr (XCAR (tail)); |
|
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
301 if (!BUFFERP (buf)) continue; |
|
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
302 if (!STRINGP (XBUFFER (buf)->filename)) continue; |
| 333 | 303 tem = Fstring_equal (XBUFFER (buf)->filename, filename); |
| 485 | 304 if (!NILP (tem)) |
| 333 | 305 return buf; |
| 306 } | |
| 307 return Qnil; | |
| 308 } | |
| 309 | |
|
12810
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
310 Lisp_Object |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
311 get_truename_buffer (filename) |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
312 register Lisp_Object filename; |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
313 { |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
314 register Lisp_Object tail, buf, tem; |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
315 |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
316 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
|
317 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
318 buf = Fcdr (XCAR (tail)); |
|
12810
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
319 if (!BUFFERP (buf)) continue; |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
320 if (!STRINGP (XBUFFER (buf)->file_truename)) continue; |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
321 tem = Fstring_equal (XBUFFER (buf)->file_truename, filename); |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
322 if (!NILP (tem)) |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
323 return buf; |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
324 } |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
325 return Qnil; |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
326 } |
|
bd486675e103
(get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12785
diff
changeset
|
327 |
| 333 | 328 /* Incremented for each buffer created, to assign the buffer number. */ |
| 329 int buffer_count; | |
| 330 | |
| 331 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
|
332 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
|
333 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
|
334 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
|
335 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
|
336 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
|
337 (name) |
| 333 | 338 register Lisp_Object name; |
| 339 { | |
|
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
340 register Lisp_Object buf; |
| 333 | 341 register struct buffer *b; |
| 342 | |
| 343 buf = Fget_buffer (name); | |
| 485 | 344 if (!NILP (buf)) |
| 333 | 345 return buf; |
| 346 | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
347 if (SCHARS (name) == 0) |
|
6697
28e36f59e856
(Fget_buffer_create): Disallow empty string.
Karl Heuer <kwzh@gnu.org>
parents:
6675
diff
changeset
|
348 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
|
349 |
|
27739
e272d652619a
(Fget_buffer_create, Fmake_indirect_buffer): Use
Gerd Moellmann <gerd@gnu.org>
parents:
27480
diff
changeset
|
350 b = (struct buffer *) allocate_buffer (); |
| 333 | 351 |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
352 b->size = sizeof (struct buffer) / sizeof (EMACS_INT); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
353 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
354 /* 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
|
355 b->text = &b->own_text; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
356 b->base_buffer = 0; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
357 |
| 333 | 358 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
|
359 BLOCK_INPUT; |
| 17022 | 360 /* We allocate extra 1-byte at the tail and keep it always '\0' for |
| 361 anchoring a search. */ | |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
362 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
|
363 UNBLOCK_INPUT; |
| 333 | 364 if (! BUF_BEG_ADDR (b)) |
|
10668
acbd9fab366a
(Fget_buffer_create): Call buffer_memory_full.
Richard M. Stallman <rms@gnu.org>
parents:
10611
diff
changeset
|
365 buffer_memory_full (); |
| 333 | 366 |
|
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
367 BUF_PT (b) = BEG; |
|
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
368 BUF_GPT (b) = BEG; |
|
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
369 BUF_BEGV (b) = BEG; |
|
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
370 BUF_ZV (b) = BEG; |
|
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
371 BUF_Z (b) = BEG; |
|
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
372 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
|
373 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
|
374 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
|
375 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
|
376 BUF_Z_BYTE (b) = BEG_BYTE; |
| 333 | 377 BUF_MODIFF (b) = 1; |
|
72592
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
378 BUF_CHARS_MODIFF (b) = 1; |
|
16213
3b8851bebc76
(Fget_buffer_create): Initialize BUF_OVERLAY_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents:
16193
diff
changeset
|
379 BUF_OVERLAY_MODIFF (b) = 1; |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
380 BUF_SAVE_MODIFF (b) = 1; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
381 BUF_INTERVALS (b) = 0; |
|
25368
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
382 BUF_UNCHANGED_MODIFIED (b) = 1; |
|
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
383 BUF_OVERLAY_UNCHANGED_MODIFIED (b) = 1; |
|
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
384 BUF_END_UNCHANGED (b) = 0; |
|
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
385 BUF_BEG_UNCHANGED (b) = 0; |
| 17022 | 386 *(BUF_GPT_ADDR (b)) = *(BUF_Z_ADDR (b)) = 0; /* Put an anchor '\0'. */ |
| 333 | 387 |
|
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
388 b->newline_cache = 0; |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
389 b->width_run_cache = 0; |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
390 b->width_table = Qnil; |
|
25368
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
391 b->prevent_redisplay_optimizations_p = 1; |
|
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
392 |
| 333 | 393 /* Put this on the chain of all buffers including killed ones. */ |
| 394 b->next = all_buffers; | |
| 395 all_buffers = b; | |
| 396 | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
397 /* An ordinary buffer normally doesn't need markers |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
398 to handle BEGV and ZV. */ |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
399 b->pt_marker = Qnil; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
400 b->begv_marker = Qnil; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
401 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
|
402 |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
403 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
|
404 STRING_SET_INTERVALS (name, NULL_INTERVAL); |
| 333 | 405 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
|
406 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
407 if (SREF (name, 0) != ' ') |
| 333 | 408 b->undo_list = Qnil; |
| 409 else | |
| 410 b->undo_list = Qt; | |
| 411 | |
| 412 reset_buffer (b); | |
|
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
413 reset_buffer_local_variables (b, 1); |
| 333 | 414 |
|
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
|
415 b->mark = Fmake_marker (); |
|
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
416 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
|
417 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
|
418 |
| 333 | 419 /* 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
|
420 XSETBUFFER (buf, b); |
| 333 | 421 Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil)); |
| 422 | |
| 75784 | 423 /* An error in calling the function here (should someone redefine it) |
| 51318 | 424 can lead to infinite regress until you run out of stack. rms |
| 425 says that's not worth protecting against. */ | |
| 48635 | 426 if (!NILP (Ffboundp (Qucs_set_table_for_input))) |
| 51318 | 427 /* buf is on buffer-alist, so no gcpro. */ |
| 48635 | 428 call1 (Qucs_set_table_for_input, buf); |
| 429 | |
|
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
430 return buf; |
| 333 | 431 } |
| 432 | |
|
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
433 |
|
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
434 /* 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
|
435 LIST, but for buffer B. */ |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
436 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
437 static struct Lisp_Overlay * |
|
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
438 copy_overlays (b, list) |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
439 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
|
440 struct Lisp_Overlay *list; |
|
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
441 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
442 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
|
443 struct Lisp_Overlay *result = NULL, *tail = NULL; |
|
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
444 |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
445 XSETBUFFER (buffer, b); |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
446 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
447 for (; list; list = list->next) |
|
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
448 { |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
449 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
|
450 EMACS_INT charpos; |
|
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
451 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
452 XSETMISC (old_overlay, list); |
|
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
453 charpos = marker_position (OVERLAY_START (old_overlay)); |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
454 start = Fmake_marker (); |
|
37950
f01f454ea6bf
(copy_overlays): Make ENABLE_CHECKING happy.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37752
diff
changeset
|
455 Fset_marker (start, make_number (charpos), buffer); |
|
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
456 XMARKER (start)->insertion_type |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
457 = XMARKER (OVERLAY_START (old_overlay))->insertion_type; |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
458 |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
459 charpos = marker_position (OVERLAY_END (old_overlay)); |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
460 end = Fmake_marker (); |
|
37950
f01f454ea6bf
(copy_overlays): Make ENABLE_CHECKING happy.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37752
diff
changeset
|
461 Fset_marker (end, make_number (charpos), buffer); |
|
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
462 XMARKER (end)->insertion_type |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
463 = XMARKER (OVERLAY_END (old_overlay))->insertion_type; |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
464 |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
465 overlay = allocate_misc (); |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
466 XMISCTYPE (overlay) = Lisp_Misc_Overlay; |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
467 OVERLAY_START (overlay) = start; |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
468 OVERLAY_END (overlay) = end; |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
469 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
|
470 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
|
471 |
|
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
472 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
|
473 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
|
474 else |
|
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
475 result = tail = XOVERLAY (overlay); |
|
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
476 } |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
477 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
478 return result; |
|
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
479 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
480 |
|
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
481 |
|
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
482 /* Clone per-buffer values of buffer FROM. |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
483 |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
484 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
|
485 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
|
486 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
|
487 copied. */ |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
488 |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
489 static void |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
490 clone_per_buffer_values (from, to) |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
491 struct buffer *from, *to; |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
492 { |
|
66233
e93aafd2c52b
(clone_per_buffer_values): Remove unused var tem.
Kim F. Storm <storm@cua.dk>
parents:
66043
diff
changeset
|
493 Lisp_Object to_buffer; |
|
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
494 int offset; |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
495 |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
496 XSETBUFFER (to_buffer, to); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
497 |
|
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
498 for (offset = PER_BUFFER_VAR_OFFSET (name) + sizeof (Lisp_Object); |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
499 offset < sizeof *to; |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
500 offset += sizeof (Lisp_Object)) |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
501 { |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
502 Lisp_Object obj; |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
503 |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
504 obj = PER_BUFFER_VALUE (from, offset); |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
505 if (MARKERP (obj)) |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
506 { |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
507 struct Lisp_Marker *m = XMARKER (obj); |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
508 obj = Fmake_marker (); |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
509 XMARKER (obj)->insertion_type = m->insertion_type; |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
510 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
|
511 } |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
512 |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
513 PER_BUFFER_VALUE (to, offset) = obj; |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
514 } |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
515 |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
516 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
|
517 |
|
37752
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
518 to->overlays_before = copy_overlays (to, from->overlays_before); |
|
1085e1cfebaf
(copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37463
diff
changeset
|
519 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
|
520 |
|
60683
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
521 /* 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
|
522 and install that in TO. */ |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
523 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
|
524 } |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
525 |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
526 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
|
527 2, 3, |
|
11838
92a61e91ec05
(Fmake_indirect_buffer): Fix interactive spec.
Karl Heuer <kwzh@gnu.org>
parents:
11823
diff
changeset
|
528 "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
|
529 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
|
530 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
|
531 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
|
532 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
|
533 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
|
534 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
|
535 (base_buffer, name, clone) |
|
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
536 Lisp_Object base_buffer, name, clone; |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
537 { |
|
54834
9533e29b87e8
(Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents:
54819
diff
changeset
|
538 Lisp_Object buf, tem; |
|
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
539 struct buffer *b; |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
540 |
|
54819
8df5ed349fc2
(Fmake_indirect_buffer): Check that NAME is a string.
Andreas Schwab <schwab@suse.de>
parents:
54786
diff
changeset
|
541 CHECK_STRING (name); |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
542 buf = Fget_buffer (name); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
543 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
|
544 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
|
545 |
|
54834
9533e29b87e8
(Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents:
54819
diff
changeset
|
546 tem = base_buffer; |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
547 base_buffer = Fget_buffer (base_buffer); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
548 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
|
549 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
|
550 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
|
551 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
|
552 |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
553 if (SCHARS (name) == 0) |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
554 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
|
555 |
|
27739
e272d652619a
(Fget_buffer_create, Fmake_indirect_buffer): Use
Gerd Moellmann <gerd@gnu.org>
parents:
27480
diff
changeset
|
556 b = (struct buffer *) allocate_buffer (); |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
557 b->size = sizeof (struct buffer) / sizeof (EMACS_INT); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
558 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
559 if (XBUFFER (base_buffer)->base_buffer) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
560 b->base_buffer = XBUFFER (base_buffer)->base_buffer; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
561 else |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
562 b->base_buffer = XBUFFER (base_buffer); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
563 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
564 /* Use the base buffer's text object. */ |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
565 b->text = b->base_buffer->text; |
|
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 BUF_BEGV (b) = BUF_BEGV (b->base_buffer); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
568 BUF_ZV (b) = BUF_ZV (b->base_buffer); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
569 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
|
570 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
|
571 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
|
572 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
|
573 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
574 b->newline_cache = 0; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
575 b->width_run_cache = 0; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
576 b->width_table = Qnil; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
577 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
578 /* 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
|
579 b->next = all_buffers; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
580 all_buffers = b; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
581 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
582 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
|
583 STRING_SET_INTERVALS (name, NULL_INTERVAL); |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
584 b->name = name; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
585 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
586 reset_buffer (b); |
|
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
587 reset_buffer_local_variables (b, 1); |
|
10314
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 /* 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
|
590 XSETBUFFER (buf, b); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
591 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
|
592 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
593 b->mark = Fmake_marker (); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
594 b->name = name; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
595 |
|
24604
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
596 /* 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
|
597 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
|
598 |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
599 /* 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
|
600 if (NILP (b->base_buffer->pt_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
601 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
602 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
|
603 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
|
604 BUF_PT (b->base_buffer), |
|
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
605 BUF_PT_BYTE (b->base_buffer)); |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
606 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
607 if (NILP (b->base_buffer->begv_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
608 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
609 b->base_buffer->begv_marker = Fmake_marker (); |
|
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
610 set_marker_both (b->base_buffer->begv_marker, base_buffer, |
|
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
611 BUF_BEGV (b->base_buffer), |
|
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
612 BUF_BEGV_BYTE (b->base_buffer)); |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
613 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
614 if (NILP (b->base_buffer->zv_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
615 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
616 b->base_buffer->zv_marker = Fmake_marker (); |
|
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
617 set_marker_both (b->base_buffer->zv_marker, base_buffer, |
|
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
618 BUF_ZV (b->base_buffer), |
|
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
619 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
|
620 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
|
621 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
622 |
|
28625
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
623 if (NILP (clone)) |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
624 { |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
625 /* Give the indirect buffer markers for its narrowing. */ |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
626 b->pt_marker = Fmake_marker (); |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
627 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
|
628 b->begv_marker = Fmake_marker (); |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
629 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
|
630 b->zv_marker = Fmake_marker (); |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
631 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
|
632 XMARKER (b->zv_marker)->insertion_type = 1; |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
633 } |
|
5d68443d3df1
(clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28518
diff
changeset
|
634 else |
|
61445
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
635 { |
|
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
636 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
|
637 |
|
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
638 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
|
639 b->filename = Qnil; |
|
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
640 b->file_truename = Qnil; |
|
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
641 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
|
642 b->backed_up = Qnil; |
|
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
643 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
|
644 set_buffer_internal_1 (b); |
|
9ee6093ffeaf
(Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents:
60683
diff
changeset
|
645 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
|
646 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
|
647 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
|
648 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
|
649 } |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
650 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
651 return buf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
652 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
653 |
|
52012
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
654 void |
|
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
655 delete_all_overlays (b) |
|
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
656 struct buffer *b; |
|
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
657 { |
|
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
658 Lisp_Object overlay; |
|
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
659 |
|
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
660 /* `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
|
661 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
|
662 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
|
663 them any more. */ |
|
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
664 while (b->overlays_before) |
|
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
665 { |
|
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
666 XSETMISC (overlay, b->overlays_before); |
|
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
667 Fdelete_overlay (overlay); |
|
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 while (b->overlays_after) |
|
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
670 { |
|
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
671 XSETMISC (overlay, b->overlays_after); |
|
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
672 Fdelete_overlay (overlay); |
|
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 eassert (b->overlays_before == NULL); |
|
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
675 eassert (b->overlays_after == NULL); |
|
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 |
|
8873
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
678 /* 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
|
679 and local variables. |
|
52012
d116f572d76b
(delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51939
diff
changeset
|
680 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
|
681 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
|
682 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
|
683 claims it doesn't belong to it. */ |
| 333 | 684 |
| 685 void | |
| 686 reset_buffer (b) | |
| 687 register struct buffer *b; | |
| 688 { | |
| 689 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
|
690 b->file_truename = Qnil; |
| 333 | 691 b->directory = (current_buffer) ? current_buffer->directory : Qnil; |
| 692 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
|
693 XSETFASTINT (b->save_length, 0); |
| 333 | 694 b->last_window_start = 1; |
|
17566
7ed40081342f
(reset_buffer): Initialize clip_changed field.
Richard M. Stallman <rms@gnu.org>
parents:
17238
diff
changeset
|
695 /* 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
|
696 b->clip_changed = 0; |
|
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
697 b->prevent_redisplay_optimizations_p = 1; |
| 333 | 698 b->backed_up = Qnil; |
| 699 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
|
700 b->auto_save_failure_time = -1; |
| 333 | 701 b->auto_save_file_name = Qnil; |
| 702 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
|
703 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
|
704 b->overlays_after = NULL; |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
705 b->overlay_center = BEG; |
|
3242
f873e6b9af52
(reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents:
3226
diff
changeset
|
706 b->mark_active = Qnil; |
|
10561
53f34c870201
(init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
10505
diff
changeset
|
707 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
|
708 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
|
709 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
|
710 b->last_selected_window = Qnil; |
|
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
711 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
|
712 b->display_time = Qnil; |
|
20995
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
713 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
|
714 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
|
715 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
|
716 |
|
11a505aa1322
(reset_buffer): Initialize `display_error_modiff'.
Richard M. Stallman <rms@gnu.org>
parents:
41524
diff
changeset
|
717 b->display_error_modiff = 0; |
| 333 | 718 } |
| 719 | |
|
8873
b58ea8cae183
(reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents:
8839
diff
changeset
|
720 /* 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
|
721 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
|
722 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
|
723 Instead, use Fkill_all_local_variables. |
|
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
724 |
|
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
725 If PERMANENT_TOO is 1, then we reset permanent built-in |
|
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
726 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
|
727 we preserve those. */ |
|
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
728 |
|
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
729 static void |
|
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
730 reset_buffer_local_variables (b, permanent_too) |
| 333 | 731 register struct buffer *b; |
|
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
732 int permanent_too; |
| 333 | 733 { |
| 734 register int offset; | |
|
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
735 int i; |
| 333 | 736 |
| 737 /* Reset the major mode to Fundamental, together with all the | |
| 738 things that depend on the major mode. | |
| 739 default-major-mode is handled at a higher level. | |
| 740 We ignore it here. */ | |
| 741 b->major_mode = Qfundamental_mode; | |
| 742 b->keymap = Qnil; | |
| 743 b->mode_name = QSFundamental; | |
| 744 b->minor_modes = Qnil; | |
|
13270
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
745 |
|
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
746 /* 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
|
747 fix up its insides first. */ |
|
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
748 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
|
749 && 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
|
750 && 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
|
751 Fset_standard_case_table (Vascii_downcase_table); |
|
76e69b0af94d
(reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents:
13263
diff
changeset
|
752 |
| 333 | 753 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
|
754 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
|
755 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
|
756 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
|
757 b->invisibility_spec = Qt; |
|
15786
f2d0e8928d57
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15776
diff
changeset
|
758 #ifndef DOS_NT |
|
f2d0e8928d57
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15776
diff
changeset
|
759 b->buffer_file_type = Qnil; |
|
f2d0e8928d57
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15776
diff
changeset
|
760 #endif |
|
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
761 |
|
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
762 /* Reset all (or most) per-buffer variables to their defaults. */ |
| 333 | 763 b->local_var_alist = Qnil; |
|
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
764 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
|
765 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
|
766 SET_PER_BUFFER_VALUE_P (b, i, 0); |
| 333 | 767 |
| 768 /* For each slot that has a default value, | |
| 769 copy that into the slot. */ | |
| 770 | |
|
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
771 for (offset = PER_BUFFER_VAR_OFFSET (name); |
|
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
772 offset < sizeof *b; |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
773 offset += sizeof (Lisp_Object)) |
|
9362
f6dc29e7e986
(init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents:
9335
diff
changeset
|
774 { |
|
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
775 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
|
776 if ((idx > 0 |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
777 && (permanent_too |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
778 || buffer_permanent_local_flags[idx] == 0)) |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
779 /* Is -2 used anywhere? */ |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
780 || idx == -2) |
|
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
781 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
|
782 } |
| 333 | 783 } |
| 784 | |
| 392 | 785 /* We split this away from generate-new-buffer, because rename-buffer |
| 786 and set-visited-file-name ought to be able to use this to really | |
| 787 rename the buffer properly. */ | |
| 788 | |
| 789 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
|
790 1, 2, 0, |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
791 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
|
792 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
|
793 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
|
794 \(starting at 2) until an unused name is found, and then return that name. |
| 75784 | 795 Optional second argument IGNORE specifies a name that is okay to use (if |
| 796 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
|
797 (name, ignore) |
|
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
798 register Lisp_Object name, ignore; |
| 333 | 799 { |
| 800 register Lisp_Object gentemp, tem; | |
| 801 int count; | |
| 802 char number[10]; | |
| 803 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
804 CHECK_STRING (name); |
| 333 | 805 |
|
54786
870b7a6bffb8
(Fgenerate_new_buffer_name): Return NAME argument if IGNORE argument
Luc Teirlinck <teirllm@auburn.edu>
parents:
54772
diff
changeset
|
806 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
|
807 if (!NILP (tem)) |
|
870b7a6bffb8
(Fgenerate_new_buffer_name): Return NAME argument if IGNORE argument
Luc Teirlinck <teirllm@auburn.edu>
parents:
54772
diff
changeset
|
808 return name; |
| 333 | 809 tem = Fget_buffer (name); |
| 485 | 810 if (NILP (tem)) |
| 392 | 811 return name; |
| 333 | 812 |
| 813 count = 1; | |
| 814 while (1) | |
| 815 { | |
| 816 sprintf (number, "<%d>", ++count); | |
| 817 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
|
818 tem = Fstring_equal (gentemp, ignore); |
|
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
819 if (!NILP (tem)) |
|
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
820 return gentemp; |
| 333 | 821 tem = Fget_buffer (gentemp); |
| 485 | 822 if (NILP (tem)) |
| 392 | 823 return gentemp; |
| 333 | 824 } |
| 825 } | |
| 826 | |
| 827 | |
| 828 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
|
829 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
|
830 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
|
831 (buffer) |
| 333 | 832 register Lisp_Object buffer; |
| 833 { | |
| 485 | 834 if (NILP (buffer)) |
| 333 | 835 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
|
836 CHECK_BUFFER (buffer); |
| 333 | 837 return XBUFFER (buffer)->name; |
| 838 } | |
| 839 | |
| 840 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
|
841 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
|
842 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
|
843 (buffer) |
| 333 | 844 register Lisp_Object buffer; |
| 845 { | |
| 485 | 846 if (NILP (buffer)) |
| 333 | 847 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
|
848 CHECK_BUFFER (buffer); |
| 333 | 849 return XBUFFER (buffer)->filename; |
| 850 } | |
| 851 | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
852 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
|
853 0, 1, 0, |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
854 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
|
855 If BUFFER is not indirect, return nil. |
|
95d283fb2215
(Fbuffer_base_buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54834
diff
changeset
|
856 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
|
857 (buffer) |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
858 register Lisp_Object buffer; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
859 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
860 struct buffer *base; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
861 Lisp_Object base_buffer; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
862 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
863 if (NILP (buffer)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
864 base = current_buffer->base_buffer; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
865 else |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
866 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
867 CHECK_BUFFER (buffer); |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
868 base = XBUFFER (buffer)->base_buffer; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
869 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
870 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
871 if (! base) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
872 return Qnil; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
873 XSETBUFFER (base_buffer, base); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
874 return base_buffer; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
875 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
876 |
|
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
877 DEFUN ("buffer-local-value", Fbuffer_local_value, |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
878 Sbuffer_local_value, 2, 2, 0, |
|
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
879 doc: /* Return the value of VARIABLE in BUFFER. |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
880 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
|
881 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
|
882 (variable, buffer) |
|
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
883 register Lisp_Object variable; |
|
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
884 register Lisp_Object buffer; |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
885 { |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
886 register struct buffer *buf; |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
887 register Lisp_Object result; |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
888 |
|
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
889 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
|
890 CHECK_BUFFER (buffer); |
|
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
891 buf = XBUFFER (buffer); |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
892 |
|
62855
5ef5c45c0187
(Fbuffer_local_value): Call indirect_variable.
Richard M. Stallman <rms@gnu.org>
parents:
62793
diff
changeset
|
893 if (SYMBOLP (variable)) |
|
5ef5c45c0187
(Fbuffer_local_value): Call indirect_variable.
Richard M. Stallman <rms@gnu.org>
parents:
62793
diff
changeset
|
894 variable = indirect_variable (variable); |
|
5ef5c45c0187
(Fbuffer_local_value): Call indirect_variable.
Richard M. Stallman <rms@gnu.org>
parents:
62793
diff
changeset
|
895 |
|
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
896 /* 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
|
897 result = Fassoc (variable, buf->local_var_alist); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
898 if (NILP (result)) |
|
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
899 { |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
900 int offset, idx; |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
901 int found = 0; |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
902 |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
903 /* Look in special slots */ |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
904 for (offset = PER_BUFFER_VAR_OFFSET (name); |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
905 offset < sizeof (struct buffer); |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
906 /* sizeof EMACS_INT == sizeof Lisp_Object */ |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
907 offset += (sizeof (EMACS_INT))) |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
908 { |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
909 idx = PER_BUFFER_IDX (offset); |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
910 if ((idx == -1 || PER_BUFFER_VALUE_P (buf, idx)) |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
911 && 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
|
912 && EQ (PER_BUFFER_SYMBOL (offset), variable)) |
|
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
913 { |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
914 result = PER_BUFFER_VALUE (buf, offset); |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
915 found = 1; |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
916 break; |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
917 } |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
918 } |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
919 |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
920 if (!found) |
|
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
921 result = Fdefault_value (variable); |
|
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
922 } |
|
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
923 else |
|
46199
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
924 { |
|
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
925 Lisp_Object valcontents; |
|
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
926 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
|
927 |
|
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
928 /* What binding is loaded right now? */ |
|
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
929 valcontents = SYMBOL_VALUE (variable); |
|
46199
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
930 current_alist_element |
|
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
931 = 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
|
932 |
|
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
933 /* 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
|
934 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
|
935 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
|
936 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
|
937 |
|
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
938 Fsetcdr (current_alist_element, |
|
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
939 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
|
940 |
|
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
941 /* 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
|
942 result = XCDR (result); |
|
ca604a52d267
(Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents:
46016
diff
changeset
|
943 } |
|
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
944 |
|
71968
b0505e901bff
(Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents:
70931
diff
changeset
|
945 if (!EQ (result, Qunbound)) |
|
b0505e901bff
(Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents:
70931
diff
changeset
|
946 return result; |
|
b0505e901bff
(Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents:
70931
diff
changeset
|
947 |
|
b0505e901bff
(Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents:
70931
diff
changeset
|
948 xsignal1 (Qvoid_variable, variable); |
|
40725
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 |
|
60683
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
951 /* 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
|
952 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
|
953 in special slots in the buffer object. */ |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
954 |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
955 static Lisp_Object |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
956 buffer_lisp_local_variables (buf) |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
957 struct buffer *buf; |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
958 { |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
959 Lisp_Object result = Qnil; |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
960 register Lisp_Object tail; |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
961 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
|
962 { |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
963 Lisp_Object val, elt; |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
964 |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
965 elt = XCAR (tail); |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
966 |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
967 /* 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
|
968 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
|
969 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
|
970 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
|
971 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
|
972 val = find_symbol_value (XCAR (elt)); |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
973 /* 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
|
974 if (buf != current_buffer) |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
975 val = XCDR (elt); |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
976 |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
977 /* 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
|
978 if (EQ (val, Qunbound)) |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
979 result = Fcons (XCAR (elt), result); |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
980 /* Otherwise, put (symbol . value) in the list. */ |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
981 else |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
982 result = Fcons (Fcons (XCAR (elt), val), result); |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
983 } |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
984 |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
985 return result; |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
986 } |
|
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
987 |
| 333 | 988 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
|
989 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
|
990 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
|
991 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
|
992 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
|
993 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
|
994 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
|
995 (buffer) |
| 333 | 996 register Lisp_Object buffer; |
| 997 { | |
| 998 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
|
999 register Lisp_Object result; |
| 333 | 1000 |
| 485 | 1001 if (NILP (buffer)) |
| 333 | 1002 buf = current_buffer; |
| 1003 else | |
| 1004 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
1005 CHECK_BUFFER (buffer); |
| 333 | 1006 buf = XBUFFER (buffer); |
| 1007 } | |
| 1008 | |
|
60683
d2f6fa8790f3
(buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents:
60248
diff
changeset
|
1009 result = buffer_lisp_local_variables (buf); |
| 333 | 1010 |
| 1011 /* Add on all the variables stored in special slots. */ | |
| 1012 { | |
|
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
1013 int offset, idx; |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
1014 |
|
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
1015 for (offset = PER_BUFFER_VAR_OFFSET (name); |
| 333 | 1016 offset < sizeof (struct buffer); |
|
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
1017 /* sizeof EMACS_INT == sizeof Lisp_Object */ |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
1018 offset += (sizeof (EMACS_INT))) |
| 333 | 1019 { |
|
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
1020 idx = PER_BUFFER_IDX (offset); |
|
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
1021 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
|
1022 && SYMBOLP (PER_BUFFER_SYMBOL (offset))) |
|
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
1023 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
|
1024 PER_BUFFER_VALUE (buf, offset)), |
|
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
1025 result); |
| 333 | 1026 } |
| 1027 } | |
|
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
1028 |
|
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
1029 return result; |
| 333 | 1030 } |
| 1031 | |
| 1032 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
|
1033 0, 1, 0, |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1034 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
|
1035 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
|
1036 (buffer) |
| 333 | 1037 register Lisp_Object buffer; |
| 1038 { | |
| 1039 register struct buffer *buf; | |
| 485 | 1040 if (NILP (buffer)) |
| 333 | 1041 buf = current_buffer; |
| 1042 else | |
| 1043 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
1044 CHECK_BUFFER (buffer); |
| 333 | 1045 buf = XBUFFER (buffer); |
| 1046 } | |
| 1047 | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1048 return BUF_SAVE_MODIFF (buf) < BUF_MODIFF (buf) ? Qt : Qnil; |
| 333 | 1049 } |
| 1050 | |
| 1051 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
|
1052 1, 1, 0, |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1053 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
|
1054 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
|
1055 (flag) |
| 333 | 1056 register Lisp_Object flag; |
| 1057 { | |
| 1058 register int already; | |
| 1059 register Lisp_Object fn; | |
|
28207
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1060 Lisp_Object buffer, window; |
| 333 | 1061 |
| 1062 #ifdef CLASH_DETECTION | |
| 1063 /* If buffer becoming modified, lock the file. | |
| 1064 If buffer becoming unmodified, unlock the file. */ | |
| 1065 | |
|
11659
f9b6e65774e7
(Fset_buffer_modified_p): Use the truename for locking.
Richard M. Stallman <rms@gnu.org>
parents:
11473
diff
changeset
|
1066 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
|
1067 /* 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
|
1068 if (!NILP (fn) && ! NILP (current_buffer->filename)) |
| 333 | 1069 { |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1070 already = SAVE_MODIFF < MODIFF; |
| 485 | 1071 if (!already && !NILP (flag)) |
| 333 | 1072 lock_file (fn); |
| 485 | 1073 else if (already && NILP (flag)) |
| 333 | 1074 unlock_file (fn); |
| 1075 } | |
| 1076 #endif /* CLASH_DETECTION */ | |
| 1077 | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1078 SAVE_MODIFF = NILP (flag) ? MODIFF : 0; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1079 |
|
28207
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1080 /* 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
|
1081 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
|
1082 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
|
1083 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
|
1084 (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
|
1085 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
|
1086 update_modes_lines unconditionally. |
|
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1087 |
|
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1088 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
|
1089 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
|
1090 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
|
1091 XSETBUFFER (buffer, current_buffer); |
|
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1092 window = Fget_buffer_window (buffer, Qt); |
|
fd3ece8a61e5
(Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents:
27739
diff
changeset
|
1093 if (WINDOWP (window)) |
|
35339
e5e6579e8308
(Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents:
34488
diff
changeset
|
1094 { |
|
e5e6579e8308
(Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents:
34488
diff
changeset
|
1095 ++update_mode_lines; |
|
e5e6579e8308
(Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents:
34488
diff
changeset
|
1096 current_buffer->prevent_redisplay_optimizations_p = 1; |
|
e5e6579e8308
(Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents:
34488
diff
changeset
|
1097 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1098 |
| 333 | 1099 return flag; |
| 1100 } | |
| 1101 | |
|
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1102 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
|
1103 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
|
1104 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
|
1105 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
|
1106 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
|
1107 (flag) |
|
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1108 Lisp_Object flag; |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1109 { |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1110 #ifdef CLASH_DETECTION |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1111 Lisp_Object fn; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1112 |
|
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1113 /* If buffer becoming modified, lock the file. |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1114 If buffer becoming unmodified, unlock the file. */ |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1115 |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1116 fn = current_buffer->file_truename; |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1117 /* 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
|
1118 if (!NILP (fn) && ! NILP (current_buffer->filename)) |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1119 { |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1120 int already = SAVE_MODIFF < MODIFF; |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1121 if (!already && !NILP (flag)) |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1122 lock_file (fn); |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1123 else if (already && NILP (flag)) |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1124 unlock_file (fn); |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1125 } |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1126 #endif /* CLASH_DETECTION */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1127 |
|
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1128 SAVE_MODIFF = NILP (flag) ? MODIFF : 0; |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1129 return flag; |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1130 } |
|
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
1131 |
| 333 | 1132 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
|
1133 0, 1, 0, |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1134 doc: /* Return BUFFER's tick counter, incremented for each change in text. |
| 75784 | 1135 Each buffer has a tick counter which is incremented each time the |
| 1136 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
|
1137 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
|
1138 (buffer) |
| 333 | 1139 register Lisp_Object buffer; |
| 1140 { | |
| 1141 register struct buffer *buf; | |
| 485 | 1142 if (NILP (buffer)) |
| 333 | 1143 buf = current_buffer; |
| 1144 else | |
| 1145 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
1146 CHECK_BUFFER (buffer); |
| 333 | 1147 buf = XBUFFER (buffer); |
| 1148 } | |
| 1149 | |
| 1150 return make_number (BUF_MODIFF (buf)); | |
| 1151 } | |
|
72592
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1152 |
|
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1153 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
|
1154 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
|
1155 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
|
1156 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
|
1157 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
|
1158 time text in that buffer is inserted or deleted. By comparing the |
| 72596 | 1159 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
|
1160 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
|
1161 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
|
1162 buffer as BUFFER. */) |
|
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1163 (buffer) |
|
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1164 register Lisp_Object buffer; |
|
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1165 { |
|
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1166 register struct buffer *buf; |
|
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1167 if (NILP (buffer)) |
|
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1168 buf = current_buffer; |
|
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1169 else |
|
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1170 { |
|
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1171 CHECK_BUFFER (buffer); |
|
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1172 buf = XBUFFER (buffer); |
|
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1173 } |
|
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1174 |
|
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
1175 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
|
1176 } |
| 333 | 1177 |
| 392 | 1178 DEFUN ("rename-buffer", Frename_buffer, Srename_buffer, 1, 2, |
|
5074
bbc2accd226a
Undo last change. SPC feeping at you is too annoying.
Roland McGrath <roland@gnu.org>
parents:
5073
diff
changeset
|
1179 "sRename buffer (to new name): \nP", |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1180 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
|
1181 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
|
1182 buffer named NEWNAME already exists. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1183 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
|
1184 `generate-new-buffer-name'. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1185 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
|
1186 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
|
1187 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
|
1188 (newname, unique) |
|
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1189 register Lisp_Object newname, unique; |
| 333 | 1190 { |
| 1191 register Lisp_Object tem, buf; | |
| 1192 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
1193 CHECK_STRING (newname); |
|
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1194 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1195 if (SCHARS (newname) == 0) |
|
7455
35657813817c
(Frename_buffer): Reject empty string as new name.
Richard M. Stallman <rms@gnu.org>
parents:
7434
diff
changeset
|
1196 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
|
1197 |
|
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1198 tem = Fget_buffer (newname); |
| 485 | 1199 if (!NILP (tem)) |
| 392 | 1200 { |
|
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
1201 /* 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
|
1202 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
|
1203 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
|
1204 (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
|
1205 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
|
1206 return current_buffer->name; |
|
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
1207 if (!NILP (unique)) |
|
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1208 newname = Fgenerate_new_buffer_name (newname, current_buffer->name); |
| 392 | 1209 else |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1210 error ("Buffer name `%s' is in use", SDATA (newname)); |
| 392 | 1211 } |
| 333 | 1212 |
|
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1213 current_buffer->name = newname; |
|
1707
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
1214 |
|
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
1215 /* 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
|
1216 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
|
1217 update_mode_lines++; |
|
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
1218 |
|
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
1219 XSETBUFFER (buf, current_buffer); |
|
9933
d3f22955b872
(Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents:
9922
diff
changeset
|
1220 Fsetcar (Frassq (buf, Vbuffer_alist), newname); |
|
8599
cf3233d70e94
(Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents:
8550
diff
changeset
|
1221 if (NILP (current_buffer->filename) |
|
cf3233d70e94
(Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents:
8550
diff
changeset
|
1222 && !NILP (current_buffer->auto_save_file_name)) |
| 333 | 1223 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
|
1224 /* 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
|
1225 return current_buffer->name; |
| 333 | 1226 } |
| 1227 | |
|
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1228 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
|
1229 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
|
1230 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
|
1231 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
|
1232 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
|
1233 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
|
1234 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
|
1235 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
|
1236 (buffer, visible_ok, frame) |
|
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1237 register Lisp_Object buffer, visible_ok, frame; |
| 333 | 1238 { |
|
14226
ad275aca6fc5
(Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1239 Lisp_Object Fset_buffer_major_mode (); |
|
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1240 register Lisp_Object tail, buf, notsogood, tem, pred, add_ons; |
| 333 | 1241 notsogood = Qnil; |
| 1242 | |
|
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1243 if (NILP (frame)) |
|
25664
832aeb9c3996
(Fother_buffer): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25653
diff
changeset
|
1244 frame = selected_frame; |
|
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1245 |
|
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1246 tail = Vbuffer_alist; |
|
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1247 pred = frame_buffer_predicate (frame); |
|
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1248 |
|
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1249 /* 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
|
1250 before other buffers. */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1251 |
|
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1252 tem = frame_buffer_list (frame); |
|
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1253 add_ons = Qnil; |
|
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1254 while (CONSP (tem)) |
|
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1255 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1256 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
|
1257 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
|
1258 tem = XCDR (tem); |
|
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1259 } |
|
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1260 tail = nconc2 (Fnreverse (add_ons), tail); |
|
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1261 |
|
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
1262 for (; CONSP (tail); tail = XCDR (tail)) |
| 333 | 1263 { |
|
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
1264 buf = Fcdr (XCAR (tail)); |
| 333 | 1265 if (EQ (buf, buffer)) |
| 1266 continue; | |
|
53350
89a24e997838
(Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents:
52459
diff
changeset
|
1267 if (NILP (buf)) |
|
89a24e997838
(Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents:
52459
diff
changeset
|
1268 continue; |
|
89a24e997838
(Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents:
52459
diff
changeset
|
1269 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
|
1270 continue; |
|
46419
46ff766afaaf
* buffer.c (Fother_buffer): Use SREF when retrieving a byte from
Ken Raeburn <raeburn@raeburn.org>
parents:
46378
diff
changeset
|
1271 if (SREF (XBUFFER (buf)->name, 0) == ' ') |
| 333 | 1272 continue; |
|
10210
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1273 /* 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
|
1274 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
|
1275 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
|
1276 { |
|
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1277 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
|
1278 if (NILP (tem)) |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1279 continue; |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1280 } |
|
43e95429ffa0
(Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents:
10146
diff
changeset
|
1281 |
|
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
1282 if (NILP (visible_ok)) |
|
31395
d0f522cf422b
(Fother_buffer): Consider buffers as invisible when
Gerd Moellmann <gerd@gnu.org>
parents:
31128
diff
changeset
|
1283 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
|
1284 else |
|
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
1285 tem = Qnil; |
| 485 | 1286 if (NILP (tem)) |
| 333 | 1287 return buf; |
| 485 | 1288 if (NILP (notsogood)) |
| 333 | 1289 notsogood = buf; |
| 1290 } | |
| 485 | 1291 if (!NILP (notsogood)) |
| 333 | 1292 return notsogood; |
|
27480
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1293 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
|
1294 if (NILP (buf)) |
|
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1295 { |
|
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1296 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
|
1297 Fset_buffer_major_mode (buf); |
|
90165d2202f9
(Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents:
27012
diff
changeset
|
1298 } |
|
14226
ad275aca6fc5
(Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
1299 return buf; |
| 333 | 1300 } |
| 1301 | |
| 1302 DEFUN ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo, | |
| 1303 0, 1, "", | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1304 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
|
1305 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
|
1306 (buffer) |
| 648 | 1307 register Lisp_Object buffer; |
| 333 | 1308 { |
| 648 | 1309 Lisp_Object real_buffer; |
| 333 | 1310 |
| 648 | 1311 if (NILP (buffer)) |
|
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
1312 XSETBUFFER (real_buffer, current_buffer); |
| 333 | 1313 else |
| 1314 { | |
| 648 | 1315 real_buffer = Fget_buffer (buffer); |
| 1316 if (NILP (real_buffer)) | |
| 1317 nsberror (buffer); | |
| 333 | 1318 } |
| 1319 | |
| 648 | 1320 if (EQ (XBUFFER (real_buffer)->undo_list, Qt)) |
| 1321 XBUFFER (real_buffer)->undo_list = Qnil; | |
| 333 | 1322 |
| 1323 return Qnil; | |
| 1324 } | |
| 1325 | |
| 1326 /* | |
| 1327 DEFVAR_LISP ("kill-buffer-hook", no_cell, "\ | |
| 1328 Hook to be run (by `run-hooks', which see) when a buffer is killed.\n\ | |
| 1329 The buffer being killed will be current while the hook is running.\n\ | |
| 1330 See `kill-buffer'." | |
| 1331 */ | |
| 1332 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
|
1333 doc: /* Kill the buffer BUFFER. |
|
74680
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
1334 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
|
1335 With a nil argument, kill the current buffer. |
|
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
1336 |
|
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
1337 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
|
1338 |
|
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
1339 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
|
1340 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
|
1341 |
|
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
1342 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
|
1343 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
|
1344 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1345 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
|
1346 with SIGHUP. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1347 (buffer) |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1348 Lisp_Object buffer; |
| 333 | 1349 { |
| 1350 Lisp_Object buf; | |
| 1351 register struct buffer *b; | |
| 1352 register Lisp_Object tem; | |
| 1353 register struct Lisp_Marker *m; | |
|
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
1354 struct gcpro gcpro1; |
| 333 | 1355 |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1356 if (NILP (buffer)) |
| 333 | 1357 buf = Fcurrent_buffer (); |
| 1358 else | |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1359 buf = Fget_buffer (buffer); |
| 485 | 1360 if (NILP (buf)) |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1361 nsberror (buffer); |
| 333 | 1362 |
| 1363 b = XBUFFER (buf); | |
| 1364 | |
|
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1365 /* Avoid trouble for buffer already dead. */ |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1366 if (NILP (b->name)) |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1367 return Qnil; |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1368 |
| 333 | 1369 /* Query if the buffer is still modified. */ |
| 485 | 1370 if (INTERACTIVE && !NILP (b->filename) |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1371 && BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) |
| 333 | 1372 { |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1373 GCPRO1 (buf); |
|
49444
a80513b20297
(Fkill_buffer): Call format2 instead of format1.
Richard M. Stallman <rms@gnu.org>
parents:
49057
diff
changeset
|
1374 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
|
1375 b->name, make_number (0))); |
| 333 | 1376 UNGCPRO; |
| 485 | 1377 if (NILP (tem)) |
| 333 | 1378 return Qnil; |
| 1379 } | |
| 1380 | |
|
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1381 /* Run hooks with the buffer to be killed the current buffer. */ |
| 333 | 1382 { |
|
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46199
diff
changeset
|
1383 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
|
1384 Lisp_Object arglist[1]; |
| 333 | 1385 |
| 1386 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
| 1387 set_buffer_internal (b); | |
|
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1388 |
|
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1389 /* 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
|
1390 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
|
1391 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
|
1392 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
|
1393 if (NILP (tem)) |
|
50014
3b2576528809
(Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents:
49974
diff
changeset
|
1394 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
|
1395 |
|
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
1396 /* Then run the hooks. */ |
|
41524
095a45698793
(Fkill_buffer): Use Frun_hooks, not Vrun_hooks.
Richard M. Stallman <rms@gnu.org>
parents:
41027
diff
changeset
|
1397 Frun_hooks (1, &Qkill_buffer_hook); |
| 333 | 1398 unbind_to (count, Qnil); |
| 1399 } | |
| 1400 | |
| 1401 /* We have no more questions to ask. Verify that it is valid | |
| 1402 to kill the buffer. This must be done after the questions | |
| 1403 since anything can happen within do_yes_or_no_p. */ | |
| 1404 | |
| 1405 /* Don't kill the minibuffer now current. */ | |
| 1406 if (EQ (buf, XWINDOW (minibuf_window)->buffer)) | |
| 1407 return Qnil; | |
| 1408 | |
| 485 | 1409 if (NILP (b->name)) |
| 333 | 1410 return Qnil; |
| 1411 | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1412 /* 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
|
1413 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
|
1414 ask questions or their hooks get errors. */ |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1415 if (! b->base_buffer) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1416 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1417 struct buffer *other; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1418 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1419 GCPRO1 (buf); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1420 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1421 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
|
1422 /* all_buffers contains dead buffers too; |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1423 don't re-kill them. */ |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1424 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
|
1425 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1426 Lisp_Object buf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1427 XSETBUFFER (buf, other); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1428 Fkill_buffer (buf); |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1429 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1430 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1431 UNGCPRO; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1432 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1433 |
| 333 | 1434 /* Make this buffer not be current. |
| 1435 In the process, notice if this is the sole visible buffer | |
| 1436 and give up if so. */ | |
| 1437 if (b == current_buffer) | |
| 1438 { | |
|
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1439 tem = Fother_buffer (buf, Qnil, Qnil); |
| 333 | 1440 Fset_buffer (tem); |
| 1441 if (b == current_buffer) | |
| 1442 return Qnil; | |
| 1443 } | |
| 1444 | |
|
33698
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1445 /* 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
|
1446 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
|
1447 XSETBUFFER (tem, current_buffer); |
|
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1448 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
|
1449 { |
|
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1450 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
|
1451 if (EQ (buf, tem)) |
|
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1452 return Qnil; |
|
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1453 } |
|
6864fead9622
(Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents:
33675
diff
changeset
|
1454 |
| 333 | 1455 /* Now there is no question: we can kill the buffer. */ |
| 1456 | |
| 1457 #ifdef CLASH_DETECTION | |
| 1458 /* Unlock this buffer's file, if it is locked. */ | |
| 1459 unlock_buffer (b); | |
| 1460 #endif /* CLASH_DETECTION */ | |
| 1461 | |
|
77176
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1462 GCPRO1 (buf); |
| 333 | 1463 kill_buffer_processes (buf); |
|
77176
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1464 UNGCPRO; |
|
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1465 |
|
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1466 /* 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
|
1467 have called kill-buffer. */ |
|
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1468 |
|
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1469 if (NILP (b->name)) |
|
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1470 return Qnil; |
|
421b3f5480da
(Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents:
76791
diff
changeset
|
1471 |
|
51782
3b58843e8f3f
(Fkill_buffer): Clear charpos cache if necessary.
Kenichi Handa <handa@m17n.org>
parents:
51669
diff
changeset
|
1472 clear_charpos_cache (b); |
| 333 | 1473 |
| 1474 tem = Vinhibit_quit; | |
| 1475 Vinhibit_quit = Qt; | |
|
13922
5636ed4243ec
(Fkill_buffer): Delete buffer from Vbuffer_alist after replacing it.
Erik Naggum <erik@naggum.no>
parents:
13917
diff
changeset
|
1476 replace_buffer_in_all_windows (buf); |
| 333 | 1477 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
|
1478 frames_discard_buffer (buf); |
| 333 | 1479 Vinhibit_quit = tem; |
| 1480 | |
|
40760
aa9b081b3a0d
(Fkill_buffer): Don't delete auto save file if buffer is modified.
Richard M. Stallman <rms@gnu.org>
parents:
40735
diff
changeset
|
1481 /* 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
|
1482 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
|
1483 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
|
1484 && 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
|
1485 && 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
|
1486 && 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
|
1487 && NILP (Fsymbol_value (intern ("auto-save-visited-file-name")))) |
| 333 | 1488 { |
| 1489 Lisp_Object tem; | |
| 1490 tem = Fsymbol_value (intern ("delete-auto-save-files")); | |
| 485 | 1491 if (! NILP (tem)) |
|
10082
8d3a71736423
(Fkill_buffer): Use internal_delete_file.
Richard M. Stallman <rms@gnu.org>
parents:
9950
diff
changeset
|
1492 internal_delete_file (b->auto_save_file_name); |
| 333 | 1493 } |
| 1494 | |
|
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1495 if (b->base_buffer) |
| 333 | 1496 { |
|
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1497 /* 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
|
1498 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
|
1499 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
|
1500 for (m = BUF_MARKERS (b); m; ) |
|
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1501 { |
|
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1502 struct Lisp_Marker *next = m->next; |
|
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1503 if (m->buffer == b) |
|
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1504 unchain_marker (m); |
|
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1505 m = next; |
|
12076
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1506 } |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1507 } |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1508 else |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1509 { |
|
ee38e93ccf7e
(Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents:
11889
diff
changeset
|
1510 /* 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
|
1511 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
|
1512 for (m = BUF_MARKERS (b); m; ) |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1513 { |
|
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1514 struct Lisp_Marker *next = m->next; |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1515 m->buffer = 0; |
|
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1516 m->next = NULL; |
|
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1517 m = next; |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1518 } |
|
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1519 BUF_MARKERS (b) = NULL; |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1520 BUF_INTERVALS (b) = NULL_INTERVAL; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1521 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1522 /* Perhaps we should explicitly free the interval tree here... */ |
| 333 | 1523 } |
|
1291
7c32612174c3
* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents:
1281
diff
changeset
|
1524 |
|
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
1525 /* 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
|
1526 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
|
1527 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
|
1528 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
|
1529 swap_out_buffer_local_variables (b); |
|
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
1530 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
|
1531 |
| 333 | 1532 b->name = Qnil; |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1533 |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
1534 BLOCK_INPUT; |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1535 if (! b->base_buffer) |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
1536 free_buffer_text (b); |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1537 |
|
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1538 if (b->newline_cache) |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1539 { |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1540 free_region_cache (b->newline_cache); |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1541 b->newline_cache = 0; |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1542 } |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1543 if (b->width_run_cache) |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1544 { |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1545 free_region_cache (b->width_run_cache); |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1546 b->width_run_cache = 0; |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1547 } |
|
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
1548 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
|
1549 UNBLOCK_INPUT; |
| 333 | 1550 b->undo_list = Qnil; |
| 1551 | |
| 1552 return Qt; | |
| 1553 } | |
| 1554 | |
| 550 | 1555 /* Move the assoc for buffer BUF to the front of buffer-alist. Since |
| 1556 we do this each time BUF is selected visibly, the more recently | |
| 1557 selected buffers are always closer to the front of the list. This | |
| 1558 means that other_buffer is more likely to choose a relevant buffer. */ | |
| 333 | 1559 |
|
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
1560 void |
| 333 | 1561 record_buffer (buf) |
| 1562 Lisp_Object buf; | |
| 1563 { | |
| 1564 register Lisp_Object link, prev; | |
|
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1565 Lisp_Object frame; |
|
25664
832aeb9c3996
(Fother_buffer): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25653
diff
changeset
|
1566 frame = selected_frame; |
| 333 | 1567 |
| 1568 prev = Qnil; | |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1569 for (link = Vbuffer_alist; CONSP (link); link = XCDR (link)) |
| 333 | 1570 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1571 if (EQ (XCDR (XCAR (link)), buf)) |
| 333 | 1572 break; |
| 1573 prev = link; | |
| 1574 } | |
| 1575 | |
| 550 | 1576 /* Effectively do Vbuffer_alist = Fdelq (link, Vbuffer_alist); |
| 1577 we cannot use Fdelq itself here because it allows quitting. */ | |
| 333 | 1578 |
| 485 | 1579 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
|
1580 Vbuffer_alist = XCDR (Vbuffer_alist); |
| 333 | 1581 else |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
1582 XSETCDR (prev, XCDR (XCDR (prev))); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1583 |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
1584 XSETCDR (link, Vbuffer_alist); |
| 333 | 1585 Vbuffer_alist = link; |
|
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1586 |
|
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1587 /* 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
|
1588 |
|
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1589 prev = Qnil; |
|
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1590 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
|
1591 link = XCDR (link)) |
|
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1592 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1593 if (EQ (XCAR (link), buf)) |
|
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1594 break; |
|
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1595 prev = link; |
|
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1596 } |
|
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1597 |
|
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1598 /* Effectively do delq. */ |
|
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1599 |
|
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1600 if (CONSP (link)) |
|
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1601 { |
|
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1602 if (NILP (prev)) |
|
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1603 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
|
1604 XCDR (frame_buffer_list (frame))); |
|
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1605 else |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
1606 XSETCDR (prev, XCDR (XCDR (prev))); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1607 |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
1608 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
|
1609 set_frame_buffer_list (frame, link); |
|
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1610 } |
|
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
1611 else |
|
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1612 set_frame_buffer_list (frame, Fcons (buf, frame_buffer_list (frame))); |
| 333 | 1613 } |
| 1614 | |
|
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1615 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
|
1616 doc: /* Set an appropriate major mode for BUFFER. |
| 40605 | 1617 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
|
1618 according to `default-major-mode'. |
|
39971
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1619 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
|
1620 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
|
1621 (buffer) |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1622 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
|
1623 { |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1624 int count; |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1625 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
|
1626 |
|
76791
6ef15c3befe4
(Fset_buffer_major_mode): Check that BUFFER is valid.
Juanma Barranquero <lekktu@gmail.com>
parents:
76557
diff
changeset
|
1627 CHECK_BUFFER (buffer); |
|
6ef15c3befe4
(Fset_buffer_major_mode): Check that BUFFER is valid.
Juanma Barranquero <lekktu@gmail.com>
parents:
76557
diff
changeset
|
1628 |
|
39974
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1629 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
|
1630 && 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
|
1631 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
|
1632 else |
|
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1633 { |
|
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1634 function = buffer_defaults.major_mode; |
|
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1635 if (NILP (function) |
|
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1636 && 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
|
1637 function = current_buffer->major_mode; |
|
a72c97b251de
(Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents:
39973
diff
changeset
|
1638 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1639 |
| 48635 | 1640 if (NILP (function) || EQ (function, Qfundamental_mode)) |
| 1641 return Qnil; | |
| 1642 | |
|
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46199
diff
changeset
|
1643 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
|
1644 |
| 48635 | 1645 /* To select a nonfundamental mode, |
| 1646 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
|
1647 |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1648 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
|
1649 |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
1650 Fset_buffer (buffer); |
| 48635 | 1651 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
|
1652 |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1653 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
|
1654 } |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1655 |
|
25181
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1656 /* 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
|
1657 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
|
1658 |
|
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1659 char * |
|
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1660 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
|
1661 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
|
1662 { |
|
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1663 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
|
1664 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
|
1665 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
|
1666 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
|
1667 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
|
1668 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
|
1669 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
|
1670 } |
|
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1671 |
|
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1672 /* 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
|
1673 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
|
1674 |
|
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1675 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
|
1676 switch_to_buffer_1 (buffer, norecord) |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1677 Lisp_Object buffer, norecord; |
| 333 | 1678 { |
| 1679 register Lisp_Object buf; | |
| 1680 | |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1681 if (NILP (buffer)) |
|
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1682 buf = Fother_buffer (Fcurrent_buffer (), Qnil, Qnil); |
| 333 | 1683 else |
|
9732
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1684 { |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1685 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
|
1686 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
|
1687 { |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1688 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
|
1689 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
|
1690 } |
|
577db538b0b6
(Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents:
9632
diff
changeset
|
1691 } |
| 333 | 1692 Fset_buffer (buf); |
| 485 | 1693 if (NILP (norecord)) |
| 333 | 1694 record_buffer (buf); |
| 1695 | |
| 1696 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
|
1697 ? 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
|
1698 : selected_window, |
|
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
1699 buf, Qnil); |
| 333 | 1700 |
|
16840
299b0e0f0a93
Fix typo editing previous change.
Richard M. Stallman <rms@gnu.org>
parents:
16830
diff
changeset
|
1701 return buf; |
| 333 | 1702 } |
| 1703 | |
|
25181
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1704 DEFUN ("switch-to-buffer", Fswitch_to_buffer, Sswitch_to_buffer, 1, 2, "BSwitch to buffer: ", |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1705 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
|
1706 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
|
1707 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
|
1708 |
|
f1ddf2e65cd3
(Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56172
diff
changeset
|
1709 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
|
1710 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
|
1711 using `other-buffer'. |
|
39971
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1712 Optional second arg NORECORD non-nil means |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1713 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
|
1714 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
|
1715 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1716 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
|
1717 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
|
1718 the window-buffer correspondences. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1719 (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
|
1720 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
|
1721 { |
|
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1722 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
|
1723 |
|
51939
d38453fdf2a0
(copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51867
diff
changeset
|
1724 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
|
1725 { |
|
72524
49a6e184d20a
(Fswitch_to_buffer): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
72503
diff
changeset
|
1726 /* 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
|
1727 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
|
1728 |
|
49a6e184d20a
(Fswitch_to_buffer): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
72503
diff
changeset
|
1729 /* 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
|
1730 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
|
1731 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
|
1732 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
|
1733 if (NILP (norecord)) |
|
72503
6ccb18aa8a5d
(Fswitch_to_buffer): Move buffer to front of
Nick Roberts <nickrob@snap.net.nz>
parents:
72486
diff
changeset
|
1734 record_buffer (buffer); |
|
6ccb18aa8a5d
(Fswitch_to_buffer): Move buffer to front of
Nick Roberts <nickrob@snap.net.nz>
parents:
72486
diff
changeset
|
1735 return Fset_buffer (buffer); |
|
6ccb18aa8a5d
(Fswitch_to_buffer): Move buffer to front of
Nick Roberts <nickrob@snap.net.nz>
parents:
72486
diff
changeset
|
1736 } |
|
51939
d38453fdf2a0
(copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51867
diff
changeset
|
1737 |
|
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 err = no_switch_window (selected_window); |
|
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1739 if (err) error (err); |
|
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
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 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
|
1742 } |
|
847441efad8d
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25021
diff
changeset
|
1743 |
|
16840
299b0e0f0a93
Fix typo editing previous change.
Richard M. Stallman <rms@gnu.org>
parents:
16830
diff
changeset
|
1744 DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0, |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1745 doc: /* Select buffer BUFFER in some window, preferably a different one. |
|
56396
f1ddf2e65cd3
(Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56172
diff
changeset
|
1746 BUFFER may be a buffer, a string \(a buffer name), or nil. |
|
f1ddf2e65cd3
(Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56172
diff
changeset
|
1747 If BUFFER is a string which is not the name of an existing buffer, |
|
f1ddf2e65cd3
(Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56172
diff
changeset
|
1748 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
|
1749 If BUFFER is nil, then it chooses some other buffer. |
|
39971
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1750 If `pop-up-windows' is non-nil, windows can be split to do this. |
|
55140
98453142b576
(Fpop_to_buffer): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
54949
diff
changeset
|
1751 If optional second arg OTHER-WINDOW is non-nil, insist on finding another |
|
54266
840b8997440d
(Fpop_to_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53958
diff
changeset
|
1752 window even if BUFFER is already visible in the selected window, |
|
840b8997440d
(Fpop_to_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53958
diff
changeset
|
1753 and ignore `same-window-regexps' and `same-window-buffer-names'. |
|
56396
f1ddf2e65cd3
(Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56172
diff
changeset
|
1754 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
|
1755 This uses the function `display-buffer' as a subroutine; see the documentation |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1756 of `display-buffer' for additional customization information. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1757 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
1758 Optional third arg NORECORD non-nil means |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1759 do not put this buffer at the front of the list of recently selected ones. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
1760 (buffer, other_window, norecord) |
|
16830
4792e73d511f
(Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents:
16665
diff
changeset
|
1761 Lisp_Object buffer, other_window, norecord; |
| 333 | 1762 { |
| 1763 register Lisp_Object buf; | |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1764 if (NILP (buffer)) |
|
22189
2a61a0a3a9be
(Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
22171
diff
changeset
|
1765 buf = Fother_buffer (Fcurrent_buffer (), Qnil, Qnil); |
| 333 | 1766 else |
|
10916
3aea65d9eb68
(Fpop_to_buffer): Call Fset_buffer_major_mode if we create a buffer.
Richard M. Stallman <rms@gnu.org>
parents:
10751
diff
changeset
|
1767 { |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1768 buf = Fget_buffer (buffer); |
|
10916
3aea65d9eb68
(Fpop_to_buffer): Call Fset_buffer_major_mode if we create a buffer.
Richard M. Stallman <rms@gnu.org>
parents:
10751
diff
changeset
|
1769 if (NILP (buf)) |
|
3aea65d9eb68
(Fpop_to_buffer): Call Fset_buffer_major_mode if we create a buffer.
Richard M. Stallman <rms@gnu.org>
parents:
10751
diff
changeset
|
1770 { |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1771 buf = Fget_buffer_create (buffer); |
|
10916
3aea65d9eb68
(Fpop_to_buffer): Call Fset_buffer_major_mode if we create a buffer.
Richard M. Stallman <rms@gnu.org>
parents:
10751
diff
changeset
|
1772 Fset_buffer_major_mode (buf); |
|
3aea65d9eb68
(Fpop_to_buffer): Call Fset_buffer_major_mode if we create a buffer.
Richard M. Stallman <rms@gnu.org>
parents:
10751
diff
changeset
|
1773 } |
|
3aea65d9eb68
(Fpop_to_buffer): Call Fset_buffer_major_mode if we create a buffer.
Richard M. Stallman <rms@gnu.org>
parents:
10751
diff
changeset
|
1774 } |
| 333 | 1775 Fset_buffer (buf); |
|
51048
7ac9c3bea5ea
(Fselect_window): Add optional arg `norecord'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50605
diff
changeset
|
1776 Fselect_window (Fdisplay_buffer (buf, other_window, Qnil), norecord); |
|
3295
4d405f172c79
(reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents:
3242
diff
changeset
|
1777 return buf; |
| 333 | 1778 } |
| 1779 | |
| 1780 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
|
1781 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
|
1782 () |
| 333 | 1783 { |
| 1784 register Lisp_Object buf; | |
|
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
1785 XSETBUFFER (buf, current_buffer); |
| 333 | 1786 return buf; |
| 1787 } | |
| 1788 | |
|
25491
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1789 /* Set the current buffer to B. |
|
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1790 |
|
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1791 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
|
1792 global unchanged information in beg_unchanged and end_unchanged. |
|
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1793 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
|
1794 information on a buffer-basis. Every action affecting other |
|
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1795 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
|
1796 time, and that increments windows_or_buffers_changed. */ |
| 333 | 1797 |
| 1798 void | |
| 1799 set_buffer_internal (b) | |
| 1800 register struct buffer *b; | |
| 1801 { | |
|
25368
f9949db6ca7d
(set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents:
25351
diff
changeset
|
1802 if (current_buffer != b) |
|
25491
0359edc6e428
(set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents:
25368
diff
changeset
|
1803 set_buffer_internal_1 (b); |
|
11889
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1804 } |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1805 |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1806 /* 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
|
1807 This is used by redisplay. */ |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1808 |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1809 void |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1810 set_buffer_internal_1 (b) |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1811 register struct buffer *b; |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1812 { |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1813 register struct buffer *old_buf; |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1814 register Lisp_Object tail, valcontents; |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1815 Lisp_Object tem; |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1816 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
1817 #ifdef USE_MMAP_FOR_BUFFERS |
|
31416
9b8c5bea5e8d
(set_buffer_internal_1) [REL_ALLOC_MMAP]: If
Gerd Moellmann <gerd@gnu.org>
parents:
31412
diff
changeset
|
1818 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
|
1819 enlarge_buffer_text (b, 0); |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
1820 #endif /* USE_MMAP_FOR_BUFFERS */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
1821 |
|
11889
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1822 if (current_buffer == b) |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1823 return; |
|
1067ddd12dfc
(set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents:
11838
diff
changeset
|
1824 |
| 333 | 1825 old_buf = current_buffer; |
| 1826 current_buffer = b; | |
| 1827 last_known_column_point = -1; /* invalidate indentation cache */ | |
| 1828 | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1829 if (old_buf) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1830 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1831 /* 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
|
1832 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
|
1833 if (old_buf->base_buffer) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1834 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
|
1835 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1836 /* 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
|
1837 when it is not current, update them now. */ |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1838 if (! NILP (old_buf->pt_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1839 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1840 Lisp_Object obuf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1841 XSETBUFFER (obuf, old_buf); |
|
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1842 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
|
1843 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
|
1844 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1845 if (! NILP (old_buf->begv_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1846 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1847 Lisp_Object obuf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1848 XSETBUFFER (obuf, old_buf); |
|
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1849 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
|
1850 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
|
1851 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1852 if (! NILP (old_buf->zv_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1853 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1854 Lisp_Object obuf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1855 XSETBUFFER (obuf, old_buf); |
|
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1856 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
|
1857 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
|
1858 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1859 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1860 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1861 /* 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
|
1862 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
|
1863 if (b->base_buffer) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1864 b->undo_list = b->base_buffer->undo_list; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1865 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1866 /* 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
|
1867 when it is not current, fetch them now. */ |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1868 if (! NILP (b->pt_marker)) |
|
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1869 { |
|
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1870 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
|
1871 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
|
1872 } |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1873 if (! NILP (b->begv_marker)) |
|
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1874 { |
|
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1875 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
|
1876 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
|
1877 } |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1878 if (! NILP (b->zv_marker)) |
|
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1879 { |
|
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1880 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
|
1881 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
|
1882 } |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1883 |
| 333 | 1884 /* Look down buffer's list of local Lisp variables |
| 1885 to find and update any that forward into C variables. */ | |
| 1886 | |
|
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1887 for (tail = b->local_var_alist; CONSP (tail); tail = XCDR (tail)) |
| 333 | 1888 { |
|
39581
6d9fa06012a6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
39337
diff
changeset
|
1889 valcontents = SYMBOL_VALUE (XCAR (XCAR (tail))); |
|
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1890 if ((BUFFER_LOCAL_VALUEP (valcontents) |
|
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1891 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
21141
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
1892 && (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
|
1893 (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem)))) |
| 333 | 1894 /* Just reference the variable |
| 1895 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
|
1896 Fsymbol_value (XCAR (XCAR (tail))); |
| 333 | 1897 } |
| 1898 | |
| 1899 /* Do the same with any others that were local to the previous buffer */ | |
| 1900 | |
| 1901 if (old_buf) | |
|
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
1902 for (tail = old_buf->local_var_alist; CONSP (tail); tail = XCDR (tail)) |
| 333 | 1903 { |
|
39581
6d9fa06012a6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
39337
diff
changeset
|
1904 valcontents = SYMBOL_VALUE (XCAR (XCAR (tail))); |
|
9146
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1905 if ((BUFFER_LOCAL_VALUEP (valcontents) |
|
8f966cc4652b
(nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents:
9047
diff
changeset
|
1906 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
|
21141
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
1907 && (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
|
1908 (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem)))) |
| 333 | 1909 /* Just reference the variable |
| 1910 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
|
1911 Fsymbol_value (XCAR (XCAR (tail))); |
| 333 | 1912 } |
| 1913 } | |
| 1914 | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1915 /* 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
|
1916 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
|
1917 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1918 void |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1919 set_buffer_temp (b) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1920 struct buffer *b; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1921 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1922 register struct buffer *old_buf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1923 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1924 if (current_buffer == b) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1925 return; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1926 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1927 old_buf = current_buffer; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1928 current_buffer = b; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1929 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1930 if (old_buf) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1931 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1932 /* 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
|
1933 when it is not current, update them now. */ |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1934 if (! NILP (old_buf->pt_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1935 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1936 Lisp_Object obuf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1937 XSETBUFFER (obuf, old_buf); |
|
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1938 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
|
1939 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
|
1940 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1941 if (! NILP (old_buf->begv_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1942 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1943 Lisp_Object obuf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1944 XSETBUFFER (obuf, old_buf); |
|
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1945 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
|
1946 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
|
1947 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1948 if (! NILP (old_buf->zv_marker)) |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1949 { |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1950 Lisp_Object obuf; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1951 XSETBUFFER (obuf, old_buf); |
|
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1952 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
|
1953 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
|
1954 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1955 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1956 |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1957 /* 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
|
1958 when it is not current, fetch them now. */ |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1959 if (! NILP (b->pt_marker)) |
|
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1960 { |
|
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1961 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
|
1962 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
|
1963 } |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1964 if (! NILP (b->begv_marker)) |
|
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1965 { |
|
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1966 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
|
1967 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
|
1968 } |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1969 if (! NILP (b->zv_marker)) |
|
20538
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1970 { |
|
b964f3facafa
(Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents:
20368
diff
changeset
|
1971 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
|
1972 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
|
1973 } |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1974 } |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
1975 |
| 333 | 1976 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
|
1977 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
|
1978 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
|
1979 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
|
1980 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
|
1981 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
|
1982 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
|
1983 (buffer) |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1984 register Lisp_Object buffer; |
| 333 | 1985 { |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1986 register Lisp_Object buf; |
|
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1987 buf = Fget_buffer (buffer); |
|
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1988 if (NILP (buf)) |
|
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1989 nsberror (buffer); |
|
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1990 if (NILP (XBUFFER (buf)->name)) |
| 333 | 1991 error ("Selecting deleted buffer"); |
|
13762
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1992 set_buffer_internal (XBUFFER (buf)); |
|
71c14edf7d6d
(Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents:
13446
diff
changeset
|
1993 return buf; |
| 333 | 1994 } |
|
20698
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1995 |
|
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1996 /* 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
|
1997 |
|
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1998 Lisp_Object |
|
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
1999 set_buffer_if_live (buffer) |
|
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2000 Lisp_Object buffer; |
|
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2001 { |
|
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2002 if (! NILP (XBUFFER (buffer)->name)) |
|
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2003 Fset_buffer (buffer); |
|
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2004 return Qnil; |
|
ec08780e4c42
(set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20679
diff
changeset
|
2005 } |
| 333 | 2006 |
| 2007 DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only, | |
| 2008 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
|
2009 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
|
2010 () |
| 333 | 2011 { |
|
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
2012 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
|
2013 && NILP (Vinhibit_read_only)) |
|
71968
b0505e901bff
(Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents:
70931
diff
changeset
|
2014 xsignal1 (Qbuffer_read_only, Fcurrent_buffer ()); |
| 333 | 2015 return Qnil; |
| 2016 } | |
| 2017 | |
| 2018 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
|
2019 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
|
2020 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
|
2021 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
|
2022 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
|
2023 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
|
2024 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
|
2025 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
|
2026 (buffer) |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
2027 register Lisp_Object buffer; |
| 333 | 2028 { |
|
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
2029 /* 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
|
2030 if (NILP (buffer)) |
|
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
2031 { |
|
39802
efbac46c874c
(Fbury_buffer): Don't try to remove the buffer from the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
2032 Lisp_Object tem; |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
2033 XSETBUFFER (buffer, current_buffer); |
|
18485
d6e8b92585e9
(Fbury_buffer): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18455
diff
changeset
|
2034 |
|
39802
efbac46c874c
(Fbury_buffer): Don't try to remove the buffer from the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
2035 tem = Fwindow_buffer (selected_window); |
|
18485
d6e8b92585e9
(Fbury_buffer): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18455
diff
changeset
|
2036 /* 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
|
2037 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
|
2038 { |
|
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
2039 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
|
2040 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
|
2041 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
|
2042 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
|
2043 else |
|
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
2044 Fdelete_window (selected_window); |
|
2b65fb0dbd2d
(Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40760
diff
changeset
|
2045 } |
|
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
2046 } |
| 333 | 2047 else |
| 2048 { | |
| 2049 Lisp_Object buf1; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
2050 |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
2051 buf1 = Fget_buffer (buffer); |
| 485 | 2052 if (NILP (buf1)) |
|
14060
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
2053 nsberror (buffer); |
|
b62397f49a24
(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents:
13922
diff
changeset
|
2054 buffer = buf1; |
|
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
2055 } |
|
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
2056 |
|
28991
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2057 /* 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
|
2058 buffer is killed. */ |
|
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2059 if (!NILP (XBUFFER (buffer)->name)) |
|
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2060 { |
|
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2061 Lisp_Object aelt, link; |
|
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2062 |
|
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2063 aelt = Frassq (buffer, Vbuffer_alist); |
|
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2064 link = Fmemq (aelt, Vbuffer_alist); |
|
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2065 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
|
2066 XSETCDR (link, Qnil); |
|
28991
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2067 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
|
2068 |
|
46016
3ba98b59cb49
(Fbury_buffer): Use frames_discard_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
45683
diff
changeset
|
2069 /* Removing BUFFER from frame-specific lists |
|
3ba98b59cb49
(Fbury_buffer): Use frames_discard_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
45683
diff
changeset
|
2070 has the effect of putting BUFFER at the end |
|
3ba98b59cb49
(Fbury_buffer): Use frames_discard_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
45683
diff
changeset
|
2071 of the combined list in each frame. */ |
|
3ba98b59cb49
(Fbury_buffer): Use frames_discard_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
45683
diff
changeset
|
2072 frames_discard_buffer (buffer); |
|
28991
f8bcf3bec2a6
(Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents:
28878
diff
changeset
|
2073 } |
|
17234
bda734eef575
(Fbury_buffer): Call frames_bury_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
17220
diff
changeset
|
2074 |
| 333 | 2075 return Qnil; |
| 2076 } | |
| 2077 | |
|
1953
714df59790af
(Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents:
1952
diff
changeset
|
2078 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
|
2079 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
|
2080 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
|
2081 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
|
2082 () |
| 333 | 2083 { |
| 2084 Fwiden (); | |
|
26056
9c4556ef15de
(Fget_buffer_create, Fmake_indirect_buffer, Fkill_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
25744
diff
changeset
|
2085 |
|
9c4556ef15de
(Fget_buffer_create, Fmake_indirect_buffer, Fkill_buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
25744
diff
changeset
|
2086 del_range (BEG, Z); |
|
25626
acfb741e6e24
(Ferase_buffer): Don't erase the minibuffer prompt.
Richard M. Stallman <rms@gnu.org>
parents:
25546
diff
changeset
|
2087 |
| 333 | 2088 current_buffer->last_window_start = 1; |
| 2089 /* Prevent warnings, or suspension of auto saving, that would happen | |
| 2090 if future size is less than past size. Use of erase-buffer | |
| 2091 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
|
2092 XSETFASTINT (current_buffer->save_length, 0); |
| 333 | 2093 return Qnil; |
| 2094 } | |
| 2095 | |
|
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
2096 void |
| 333 | 2097 validate_region (b, e) |
| 2098 register Lisp_Object *b, *e; | |
| 2099 { | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
2100 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
|
2101 CHECK_NUMBER_COERCE_MARKER (*e); |
| 333 | 2102 |
| 2103 if (XINT (*b) > XINT (*e)) | |
| 2104 { | |
|
9335
8cf58b38d244
(validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents:
9296
diff
changeset
|
2105 Lisp_Object tem; |
|
8cf58b38d244
(validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents:
9296
diff
changeset
|
2106 tem = *b; *b = *e; *e = tem; |
| 333 | 2107 } |
| 2108 | |
| 2109 if (!(BEGV <= XINT (*b) && XINT (*b) <= XINT (*e) | |
| 2110 && XINT (*e) <= ZV)) | |
| 2111 args_out_of_range (*b, *e); | |
| 2112 } | |
| 2113 | |
|
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2114 /* 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
|
2115 and return the adjusted position. */ |
|
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2116 |
|
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2117 static int |
|
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2118 advance_to_char_boundary (byte_pos) |
|
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2119 int byte_pos; |
|
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2120 { |
|
21085
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2121 int c; |
|
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2122 |
|
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2123 if (byte_pos == BEG) |
|
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2124 /* 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
|
2125 return BEG; |
|
21085
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2126 |
|
6b0336de5fbe
(advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents:
21065
diff
changeset
|
2127 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
|
2128 if (! CHAR_HEAD_P (c)) |
|
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2129 { |
| 25508 | 2130 /* 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
|
2131 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
|
2132 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
|
2133 |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2134 do |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2135 { |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2136 byte_pos--; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2137 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
|
2138 } |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2139 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
|
2140 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
|
2141 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
|
2142 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
|
2143 /* 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
|
2144 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
|
2145 not, BYTE_POS was unchanged. */ |
|
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2146 } |
|
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2147 |
|
20935
2fc5eb0799fe
(advance_to_char_boundary): Make the behaviour
Kenichi Handa <handa@m17n.org>
parents:
20868
diff
changeset
|
2148 return byte_pos; |
|
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2149 } |
|
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2150 |
|
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2151 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
|
2152 1, 1, 0, |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2153 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
|
2154 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
|
2155 If FLAG is nil, this makes the buffer a single-byte buffer. |
| 89483 | 2156 In these cases, the buffer contents remain unchanged as a sequence of |
| 2157 bytes but the contents viewed as characters do change. | |
| 2158 If FLAG is `to', this makes the buffer a multibyte buffer by changing | |
| 89909 | 2159 all eight-bit bytes to eight-bit characters. |
|
53816
0987c11386f1
(Fset_buffer_multibyte): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
53815
diff
changeset
|
2160 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
|
2161 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
|
2162 (flag) |
|
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2163 Lisp_Object flag; |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2164 { |
|
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2165 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
|
2166 struct buffer *other; |
|
51391
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2167 int begv, zv; |
|
51394
d1641e2dfc5b
(Fset_buffer_multibyte): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
51391
diff
changeset
|
2168 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
|
2169 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
|
2170 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
|
2171 struct gcpro gcpro1; |
|
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2172 |
|
24240
6ea9058180ec
(Fset_buffer_multibyte): Error if buffer is multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
23760
diff
changeset
|
2173 if (current_buffer->base_buffer) |
|
6ea9058180ec
(Fset_buffer_multibyte): Error if buffer is multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
23760
diff
changeset
|
2174 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
|
2175 |
|
21506
a44f9f59c656
(Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
2176 /* Do nothing if nothing actually changes. */ |
|
a44f9f59c656
(Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
2177 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
|
2178 return flag; |
|
a44f9f59c656
(Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents:
21244
diff
changeset
|
2179 |
|
72486
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2180 GCPRO1 (old_undo); |
|
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2181 |
|
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2182 /* 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
|
2183 instead. */ |
|
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2184 current_buffer->undo_list = Qt; |
|
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2185 |
|
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2186 /* 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
|
2187 clear_charpos_cache (current_buffer); |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2188 |
|
51391
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2189 if (NILP (flag)) |
|
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2190 begv = BEGV_BYTE, zv = ZV_BYTE; |
|
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2191 else |
|
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2192 begv = BEGV, zv = ZV; |
|
61ea5c492ffb
(Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents:
51318
diff
changeset
|
2193 |
|
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2194 if (narrowed) |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2195 Fwiden (); |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2196 |
|
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2197 if (NILP (flag)) |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2198 { |
|
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2199 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
|
2200 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
|
2201 |
|
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2202 /* 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
|
2203 to calculate the old correspondences. */ |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2204 set_intervals_multibyte (0); |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2205 |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2206 current_buffer->enable_multibyte_characters = Qnil; |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2207 |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2208 Z = Z_BYTE; |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2209 BEGV = BEGV_BYTE; |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2210 ZV = ZV_BYTE; |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2211 GPT = GPT_BYTE; |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2212 TEMP_SET_PT_BOTH (PT_BYTE, PT_BYTE); |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2213 |
|
55242
d57364949309
(syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents:
55140
diff
changeset
|
2214 |
|
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2215 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
|
2216 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
|
2217 |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2218 /* 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
|
2219 pos = BEG; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2220 stop = GPT; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2221 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
|
2222 while (1) |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2223 { |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2224 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
|
2225 |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2226 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
|
2227 { |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2228 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
|
2229 break; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2230 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
|
2231 stop = Z; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2232 } |
|
88354
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2233 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
|
2234 p++, pos++; |
|
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2235 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
|
2236 { |
|
88453
4e78ee207f40
(Fset_buffer_multibyte): Fix 8-bit char handling.
Kenichi Handa <handa@m17n.org>
parents:
88354
diff
changeset
|
2237 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
|
2238 /* 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
|
2239 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
|
2240 code. */ |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2241 bytes--; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2242 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
|
2243 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
|
2244 *p++ = c; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2245 pos++; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2246 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
|
2247 begv -= bytes; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2248 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
|
2249 zv -= bytes; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2250 stop = Z; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2251 } |
| 89483 | 2252 else |
|
88354
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2253 { |
|
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2254 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
|
2255 p += bytes, pos += bytes; |
|
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2256 } |
|
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2257 } |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2258 if (narrowed) |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2259 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
|
2260 } |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2261 else |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2262 { |
|
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2263 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
|
2264 int pos, stop; |
|
88354
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2265 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
|
2266 |
|
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2267 /* 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
|
2268 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
|
2269 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
|
2270 |
| 89483 | 2271 if (EQ (flag, Qt) |
|
88944
8628701201ae
(Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88547
diff
changeset
|
2272 && 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
|
2273 && ! 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
|
2274 { |
|
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2275 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
|
2276 |
|
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2277 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
|
2278 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
|
2279 { |
|
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2280 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
|
2281 |
|
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2282 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
|
2283 } |
|
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2284 } |
|
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2285 |
|
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2286 /* 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
|
2287 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
|
2288 pos = BEG; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2289 stop = GPT; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2290 p = BEG_ADDR; |
|
88354
8a0cda2f3c85
Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents:
42982
diff
changeset
|
2291 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
|
2292 while (1) |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2293 { |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2294 int bytes; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2295 |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2296 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
|
2297 { |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2298 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
|
2299 break; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2300 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
|
2301 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
|
2302 stop = Z; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2303 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
2304 |
|
88944
8628701201ae
(Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88547
diff
changeset
|
2305 if (ASCII_BYTE_P (*p)) |
|
8628701201ae
(Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88547
diff
changeset
|
2306 p++, pos++; |
| 89483 | 2307 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
|
2308 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
|
2309 else |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2310 { |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2311 unsigned char tmp[MAX_MULTIBYTE_LENGTH]; |
|
88944
8628701201ae
(Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88547
diff
changeset
|
2312 int c; |
|
8628701201ae
(Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88547
diff
changeset
|
2313 |
| 89483 | 2314 c = BYTE8_TO_CHAR (*p); |
|
88507
e3a506b5f300
(Fset_buffer_multibyte): Convert 8-bit bytes to
Kenichi Handa <handa@m17n.org>
parents:
88453
diff
changeset
|
2315 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
|
2316 *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
|
2317 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
|
2318 bytes--; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2319 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
|
2320 /* 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
|
2321 pos = GPT; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2322 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
|
2323 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
|
2324 begv += bytes; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2325 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
|
2326 zv += bytes; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2327 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
|
2328 pt += bytes; |
|
88453
4e78ee207f40
(Fset_buffer_multibyte): Fix 8-bit char handling.
Kenichi Handa <handa@m17n.org>
parents:
88354
diff
changeset
|
2329 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
|
2330 stop = Z; |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2331 } |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2332 } |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2333 |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2334 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
|
2335 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
|
2336 |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2337 if (narrowed) |
|
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2338 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
|
2339 |
|
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2340 /* 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
|
2341 set_intervals_multibyte needs it too. */ |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2342 current_buffer->enable_multibyte_characters = Qt; |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2343 |
|
20868
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2344 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
|
2345 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
|
2346 |
|
21065
fde58556c616
(Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents:
20995
diff
changeset
|
2347 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
|
2348 |
|
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2349 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
|
2350 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
|
2351 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
|
2352 else |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2353 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
|
2354 |
|
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2355 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
|
2356 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
|
2357 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
|
2358 else |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2359 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
|
2360 |
|
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2361 { |
|
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2362 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
|
2363 int pt; |
|
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2364 |
|
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2365 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
|
2366 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
|
2367 else |
|
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2368 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
|
2369 TEMP_SET_PT_BOTH (pt, pt_byte); |
|
83f23c9f7c4d
(advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20853
diff
changeset
|
2370 } |
|
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2371 |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2372 tail = markers = BUF_MARKERS (current_buffer); |
| 22021 | 2373 |
| 2374 /* This prevents BYTE_TO_CHAR (that is, buf_bytepos_to_charpos) from | |
| 2375 getting confused by the markers that have not yet been updated. | |
| 2376 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
|
2377 BUF_MARKERS (current_buffer) = NULL; |
|
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2378 |
|
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2379 for (; tail; tail = tail->next) |
|
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2380 { |
|
51669
f3dc77591fe2
(set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51431
diff
changeset
|
2381 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
|
2382 tail->charpos = BYTE_TO_CHAR (tail->bytepos); |
|
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2383 } |
|
22023
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2384 |
|
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2385 /* 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
|
2386 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
|
2387 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
|
2388 abort (); |
|
8c00a2d112cc
(Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents:
22021
diff
changeset
|
2389 |
|
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2390 BUF_MARKERS (current_buffer) = markers; |
|
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 /* 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
|
2393 between chars and bytes. */ |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2394 set_intervals_multibyte (1); |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2395 } |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2396 |
|
72486
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2397 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
|
2398 { |
|
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2399 /* 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
|
2400 extern Lisp_Object Qapply; |
|
72532
71e0aa245bce
(Fset_buffer_multibyte): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents:
72524
diff
changeset
|
2401 current_buffer->undo_list = Fcons (list3 (Qapply, |
|
71e0aa245bce
(Fset_buffer_multibyte): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents:
72524
diff
changeset
|
2402 intern ("set-buffer-multibyte"), |
|
71e0aa245bce
(Fset_buffer_multibyte): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents:
72524
diff
changeset
|
2403 NILP (flag) ? Qt : Qnil), |
|
71e0aa245bce
(Fset_buffer_multibyte): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents:
72524
diff
changeset
|
2404 old_undo); |
|
72486
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2405 } |
|
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2406 |
|
c5d047643872
2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents:
72299
diff
changeset
|
2407 UNGCPRO; |
|
28998
d8c9e2f7022f
(advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents:
28991
diff
changeset
|
2408 |
|
26970
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2409 /* 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
|
2410 showing that buffer must be updated thoroughly. */ |
|
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2411 current_buffer->prevent_redisplay_optimizations_p = 1; |
|
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2412 ++windows_or_buffers_changed; |
|
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2413 |
|
24604
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
2414 /* 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
|
2415 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
|
2416 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
|
2417 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
|
2418 { |
|
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2419 other->enable_multibyte_characters |
|
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2420 = current_buffer->enable_multibyte_characters; |
|
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2421 other->prevent_redisplay_optimizations_p = 1; |
|
7b3d9b3a9d69
(Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents:
26555
diff
changeset
|
2422 } |
|
24604
a9eb0deae6c0
(Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents:
24520
diff
changeset
|
2423 |
|
29456
1aa0c1122f75
(Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents:
29380
diff
changeset
|
2424 /* 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
|
2425 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
|
2426 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
|
2427 |
|
49974
3420da3e4b0f
(Fset_buffer_multibyte): Pay attention to the buffer
Kenichi Handa <handa@m17n.org>
parents:
49664
diff
changeset
|
2428 #ifdef subprocesses |
|
49664
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2429 /* 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
|
2430 { |
|
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2431 Lisp_Object process; |
|
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2432 |
|
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2433 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
|
2434 if (PROCESSP (process)) |
|
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2435 setup_process_coding_systems (process); |
|
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2436 } |
|
49974
3420da3e4b0f
(Fset_buffer_multibyte): Pay attention to the buffer
Kenichi Handa <handa@m17n.org>
parents:
49664
diff
changeset
|
2437 #endif /* subprocesses */ |
|
49664
8bcbac2617a9
(Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents:
49600
diff
changeset
|
2438 |
|
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2439 return flag; |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2440 } |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
2441 |
| 333 | 2442 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
|
2443 0, 0, 0, |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
2444 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
|
2445 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
|
2446 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
|
2447 `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
|
2448 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
|
2449 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
|
2450 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2451 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
|
2452 calling this function. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2453 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2454 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
|
2455 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
|
2456 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
2457 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
|
2458 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
|
2459 () |
| 333 | 2460 { |
| 2461 register Lisp_Object alist, sym, tem; | |
| 2462 Lisp_Object oalist; | |
|
5873
fa8b769ef564
(Fkill_all_local_variables): Run change-major-mode-hook.
Karl Heuer <kwzh@gnu.org>
parents:
5857
diff
changeset
|
2463 |
|
6205
88e41d7d1e27
(Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents:
6169
diff
changeset
|
2464 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
|
2465 call1 (Vrun_hooks, Qchange_major_mode_hook); |
| 333 | 2466 oalist = current_buffer->local_var_alist; |
| 2467 | |
|
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2468 /* Make sure none of the bindings in oalist |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2469 remain swapped in, in their symbols. */ |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2470 |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2471 swap_out_buffer_local_variables (current_buffer); |
| 333 | 2472 |
| 2473 /* Actually eliminate all local bindings of this buffer. */ | |
| 2474 | |
|
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
2475 reset_buffer_local_variables (current_buffer, 0); |
| 333 | 2476 |
| 2477 /* Any which are supposed to be permanent, | |
| 2478 make local again, with the same values they had. */ | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
2479 |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2480 for (alist = oalist; !NILP (alist); alist = XCDR (alist)) |
| 333 | 2481 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2482 sym = XCAR (XCAR (alist)); |
| 333 | 2483 tem = Fget (sym, Qpermanent_local); |
| 485 | 2484 if (! NILP (tem)) |
| 392 | 2485 { |
| 2486 Fmake_local_variable (sym); | |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2487 Fset (sym, XCDR (XCAR (alist))); |
| 392 | 2488 } |
| 333 | 2489 } |
| 2490 | |
| 2491 /* Force mode-line redisplay. Useful here because all major mode | |
| 2492 commands call this function. */ | |
| 2493 update_mode_lines++; | |
| 2494 | |
| 2495 return Qnil; | |
| 2496 } | |
|
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2497 |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2498 /* 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
|
2499 for their current values. */ |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2500 |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2501 static void |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2502 swap_out_buffer_local_variables (b) |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2503 struct buffer *b; |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2504 { |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2505 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
|
2506 |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2507 XSETBUFFER (buffer, b); |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2508 oalist = b->local_var_alist; |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2509 |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2510 for (alist = oalist; !NILP (alist); alist = XCDR (alist)) |
|
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2511 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
2512 sym = XCAR (XCAR (alist)); |
|
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2513 |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2514 /* 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
|
2515 tem = XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->buffer; |
|
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
2516 if (BUFFERP (tem) && XBUFFER (tem) == current_buffer) |
|
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2517 { |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2518 /* Symbol is set up for this buffer's old local value. |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2519 Set it up for the current buffer with the default value. */ |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2520 |
|
39581
6d9fa06012a6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
39337
diff
changeset
|
2521 tem = XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->cdr; |
|
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2522 /* Store the symbol's current value into the alist entry |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2523 it is currently set up for. This is so that, if the |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2524 local is marked permanent, and we make it local again |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2525 later in Fkill_all_local_variables, we don't lose the value. */ |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
2526 XSETCDR (XCAR (tem), |
|
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
2527 do_symval_forwarding (XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->realvalue)); |
|
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2528 /* Switch to the symbol's default-value alist entry. */ |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39971
diff
changeset
|
2529 XSETCAR (tem, tem); |
|
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2530 /* Mark it as current for buffer B. */ |
|
39581
6d9fa06012a6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
39337
diff
changeset
|
2531 XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->buffer = buffer; |
|
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2532 /* Store the current value into any forwarding in the symbol. */ |
|
21141
e30cebe8ae7c
(init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents:
21085
diff
changeset
|
2533 store_symval_forwarding (sym, |
|
39581
6d9fa06012a6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
39337
diff
changeset
|
2534 XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->realvalue, |
|
36818
c2640df9b55b
(swap_out_buffer_local_variables): Call
Gerd Moellmann <gerd@gnu.org>
parents:
36626
diff
changeset
|
2535 XCDR (tem), NULL); |
|
11214
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2536 } |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2537 } |
|
b880572ce431
(Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents:
11112
diff
changeset
|
2538 } |
| 333 | 2539 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2540 /* 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
|
2541 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
|
2542 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
|
2543 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
|
2544 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
|
2545 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
|
2546 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
|
2547 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
|
2548 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
|
2549 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2550 *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
|
2551 when this function is called. |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2552 |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2553 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
|
2554 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
|
2555 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
|
2556 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
|
2557 |
|
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2558 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
|
2559 *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
|
2560 default (BEGV or ZV). */ |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2561 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2562 int |
|
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2563 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
|
2564 EMACS_INT pos; |
|
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2565 int extend; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2566 Lisp_Object **vec_ptr; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2567 int *len_ptr; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2568 int *next_ptr; |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2569 int *prev_ptr; |
|
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
2570 int change_req; |
| 333 | 2571 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2572 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
|
2573 struct Lisp_Overlay *tail; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2574 int idx = 0; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2575 int len = *len_ptr; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2576 Lisp_Object *vec = *vec_ptr; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2577 int next = ZV; |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2578 int prev = BEGV; |
|
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2579 int inhibit_storing = 0; |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2580 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2581 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
|
2582 { |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2583 int startpos, endpos; |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2584 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2585 XSETMISC (overlay, tail); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2586 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2587 start = OVERLAY_START (overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2588 end = OVERLAY_END (overlay); |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2589 endpos = OVERLAY_POSITION (end); |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2590 if (endpos < pos) |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2591 { |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2592 if (prev < endpos) |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2593 prev = endpos; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2594 break; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2595 } |
|
25184
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2596 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
|
2597 /* 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
|
2598 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
|
2599 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
|
2600 prev = startpos; |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2601 if (endpos == pos) |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2602 continue; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2603 if (startpos <= pos) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2604 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2605 if (idx == len) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2606 { |
|
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2607 /* The supplied vector is full. |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2608 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
|
2609 if (extend) |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2610 { |
|
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2611 /* 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
|
2612 len *= 2; |
|
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2613 if (len == 0) |
|
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2614 len = 4; |
|
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2615 *len_ptr = len; |
|
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2616 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
|
2617 *vec_ptr = vec; |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2618 } |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2619 else |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2620 inhibit_storing = 1; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2621 } |
|
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2622 |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2623 if (!inhibit_storing) |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2624 vec[idx] = overlay; |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2625 /* 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
|
2626 idx++; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2627 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2628 else if (startpos < next) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2629 next = startpos; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2630 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2631 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2632 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
|
2633 { |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2634 int startpos, endpos; |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2635 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2636 XSETMISC (overlay, tail); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2637 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2638 start = OVERLAY_START (overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2639 end = OVERLAY_END (overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2640 startpos = OVERLAY_POSITION (start); |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2641 if (pos < startpos) |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2642 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2643 if (startpos < next) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2644 next = startpos; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2645 break; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2646 } |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2647 endpos = OVERLAY_POSITION (end); |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2648 if (pos < endpos) |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2649 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2650 if (idx == len) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2651 { |
|
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2652 if (extend) |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2653 { |
|
46920
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2654 /* 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
|
2655 len *= 2; |
|
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
2656 if (len == 0) |
|
46920
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2657 len = 4; |
|
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2658 *len_ptr = len; |
|
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2659 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
|
2660 *vec_ptr = vec; |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2661 } |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2662 else |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2663 inhibit_storing = 1; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2664 } |
|
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2665 |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2666 if (!inhibit_storing) |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2667 vec[idx] = overlay; |
|
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
2668 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
|
2669 |
|
290fceb2b1c0
(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
25181
diff
changeset
|
2670 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
|
2671 prev = startpos; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2672 } |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2673 else if (endpos < pos && endpos > prev) |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2674 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
|
2675 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
|
2676 && (!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
|
2677 prev = startpos; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2678 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2679 |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2680 if (next_ptr) |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2681 *next_ptr = next; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2682 if (prev_ptr) |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
2683 *prev_ptr = prev; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2684 return idx; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2685 } |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2686 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2687 /* Find all the overlays in the current buffer that overlap the range BEG-END |
|
12488
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2688 or are empty at BEG. |
|
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2689 |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
2690 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
|
2691 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
|
2692 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
|
2693 or ZV if there are no more overlays. |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2694 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
|
2695 or BEGV if there are no previous overlays. |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2696 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
|
2697 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2698 *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
|
2699 when this function is called. |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2700 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2701 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
|
2702 If EXTEND is zero, we never extend the vector, |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2703 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
|
2704 But we still return the total number of overlays. */ |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2705 |
|
50304
d9d826db650f
(overlays_in): Declare static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50014
diff
changeset
|
2706 static int |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2707 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
|
2708 int beg, end; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2709 int extend; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2710 Lisp_Object **vec_ptr; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2711 int *len_ptr; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2712 int *next_ptr; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2713 int *prev_ptr; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2714 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2715 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
|
2716 struct Lisp_Overlay *tail; |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2717 int idx = 0; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2718 int len = *len_ptr; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2719 Lisp_Object *vec = *vec_ptr; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2720 int next = ZV; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2721 int prev = BEGV; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2722 int inhibit_storing = 0; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2723 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2724 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
|
2725 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2726 int startpos, endpos; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2727 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2728 XSETMISC (overlay, tail); |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2729 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2730 ostart = OVERLAY_START (overlay); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2731 oend = OVERLAY_END (overlay); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2732 endpos = OVERLAY_POSITION (oend); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2733 if (endpos < beg) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2734 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2735 if (prev < endpos) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2736 prev = endpos; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2737 break; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2738 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2739 startpos = OVERLAY_POSITION (ostart); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2740 /* Count an interval if it either overlaps the range |
|
12488
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2741 or is empty at the start of the range. */ |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2742 if ((beg < endpos && startpos < end) |
|
12488
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2743 || (startpos == endpos && beg == endpos)) |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2744 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2745 if (idx == len) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2746 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2747 /* The supplied vector is full. |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2748 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
|
2749 if (extend) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2750 { |
|
46920
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2751 /* 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
|
2752 len *= 2; |
|
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2753 if (len == 0) |
|
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2754 len = 4; |
|
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2755 *len_ptr = len; |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2756 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2757 *vec_ptr = vec; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2758 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2759 else |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2760 inhibit_storing = 1; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2761 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2762 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2763 if (!inhibit_storing) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2764 vec[idx] = overlay; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2765 /* 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
|
2766 idx++; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2767 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2768 else if (startpos < next) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2769 next = startpos; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2770 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2771 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2772 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
|
2773 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2774 int startpos, endpos; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2775 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2776 XSETMISC (overlay, tail); |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2777 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2778 ostart = OVERLAY_START (overlay); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2779 oend = OVERLAY_END (overlay); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2780 startpos = OVERLAY_POSITION (ostart); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2781 if (end < startpos) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2782 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2783 if (startpos < next) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2784 next = startpos; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2785 break; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2786 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2787 endpos = OVERLAY_POSITION (oend); |
|
12488
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2788 /* Count an interval if it either overlaps the range |
|
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2789 or is empty at the start of the range. */ |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2790 if ((beg < endpos && startpos < end) |
|
12488
71aa23be0228
(overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents:
12382
diff
changeset
|
2791 || (startpos == endpos && beg == endpos)) |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2792 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2793 if (idx == len) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2794 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2795 if (extend) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2796 { |
|
46920
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2797 /* 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
|
2798 len *= 2; |
|
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2799 if (len == 0) |
|
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2800 len = 4; |
|
a92cb918558c
(overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents:
46864
diff
changeset
|
2801 *len_ptr = len; |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2802 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2803 *vec_ptr = vec; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2804 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2805 else |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2806 inhibit_storing = 1; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2807 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2808 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2809 if (!inhibit_storing) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2810 vec[idx] = overlay; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2811 idx++; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2812 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2813 else if (endpos < beg && endpos > prev) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2814 prev = endpos; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2815 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2816 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2817 if (next_ptr) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2818 *next_ptr = next; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2819 if (prev_ptr) |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2820 *prev_ptr = prev; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2821 return idx; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2822 } |
|
36584
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2823 |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2824 |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2825 /* 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
|
2826 `mouse-face' property overlapping OVERLAY. */ |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2827 |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2828 int |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2829 mouse_face_overlay_overlaps (overlay) |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2830 Lisp_Object overlay; |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2831 { |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2832 int start = OVERLAY_POSITION (OVERLAY_START (overlay)); |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2833 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
|
2834 int n, i, size; |
|
36584
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2835 Lisp_Object *v, tem; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
2836 |
|
37463
7db9a70334b7
(mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents:
37011
diff
changeset
|
2837 size = 10; |
|
7db9a70334b7
(mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents:
37011
diff
changeset
|
2838 v = (Lisp_Object *) alloca (size * sizeof *v); |
|
7db9a70334b7
(mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents:
37011
diff
changeset
|
2839 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
|
2840 if (n > size) |
|
36584
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2841 { |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2842 v = (Lisp_Object *) alloca (n * sizeof *v); |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2843 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
|
2844 } |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2845 |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2846 for (i = 0; i < n; ++i) |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2847 if (!EQ (v[i], overlay) |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2848 && (tem = Foverlay_get (overlay, Qmouse_face), |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2849 !NILP (tem))) |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2850 break; |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2851 |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2852 return i < n; |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2853 } |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2854 |
|
1f80152aeddc
(mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
35339
diff
changeset
|
2855 |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
2856 |
|
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2857 /* 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
|
2858 int |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2859 overlay_touches_p (pos) |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2860 int pos; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2861 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2862 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
|
2863 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
|
2864 |
|
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2865 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
|
2866 { |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2867 int endpos; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2868 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2869 XSETMISC (overlay ,tail); |
|
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2870 if (!GC_OVERLAYP (overlay)) |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2871 abort (); |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2872 |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2873 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2874 if (endpos < pos) |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2875 break; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2876 if (endpos == pos || OVERLAY_POSITION (OVERLAY_START (overlay)) == pos) |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2877 return 1; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2878 } |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2879 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2880 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
|
2881 { |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2882 int startpos; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2883 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
2884 XSETMISC (overlay, tail); |
|
11097
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2885 if (!GC_OVERLAYP (overlay)) |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2886 abort (); |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2887 |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2888 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2889 if (pos < startpos) |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2890 break; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2891 if (startpos == pos || OVERLAY_POSITION (OVERLAY_END (overlay)) == pos) |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2892 return 1; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2893 } |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2894 return 0; |
|
e1b4b0d66bf3
(overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11052
diff
changeset
|
2895 } |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2896 |
|
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2897 struct sortvec |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2898 { |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2899 Lisp_Object overlay; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2900 int beg, end; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2901 int priority; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2902 }; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2903 |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2904 static int |
| 21514 | 2905 compare_overlays (v1, v2) |
| 2906 const void *v1, *v2; | |
|
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2907 { |
| 21514 | 2908 const struct sortvec *s1 = (const struct sortvec *) v1; |
| 2909 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
|
2910 if (s1->priority != s2->priority) |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2911 return s1->priority - s2->priority; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2912 if (s1->beg != s2->beg) |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2913 return s1->beg - s2->beg; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2914 if (s1->end != s2->end) |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2915 return s2->end - s1->end; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2916 return 0; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2917 } |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2918 |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2919 /* 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
|
2920 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
|
2921 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
|
2922 int |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2923 sort_overlays (overlay_vec, noverlays, w) |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2924 Lisp_Object *overlay_vec; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2925 int noverlays; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2926 struct window *w; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2927 { |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2928 int i, j; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2929 struct sortvec *sortvec; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2930 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
|
2931 |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2932 /* 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
|
2933 |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2934 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
|
2935 { |
|
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2936 Lisp_Object tem; |
|
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
2937 Lisp_Object overlay; |
|
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
2938 |
|
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
2939 overlay = overlay_vec[i]; |
|
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2940 if (OVERLAY_VALID (overlay) |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2941 && OVERLAY_POSITION (OVERLAY_START (overlay)) > 0 |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2942 && OVERLAY_POSITION (OVERLAY_END (overlay)) > 0) |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2943 { |
|
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2944 /* 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
|
2945 overlays that are limited to some other window. */ |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2946 if (w) |
|
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2947 { |
|
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2948 Lisp_Object window; |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2949 |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2950 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
|
2951 if (WINDOWP (window) && XWINDOW (window) != w) |
|
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2952 continue; |
|
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2953 } |
|
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2954 |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2955 /* 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
|
2956 sortvec[j].overlay = overlay; |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2957 sortvec[j].beg = OVERLAY_POSITION (OVERLAY_START (overlay)); |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2958 sortvec[j].end = OVERLAY_POSITION (OVERLAY_END (overlay)); |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2959 tem = Foverlay_get (overlay, Qpriority); |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2960 if (INTEGERP (tem)) |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2961 sortvec[j].priority = XINT (tem); |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2962 else |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2963 sortvec[j].priority = 0; |
|
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
2964 j++; |
|
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2965 } |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2966 } |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2967 noverlays = j; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2968 |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2969 /* 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
|
2970 |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2971 if (noverlays > 1) |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2972 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
|
2973 |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2974 for (i = 0; i < noverlays; i++) |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2975 overlay_vec[i] = sortvec[i].overlay; |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2976 return (noverlays); |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2977 } |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2978 |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2979 struct sortstr |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2980 { |
|
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
2981 Lisp_Object string, string2; |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2982 int size; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2983 int priority; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2984 }; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
2985 |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2986 struct sortstrlist |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2987 { |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2988 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
|
2989 int size; /* Allocated length of that array. */ |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2990 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
|
2991 int bytes; /* Total length of the strings in buf. */ |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2992 }; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2993 |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2994 /* Buffers for storing information about the overlays touching a given |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2995 position. These could be automatic variables in overlay_strings, but |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2996 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
|
2997 allocating and freeing it. */ |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
2998 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
|
2999 static unsigned char *overlay_str_buf; |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3000 |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3001 /* Allocated length of overlay_str_buf. */ |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3002 static int overlay_str_len; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3003 |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3004 /* A comparison function suitable for passing to qsort. */ |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3005 static int |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3006 cmp_for_strings (as1, as2) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3007 char *as1, *as2; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3008 { |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3009 struct sortstr *s1 = (struct sortstr *)as1; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3010 struct sortstr *s2 = (struct sortstr *)as2; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3011 if (s1->size != s2->size) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3012 return s2->size - s1->size; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3013 if (s1->priority != s2->priority) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3014 return s1->priority - s2->priority; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3015 return 0; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3016 } |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3017 |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3018 static void |
|
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3019 record_overlay_string (ssl, str, str2, pri, size) |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3020 struct sortstrlist *ssl; |
|
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3021 Lisp_Object str, str2, pri; |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3022 int size; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3023 { |
|
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3024 int nbytes; |
|
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3025 |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3026 if (ssl->used == ssl->size) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3027 { |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3028 if (ssl->buf) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3029 ssl->size *= 2; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3030 else |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3031 ssl->size = 5; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3032 ssl->buf = ((struct sortstr *) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3033 xrealloc (ssl->buf, ssl->size * sizeof (struct sortstr))); |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3034 } |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3035 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
|
3036 ssl->buf[ssl->used].string2 = str2; |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3037 ssl->buf[ssl->used].size = size; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3038 ssl->buf[ssl->used].priority = (INTEGERP (pri) ? XINT (pri) : 0); |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3039 ssl->used++; |
|
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3040 |
|
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3041 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
|
3042 nbytes = SCHARS (str); |
|
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3043 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
|
3044 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
|
3045 SBYTES (str)); |
|
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3046 else |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3047 nbytes = SBYTES (str); |
|
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3048 |
|
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3049 ssl->bytes += nbytes; |
|
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3050 |
|
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3051 if (STRINGP (str2)) |
|
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3052 { |
|
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3053 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
|
3054 nbytes = SCHARS (str2); |
|
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3055 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
|
3056 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
|
3057 SBYTES (str2)); |
|
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3058 else |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3059 nbytes = SBYTES (str2); |
|
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3060 |
|
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3061 ssl->bytes += nbytes; |
|
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3062 } |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3063 } |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3064 |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3065 /* 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
|
3066 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
|
3067 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
|
3068 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
|
3069 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
|
3070 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
|
3071 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
|
3072 |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3073 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
|
3074 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
|
3075 subsequent calls. */ |
|
16243
b311d8755530
(overlay_strings): Declare pstr using unsigned char.
Richard M. Stallman <rms@gnu.org>
parents:
16213
diff
changeset
|
3076 |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3077 int |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3078 overlay_strings (pos, w, pstr) |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3079 EMACS_INT pos; |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3080 struct window *w; |
|
16243
b311d8755530
(overlay_strings): Declare pstr using unsigned char.
Richard M. Stallman <rms@gnu.org>
parents:
16213
diff
changeset
|
3081 unsigned char **pstr; |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3082 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3083 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
|
3084 struct Lisp_Overlay *ov; |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3085 int startpos, endpos; |
|
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3086 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
|
3087 |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3088 overlay_heads.used = overlay_heads.bytes = 0; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3089 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
|
3090 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
|
3091 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3092 XSETMISC (overlay, ov); |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3093 eassert (OVERLAYP (overlay)); |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3094 |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3095 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3096 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3097 if (endpos < pos) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3098 break; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3099 if (endpos != pos && startpos != pos) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3100 continue; |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3101 window = Foverlay_get (overlay, Qwindow); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3102 if (WINDOWP (window) && XWINDOW (window) != w) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3103 continue; |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3104 if (startpos == pos |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3105 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3106 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
|
3107 (startpos == endpos |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3108 ? 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
|
3109 : Qnil), |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3110 Foverlay_get (overlay, Qpriority), |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3111 endpos - startpos); |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3112 else if (endpos == pos |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3113 && (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
|
3114 record_overlay_string (&overlay_tails, str, Qnil, |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3115 Foverlay_get (overlay, Qpriority), |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3116 endpos - startpos); |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3117 } |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3118 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
|
3119 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3120 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
|
3121 eassert (OVERLAYP (overlay)); |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3122 |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3123 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3124 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3125 if (startpos > pos) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3126 break; |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3127 if (endpos != pos && startpos != pos) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3128 continue; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3129 window = Foverlay_get (overlay, Qwindow); |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3130 if (WINDOWP (window) && XWINDOW (window) != w) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3131 continue; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3132 if (startpos == pos |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3133 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3134 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
|
3135 (startpos == endpos |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3136 ? 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
|
3137 : Qnil), |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3138 Foverlay_get (overlay, Qpriority), |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3139 endpos - startpos); |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3140 else if (endpos == pos |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3141 && (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
|
3142 record_overlay_string (&overlay_tails, str, Qnil, |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3143 Foverlay_get (overlay, Qpriority), |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3144 endpos - startpos); |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3145 } |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3146 if (overlay_tails.used > 1) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3147 qsort (overlay_tails.buf, overlay_tails.used, sizeof (struct sortstr), |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3148 cmp_for_strings); |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3149 if (overlay_heads.used > 1) |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3150 qsort (overlay_heads.buf, overlay_heads.used, sizeof (struct sortstr), |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3151 cmp_for_strings); |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3152 if (overlay_heads.bytes || overlay_tails.bytes) |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3153 { |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3154 Lisp_Object tem; |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3155 int i; |
|
18603
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
3156 unsigned char *p; |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3157 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
|
3158 |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3159 if (total > overlay_str_len) |
|
18603
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
3160 { |
|
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
3161 overlay_str_len = total; |
|
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
3162 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
|
3163 total); |
|
525fb9a7cc96
(overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18526
diff
changeset
|
3164 } |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3165 p = overlay_str_buf; |
|
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3166 for (i = overlay_tails.used; --i >= 0;) |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3167 { |
|
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3168 int nbytes; |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3169 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
|
3170 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
|
3171 SBYTES (tem), |
|
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3172 STRING_MULTIBYTE (tem), multibyte); |
|
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3173 p += nbytes; |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3174 } |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3175 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
|
3176 { |
|
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3177 int nbytes; |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3178 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
|
3179 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
|
3180 SBYTES (tem), |
|
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3181 STRING_MULTIBYTE (tem), multibyte); |
|
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3182 p += nbytes; |
|
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3183 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
|
3184 if (STRINGP (tem)) |
|
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3185 { |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3186 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
|
3187 SBYTES (tem), |
|
20586
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3188 STRING_MULTIBYTE (tem), multibyte); |
|
90d6a75210d6
(record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents:
20538
diff
changeset
|
3189 p += nbytes; |
|
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3190 } |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3191 } |
|
12699
d0f4113de2ea
(record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents:
12697
diff
changeset
|
3192 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
|
3193 abort (); |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3194 if (pstr) |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3195 *pstr = overlay_str_buf; |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3196 return total; |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3197 } |
|
12697
9ebf33d6d07c
(struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents:
12538
diff
changeset
|
3198 return 0; |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3199 } |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
3200 |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3201 /* Shift overlays in BUF's overlay lists, to center the lists at POS. */ |
| 333 | 3202 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3203 void |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3204 recenter_overlay_lists (buf, pos) |
|
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3205 struct buffer *buf; |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3206 EMACS_INT pos; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3207 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3208 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
|
3209 struct Lisp_Overlay *prev, *tail, *next; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3210 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3211 /* 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
|
3212 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3213 /* 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
|
3214 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
|
3215 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
|
3216 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
|
3217 for (tail = buf->overlays_before; tail; prev = tail, tail = next) |
| 333 | 3218 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3219 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
|
3220 XSETMISC (overlay, tail); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3221 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3222 /* 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
|
3223 if (!OVERLAY_VALID (overlay)) |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3224 #if 1 |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3225 abort (); |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3226 #else |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3227 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3228 /* 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
|
3229 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
|
3230 XCDR (prev) = next; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3231 else |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3232 buf->overlays_before = next; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3233 tail = prev; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3234 continue; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3235 } |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3236 #endif |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3237 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3238 beg = OVERLAY_START (overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3239 end = OVERLAY_END (overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3240 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3241 if (OVERLAY_POSITION (end) > pos) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3242 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3243 /* OVERLAY needs to be moved. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3244 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
|
3245 struct Lisp_Overlay *other, *other_prev; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3246 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3247 /* 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
|
3248 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
|
3249 prev->next = next; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3250 else |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3251 buf->overlays_before = next; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3252 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3253 /* 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
|
3254 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
|
3255 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
|
3256 other_prev = other, other = other->next) |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3257 { |
|
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
3258 Lisp_Object otherbeg, otheroverlay; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3259 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3260 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
|
3261 eassert (OVERLAY_VALID (otheroverlay)); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3262 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3263 otherbeg = OVERLAY_START (otheroverlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3264 if (OVERLAY_POSITION (otherbeg) >= where) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3265 break; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3266 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3267 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3268 /* 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
|
3269 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
|
3270 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
|
3271 other_prev->next = tail; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3272 else |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3273 buf->overlays_after = tail; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3274 tail = prev; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3275 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3276 else |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3277 /* 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
|
3278 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
|
3279 so stop now. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3280 break; |
| 333 | 3281 } |
| 3282 | |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3283 /* 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
|
3284 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
|
3285 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
|
3286 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3287 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
|
3288 XSETMISC (overlay, tail); |
| 333 | 3289 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3290 /* 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
|
3291 if (!OVERLAY_VALID (overlay)) |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3292 #if 1 |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3293 abort (); |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3294 #else |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3295 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3296 /* 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
|
3297 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
|
3298 XCDR (prev) = next; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3299 else |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3300 buf->overlays_after = next; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3301 tail = prev; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3302 continue; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3303 } |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3304 #endif |
| 333 | 3305 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3306 beg = OVERLAY_START (overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3307 end = OVERLAY_END (overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3308 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3309 /* Stop looking, when we know that nothing further |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3310 can possibly end before POS. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3311 if (OVERLAY_POSITION (beg) > pos) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3312 break; |
| 333 | 3313 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3314 if (OVERLAY_POSITION (end) <= pos) |
| 333 | 3315 { |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3316 /* OVERLAY needs to be moved. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3317 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
|
3318 struct Lisp_Overlay *other, *other_prev; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3319 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3320 /* 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
|
3321 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
|
3322 prev->next = next; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3323 else |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3324 buf->overlays_after = next; |
|
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 /* 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
|
3327 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
|
3328 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
|
3329 other_prev = other, other = other->next) |
| 333 | 3330 { |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3331 Lisp_Object otherend, otheroverlay; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3332 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3333 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
|
3334 eassert (OVERLAY_VALID (otheroverlay)); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3335 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3336 otherend = OVERLAY_END (otheroverlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3337 if (OVERLAY_POSITION (otherend) <= where) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3338 break; |
| 333 | 3339 } |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3340 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3341 /* 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
|
3342 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
|
3343 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
|
3344 other_prev->next = tail; |
| 333 | 3345 else |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3346 buf->overlays_before = tail; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3347 tail = prev; |
| 333 | 3348 } |
| 3349 } | |
| 3350 | |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3351 buf->overlay_center = pos; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3352 } |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3353 |
|
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3354 void |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3355 adjust_overlays_for_insert (pos, length) |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3356 EMACS_INT pos; |
|
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3357 EMACS_INT length; |
|
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3358 { |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3359 /* 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
|
3360 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
|
3361 if (current_buffer->overlay_center >= pos) |
|
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3362 current_buffer->overlay_center += length; |
|
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3363 } |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3364 |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3365 void |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3366 adjust_overlays_for_delete (pos, length) |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3367 EMACS_INT pos; |
|
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3368 EMACS_INT length; |
|
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3369 { |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3370 if (current_buffer->overlay_center < pos) |
|
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3371 /* 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
|
3372 after-lists are still consistent. */ |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3373 ; |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3374 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
|
3375 /* 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
|
3376 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
|
3377 given the new value. */ |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3378 current_buffer->overlay_center -= length; |
|
11473
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3379 else |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3380 /* 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
|
3381 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
|
3382 and also update the center point. */ |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3383 recenter_overlay_lists (current_buffer, pos); |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3384 } |
|
24ede15e0aaa
(adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents:
11418
diff
changeset
|
3385 |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3386 /* 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
|
3387 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
|
3388 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
|
3389 list and reinserted in its proper place. |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3390 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
|
3391 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
|
3392 void |
|
54555
b136a4512609
* insdel.c (adjust_markers_for_insert): Call fix_start_end_in_overlays.
Masatake YAMATO <jet@gyve.org>
parents:
54266
diff
changeset
|
3393 fix_start_end_in_overlays (start, end) |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3394 register int start, end; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3395 { |
|
25744
8b89b961f7d1
(Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25664
diff
changeset
|
3396 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
|
3397 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
|
3398 /* 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
|
3399 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
|
3400 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
|
3401 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
|
3402 /* '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
|
3403 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
|
3404 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
|
3405 struct Lisp_Overlay *tail, *parent; |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3406 int startpos, endpos; |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3407 |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3408 /* 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
|
3409 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
|
3410 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
|
3411 (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
|
3412 (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
|
3413 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
|
3414 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
|
3415 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
|
3416 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3417 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
|
3418 |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3419 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
|
3420 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
|
3421 |
|
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3422 /* 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
|
3423 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
|
3424 { |
|
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3425 startpos = endpos; |
|
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3426 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
|
3427 Qnil); |
|
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3428 } |
|
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3429 |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3430 if (endpos < start) |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3431 break; |
|
55242
d57364949309
(syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents:
55140
diff
changeset
|
3432 |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3433 if (endpos < end |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3434 || (startpos >= start && startpos < end)) |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3435 { |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3436 /* 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
|
3437 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
|
3438 if (endpos < current_buffer->overlay_center) |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3439 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3440 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
|
3441 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
|
3442 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
|
3443 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
|
3444 afterp = tail; |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3445 } |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3446 else |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3447 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3448 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
|
3449 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
|
3450 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
|
3451 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
|
3452 beforep = tail; |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3453 } |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3454 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
|
3455 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
|
3456 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
|
3457 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
|
3458 tail = tail->next; |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3459 } |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3460 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
|
3461 parent = tail, tail = parent->next; |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3462 } |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3463 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
|
3464 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3465 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
|
3466 |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3467 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
|
3468 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
|
3469 |
|
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3470 /* 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
|
3471 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
|
3472 { |
|
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3473 startpos = endpos; |
|
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3474 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
|
3475 Qnil); |
|
54772
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3476 } |
|
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3477 |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3478 if (startpos >= end) |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3479 break; |
|
54772
956112814473
(fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents:
54555
diff
changeset
|
3480 |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3481 if (startpos >= start |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3482 || (endpos >= start && endpos < end)) |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3483 { |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3484 if (endpos < current_buffer->overlay_center) |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3485 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3486 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
|
3487 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
|
3488 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
|
3489 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
|
3490 afterp = tail; |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3491 } |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3492 else |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3493 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3494 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
|
3495 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
|
3496 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
|
3497 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
|
3498 beforep = tail; |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3499 } |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3500 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
|
3501 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
|
3502 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
|
3503 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
|
3504 tail = tail->next; |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3505 } |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3506 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
|
3507 parent = tail, tail = parent->next; |
|
7520
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3508 } |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3509 |
|
6cc6328992d6
(fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7492
diff
changeset
|
3510 /* 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
|
3511 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
|
3512 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
|
3513 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3514 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
|
3515 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
|
3516 } |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3517 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
|
3518 |
|
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 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
|
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 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
|
3522 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
|
3523 } |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3524 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
|
3525 } |
| 17022 | 3526 |
| 3527 /* We have two types of overlay: the one whose ending marker is | |
| 3528 after-insertion-marker (this is the usual case) and the one whose | |
| 3529 ending marker is before-insertion-marker. When `overlays_before' | |
| 3530 contains overlays of the latter type and the former type in this | |
| 3531 order and both overlays end at inserting position, inserting a text | |
| 3532 increases only the ending marker of the latter type, which results | |
| 3533 in incorrect ordering of `overlays_before'. | |
| 3534 | |
| 3535 This function fixes ordering of overlays in the slot | |
| 3536 `overlays_before' of the buffer *BP. Before the insertion, `point' | |
| 3537 was at PREV, and now is at POS. */ | |
| 3538 | |
|
20368
9f5fab56f4b3
(nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents:
20186
diff
changeset
|
3539 void |
| 17022 | 3540 fix_overlays_before (bp, prev, pos) |
| 3541 struct buffer *bp; | |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3542 EMACS_INT prev, pos; |
| 17022 | 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 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
|
3545 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
|
3546 Lisp_Object tem; |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3547 EMACS_INT end; |
| 17022 | 3548 |
| 3549 /* After the insertion, the several overlays may be in incorrect | |
| 3550 order. The possibility is that, in the list `overlays_before', | |
| 3551 an overlay which ends at POS appears after an overlay which ends | |
| 3552 at PREV. Since POS is greater than PREV, we must fix the | |
| 3553 ordering of these overlays, by moving overlays ends at POS before | |
| 3554 the overlays ends at PREV. */ | |
| 3555 | |
| 3556 /* At first, find a place where disordered overlays should be linked | |
| 3557 in. It is where an overlay which end before POS exists. (i.e. an | |
| 3558 overlay whose ending marker is after-insertion-marker if disorder | |
| 3559 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
|
3560 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
|
3561 && (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
|
3562 (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
|
3563 { |
|
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3564 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
|
3565 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
|
3566 } |
| 17022 | 3567 |
| 3568 /* If we don't find such an overlay, | |
| 3569 or the found one ends before PREV, | |
| 3570 or the found one is the last one in the list, | |
| 3571 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
|
3572 if (!tail || end < prev || !tail->next) |
| 17022 | 3573 return; |
| 3574 | |
|
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
|
3575 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
|
3576 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
|
3577 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
|
3578 |
|
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3579 /* Now, end position of overlays in the list TAIL should be before |
| 17022 | 3580 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
|
3581 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
|
3582 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
|
3583 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
|
3584 while (tail) |
| 17022 | 3585 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3586 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
|
3587 end = OVERLAY_POSITION (OVERLAY_END (tem)); |
| 17022 | 3588 |
| 3589 if (end == pos) | |
| 3590 { /* 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
|
3591 struct Lisp_Overlay *found = tail; |
| 17022 | 3592 |
| 3593 /* 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
|
3594 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
|
3595 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
|
3596 /* 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
|
3597 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
|
3598 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
|
3599 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3600 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
|
3601 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
|
3602 } |
|
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3603 else |
|
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3604 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3605 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
|
3606 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
|
3607 } |
| 17022 | 3608 } |
| 3609 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
|
3610 { |
|
030fb28e7ec2
* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents:
44790
diff
changeset
|
3611 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
|
3612 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
|
3613 } |
| 17022 | 3614 else /* No more disordered overlay. */ |
| 3615 break; | |
| 3616 } | |
| 3617 } | |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3618 |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3619 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
|
3620 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
|
3621 (object) |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3622 Lisp_Object object; |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3623 { |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3624 return (OVERLAYP (object) ? Qt : Qnil); |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3625 } |
|
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3626 |
|
13446
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3627 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
|
3628 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
|
3629 If omitted, BUFFER defaults to the current buffer. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3630 BEG and END may be integers or markers. |
|
64412
a1807609d4c2
(Fmake_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
64084
diff
changeset
|
3631 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
|
3632 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
|
3633 \(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
|
3634 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
|
3635 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
|
3636 \(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
|
3637 (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
|
3638 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
|
3639 Lisp_Object front_advance, rear_advance; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3640 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3641 Lisp_Object overlay; |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3642 struct buffer *b; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3643 |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3644 if (NILP (buffer)) |
|
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
3645 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
|
3646 else |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3647 CHECK_BUFFER (buffer); |
|
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3648 if (MARKERP (beg) |
|
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3649 && ! 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
|
3650 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
|
3651 if (MARKERP (end) |
|
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3652 && ! 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
|
3653 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
|
3654 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3655 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
|
3656 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
|
3657 |
|
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3658 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
|
3659 { |
|
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3660 Lisp_Object temp; |
|
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3661 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
|
3662 } |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3663 |
|
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3664 b = XBUFFER (buffer); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3665 |
|
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3666 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
|
3667 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
|
3668 |
|
13446
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3669 if (!NILP (front_advance)) |
|
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3670 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
|
3671 if (!NILP (rear_advance)) |
|
005d7ed9d69b
(Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents:
13270
diff
changeset
|
3672 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
|
3673 |
|
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3674 overlay = allocate_misc (); |
|
11244
f3b11dc9014e
(Fmake_overlay): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents:
11214
diff
changeset
|
3675 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
|
3676 XOVERLAY (overlay)->start = beg; |
|
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3677 XOVERLAY (overlay)->end = end; |
|
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3678 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
|
3679 XOVERLAY (overlay)->next = NULL; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3680 |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
3681 /* 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
|
3682 end = OVERLAY_END (overlay); |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3683 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
|
3684 { |
|
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3685 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
|
3686 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
|
3687 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
|
3688 } |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3689 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
|
3690 { |
|
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3691 if (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
|
3692 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
|
3693 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
|
3694 } |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3695 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3696 /* 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
|
3697 recenter_overlay_lists (b, b->overlay_center); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3698 |
|
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3699 /* 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
|
3700 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
|
3701 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3702 return overlay; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3703 } |
|
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3704 |
|
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3705 /* 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
|
3706 |
|
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3707 static void |
|
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3708 modify_overlay (buf, start, end) |
|
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3709 struct buffer *buf; |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3710 EMACS_INT start, end; |
|
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3711 { |
|
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3712 if (start > end) |
|
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3713 { |
|
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3714 int temp = start; |
|
39333
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3715 start = end; |
|
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3716 end = temp; |
|
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3717 } |
|
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3718 |
|
27012
520f982f3a9a
(modify_overlay): Always compute unchanged info.
Gerd Moellmann <gerd@gnu.org>
parents:
26970
diff
changeset
|
3719 BUF_COMPUTE_UNCHANGED (buf, start, end); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
3720 |
|
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3721 /* 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
|
3722 we must do other windows. */ |
|
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3723 if (buf != XBUFFER (XWINDOW (selected_window)->buffer)) |
|
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3724 windows_or_buffers_changed = 1; |
|
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3725 /* 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
|
3726 else if (buffer_shared > 1) |
|
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3727 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
|
3728 /* 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
|
3729 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
|
3730 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
|
3731 windows_or_buffers_changed = 1; |
|
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3732 |
|
19801
7482ad23e430
(modify_overlay): Update overlay_modiff of proper buffer.
Richard M. Stallman <rms@gnu.org>
parents:
19581
diff
changeset
|
3733 ++BUF_OVERLAY_MODIFF (buf); |
|
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3734 } |
|
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3735 |
|
39971
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3736 |
|
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3737 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
|
3738 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3739 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
|
3740 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
|
3741 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
|
3742 { |
|
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3743 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
|
3744 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
|
3745 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
|
3746 { |
|
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3747 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
|
3748 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
|
3749 else |
|
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3750 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
|
3751 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
|
3752 break; |
|
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3753 } |
|
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3754 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
|
3755 } |
|
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3756 |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3757 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
|
3758 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
|
3759 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
|
3760 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
|
3761 buffer. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3762 (overlay, beg, end, buffer) |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3763 Lisp_Object overlay, beg, end, buffer; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3764 { |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3765 struct buffer *b, *ob; |
|
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3766 Lisp_Object obuffer; |
|
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46199
diff
changeset
|
3767 int count = SPECPDL_INDEX (); |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3768 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3769 CHECK_OVERLAY (overlay); |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3770 if (NILP (buffer)) |
|
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3771 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
|
3772 if (NILP (buffer)) |
|
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
3773 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
|
3774 CHECK_BUFFER (buffer); |
|
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3775 |
|
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3776 if (MARKERP (beg) |
|
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3777 && ! 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
|
3778 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
|
3779 if (MARKERP (end) |
|
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
3780 && ! 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
|
3781 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
|
3782 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3783 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
|
3784 CHECK_NUMBER_COERCE_MARKER (end); |
|
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3785 |
| 8839 | 3786 if (XINT (beg) == XINT (end) && ! NILP (Foverlay_get (overlay, Qevaporate))) |
| 3787 return Fdelete_overlay (overlay); | |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3788 |
|
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3789 if (XINT (beg) > XINT (end)) |
|
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3790 { |
|
6493
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3791 Lisp_Object temp; |
|
33a461f14903
(sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6477
diff
changeset
|
3792 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
|
3793 } |
|
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3794 |
| 8839 | 3795 specbind (Qinhibit_quit, Qt); |
| 3796 | |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3797 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
|
3798 b = XBUFFER (buffer); |
|
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
28352
diff
changeset
|
3799 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
|
3800 |
|
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3801 /* 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
|
3802 if (!EQ (buffer, obuffer)) |
|
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3803 { |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3804 /* Redisplay where the overlay was. */ |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3805 if (!NILP (obuffer)) |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3806 { |
|
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3807 int o_beg; |
|
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3808 int o_end; |
|
7985
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3809 |
|
18105
bc690c1e1950
(Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents:
18009
diff
changeset
|
3810 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
|
3811 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
|
3812 |
|
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3813 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
|
3814 } |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3815 |
|
f6c309d5d314
(Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents:
7670
diff
changeset
|
3816 /* 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
|
3817 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
|
3818 } |
|
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3819 else |
|
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3820 /* 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
|
3821 { |
|
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3822 int o_beg, o_end; |
|
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3823 |
|
18105
bc690c1e1950
(Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents:
18009
diff
changeset
|
3824 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
|
3825 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
|
3826 |
|
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3827 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
|
3828 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
|
3829 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
|
3830 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
|
3831 else |
|
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3832 { |
|
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18603
diff
changeset
|
3833 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
|
3834 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
|
3835 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
|
3836 } |
|
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
3837 } |
|
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
3838 |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3839 if (!NILP (obuffer)) |
|
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3840 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3841 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
|
3842 = 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
|
3843 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
|
3844 = 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
|
3845 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
|
3846 } |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3847 |
|
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3848 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
|
3849 Fset_marker (OVERLAY_END (overlay), end, buffer); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3850 |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
3851 /* Put the overlay on the wrong list. */ |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3852 end = OVERLAY_END (overlay); |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
3853 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
|
3854 { |
|
52253
79185e10e92f
(Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents:
52012
diff
changeset
|
3855 XOVERLAY (overlay)->next = b->overlays_after; |
|
79185e10e92f
(Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents:
52012
diff
changeset
|
3856 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
|
3857 } |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3858 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
|
3859 { |
|
52253
79185e10e92f
(Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents:
52012
diff
changeset
|
3860 XOVERLAY (overlay)->next = b->overlays_before; |
|
79185e10e92f
(Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents:
52012
diff
changeset
|
3861 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
|
3862 } |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3863 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3864 /* 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
|
3865 recenter_overlay_lists (b, b->overlay_center); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3866 |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3867 return unbind_to (count, overlay); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3868 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3869 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3870 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
|
3871 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
|
3872 (overlay) |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3873 Lisp_Object overlay; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3874 { |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3875 Lisp_Object buffer; |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3876 struct buffer *b; |
|
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46199
diff
changeset
|
3877 int count = SPECPDL_INDEX (); |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
3878 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3879 CHECK_OVERLAY (overlay); |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
3880 |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3881 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
|
3882 if (NILP (buffer)) |
|
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3883 return Qnil; |
|
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3884 |
|
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3885 b = XBUFFER (buffer); |
|
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3886 specbind (Qinhibit_quit, Qt); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
3887 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
3888 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
|
3889 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
|
3890 eassert (XOVERLAY (overlay)->next == NULL); |
|
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
3891 modify_overlay (b, |
| 21898 | 3892 marker_position (OVERLAY_START (overlay)), |
| 3893 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
|
3894 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
|
3895 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
|
3896 |
| 39337 | 3897 /* 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
|
3898 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
|
3899 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
|
3900 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
|
3901 if (!windows_or_buffers_changed |
|
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
3902 && (!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
|
3903 || !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
|
3904 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
|
3905 |
|
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
3906 return unbind_to (count, Qnil); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3907 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3908 |
|
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3909 /* Overlay dissection functions. */ |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3910 |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3911 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
|
3912 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
|
3913 (overlay) |
|
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3914 Lisp_Object overlay; |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3915 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3916 CHECK_OVERLAY (overlay); |
|
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3917 |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3918 return (Fmarker_position (OVERLAY_START (overlay))); |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3919 } |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3920 |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3921 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
|
3922 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
|
3923 (overlay) |
|
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3924 Lisp_Object overlay; |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3925 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3926 CHECK_OVERLAY (overlay); |
|
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3927 |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3928 return (Fmarker_position (OVERLAY_END (overlay))); |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3929 } |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3930 |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3931 DEFUN ("overlay-buffer", Foverlay_buffer, Soverlay_buffer, 1, 1, 0, |
| 60217 | 3932 doc: /* Return the buffer OVERLAY belongs to. |
| 3933 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
|
3934 (overlay) |
|
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3935 Lisp_Object overlay; |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3936 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3937 CHECK_OVERLAY (overlay); |
|
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3938 |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3939 return Fmarker_buffer (OVERLAY_START (overlay)); |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3940 } |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3941 |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3942 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
|
3943 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
|
3944 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
|
3945 OVERLAY. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3946 (overlay) |
|
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3947 Lisp_Object overlay; |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3948 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3949 CHECK_OVERLAY (overlay); |
|
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3950 |
|
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
3951 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
|
3952 } |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3953 |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
3954 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3955 DEFUN ("overlays-at", Foverlays_at, Soverlays_at, 1, 1, 0, |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3956 doc: /* Return a list of the overlays that contain position POS. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3957 (pos) |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3958 Lisp_Object pos; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3959 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3960 int noverlays; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3961 Lisp_Object *overlay_vec; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3962 int len; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3963 Lisp_Object result; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3964 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3965 CHECK_NUMBER_COERCE_MARKER (pos); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3966 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3967 len = 10; |
|
30911
c1de0fc3a34b
(Fget_buffer_create, Fmake_indirect_buffer): Avoid
Dave Love <fx@gnu.org>
parents:
30695
diff
changeset
|
3968 /* 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
|
3969 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
|
3970 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3971 /* 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
|
3972 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
|
3973 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, |
|
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
3974 (int *) 0, (int *) 0, 0); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3975 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3976 /* Make a list of them all. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3977 result = Flist (noverlays, overlay_vec); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3978 |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
3979 xfree (overlay_vec); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3980 return result; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3981 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
3982 |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3983 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
|
3984 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
|
3985 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
|
3986 and also contained within the specified region. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
3987 Empty overlays are included in the result if they are located at BEG |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3988 or between BEG and END. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
3989 (beg, end) |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3990 Lisp_Object beg, end; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3991 { |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3992 int noverlays; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3993 Lisp_Object *overlay_vec; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3994 int len; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3995 Lisp_Object result; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3996 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
3997 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
|
3998 CHECK_NUMBER_COERCE_MARKER (end); |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
3999 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4000 len = 10; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4001 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object)); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4002 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4003 /* 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
|
4004 Store the length in len. */ |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4005 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
|
4006 (int *) 0, (int *) 0); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4007 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4008 /* Make a list of them all. */ |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4009 result = Flist (noverlays, overlay_vec); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4010 |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4011 xfree (overlay_vec); |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4012 return result; |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4013 } |
|
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
4014 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4015 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
|
4016 1, 1, 0, |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
4017 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
|
4018 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
|
4019 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
|
4020 (pos) |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4021 Lisp_Object pos; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4022 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4023 int noverlays; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4024 int endpos; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4025 Lisp_Object *overlay_vec; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4026 int len; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4027 int i; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4028 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4029 CHECK_NUMBER_COERCE_MARKER (pos); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4030 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4031 len = 10; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4032 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
|
4033 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4034 /* 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
|
4035 Store the length in len. |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4036 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
|
4037 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, |
|
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
4038 &endpos, (int *) 0, 1); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4039 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4040 /* If any of these overlays ends before endpos, |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4041 use its ending point instead. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4042 for (i = 0; i < noverlays; i++) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4043 { |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4044 Lisp_Object oend; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4045 int oendpos; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4046 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4047 oend = OVERLAY_END (overlay_vec[i]); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4048 oendpos = OVERLAY_POSITION (oend); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4049 if (oendpos < endpos) |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4050 endpos = oendpos; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4051 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4052 |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
4053 xfree (overlay_vec); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4054 return make_number (endpos); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4055 } |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4056 |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4057 DEFUN ("previous-overlay-change", Fprevious_overlay_change, |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4058 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
|
4059 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
|
4060 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
|
4061 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
|
4062 (pos) |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4063 Lisp_Object pos; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4064 { |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4065 int noverlays; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4066 int prevpos; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4067 Lisp_Object *overlay_vec; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4068 int len; |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4069 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4070 CHECK_NUMBER_COERCE_MARKER (pos); |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4071 |
|
12214
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
4072 /* 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
|
4073 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
|
4074 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
|
4075 return pos; |
|
c6ee462394fe
(Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents:
12110
diff
changeset
|
4076 |
|
30360
92f92a541686
(Fprevious_overlay_change): Avoid memory leak.
Gerd Moellmann <gerd@gnu.org>
parents:
29456
diff
changeset
|
4077 len = 10; |
|
92f92a541686
(Fprevious_overlay_change): Avoid memory leak.
Gerd Moellmann <gerd@gnu.org>
parents:
29456
diff
changeset
|
4078 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
|
4079 |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4080 /* 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
|
4081 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
|
4082 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
|
4083 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, |
|
30695
48cc3d076524
(overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents:
30360
diff
changeset
|
4084 (int *) 0, &prevpos, 1); |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4085 |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4086 xfree (overlay_vec); |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4087 return make_number (prevpos); |
|
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
4088 } |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4089 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4090 /* These functions are for debugging overlays. */ |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4091 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4092 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
|
4093 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
|
4094 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
|
4095 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
|
4096 Recentering overlays moves overlays between these lists. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
4097 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
|
4098 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
|
4099 () |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4100 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4101 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
|
4102 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
|
4103 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
|
4104 { |
|
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4105 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
|
4106 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
|
4107 } |
|
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4108 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
|
4109 { |
|
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4110 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
|
4111 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
|
4112 } |
|
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4113 return Fcons (Fnreverse (before), Fnreverse (after)); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4114 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4115 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4116 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
|
4117 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
|
4118 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
|
4119 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
|
4120 (pos) |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4121 Lisp_Object pos; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4122 { |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4123 CHECK_NUMBER_COERCE_MARKER (pos); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4124 |
|
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
4125 recenter_overlay_lists (current_buffer, XINT (pos)); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4126 return Qnil; |
|
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 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4129 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
|
4130 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
|
4131 (overlay, prop) |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4132 Lisp_Object overlay, prop; |
|
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_OVERLAY (overlay); |
|
45683
9e40bb8e9a60
(Foverlay_get): Use lookup_char_property.
Colin Walters <walters@gnu.org>
parents:
45626
diff
changeset
|
4135 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
|
4136 } |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4137 |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4138 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
|
4139 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
|
4140 (overlay, prop, value) |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4141 Lisp_Object overlay, prop, value; |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4142 { |
|
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
4143 Lisp_Object tail, buffer; |
| 8839 | 4144 int changed; |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4145 |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40605
diff
changeset
|
4146 CHECK_OVERLAY (overlay); |
|
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
4147 |
|
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
4148 buffer = Fmarker_buffer (OVERLAY_START (overlay)); |
|
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
4149 |
|
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
4150 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
|
4151 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
|
4152 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
|
4153 if (EQ (XCAR (tail), prop)) |
|
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
4154 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4155 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
|
4156 XSETCAR (XCDR (tail), value); |
| 8839 | 4157 goto found; |
|
8062
ad595e4e165c
(send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents:
8035
diff
changeset
|
4158 } |
| 8839 | 4159 /* It wasn't in the list, so add it to the front. */ |
| 4160 changed = !NILP (value); | |
|
9922
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
4161 XOVERLAY (overlay)->plist |
|
f653d8aac66a
(Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents:
9920
diff
changeset
|
4162 = Fcons (prop, Fcons (value, XOVERLAY (overlay)->plist)); |
| 8839 | 4163 found: |
| 4164 if (! NILP (buffer)) | |
| 4165 { | |
| 4166 if (changed) | |
|
16193
6ff2ef91c618
(modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents:
16144
diff
changeset
|
4167 modify_overlay (XBUFFER (buffer), |
|
39333
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
4168 marker_position (OVERLAY_START (overlay)), |
|
7af35736264f
(modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents:
39087
diff
changeset
|
4169 marker_position (OVERLAY_END (overlay))); |
| 8839 | 4170 if (EQ (prop, Qevaporate) && ! NILP (value) |
| 4171 && (OVERLAY_POSITION (OVERLAY_START (overlay)) | |
| 4172 == OVERLAY_POSITION (OVERLAY_END (overlay)))) | |
| 4173 Fdelete_overlay (overlay); | |
| 4174 } | |
|
69153
1f7111323584
* buffer.c (Foverlay_put): Mark buffer as changed.
Chong Yidong <cyd@stupidchicken.com>
parents:
69144
diff
changeset
|
4175 |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
4176 return value; |
| 333 | 4177 } |
| 4178 | |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4179 /* Subroutine of report_overlay_modification. */ |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4180 |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4181 /* Lisp vector holding overlay hook functions to call. |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4182 Vector elements come in pairs. |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4183 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
|
4184 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
|
4185 |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4186 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
|
4187 as we call overlay hook functions. |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4188 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
|
4189 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
|
4190 static Lisp_Object last_overlay_modification_hooks; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4191 |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4192 /* 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
|
4193 static int last_overlay_modification_hooks_used; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4194 |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4195 /* Add one functionlist/overlay pair |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4196 to the end of last_overlay_modification_hooks. */ |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4197 |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4198 static void |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4199 add_overlay_mod_hooklist (functionlist, overlay) |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4200 Lisp_Object functionlist, overlay; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4201 { |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4202 int oldsize = XVECTOR (last_overlay_modification_hooks)->size; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4203 |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4204 if (last_overlay_modification_hooks_used == oldsize) |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4205 { |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4206 Lisp_Object old; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4207 old = last_overlay_modification_hooks; |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4208 last_overlay_modification_hooks |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4209 = Fmake_vector (make_number (oldsize * 2), Qnil); |
|
15122
a46a40f1c30c
(add_overlay_mod_hooklist): Fix call to bcopy.
Richard M. Stallman <rms@gnu.org>
parents:
15032
diff
changeset
|
4210 bcopy (XVECTOR (old)->contents, |
|
a46a40f1c30c
(add_overlay_mod_hooklist): Fix call to bcopy.
Richard M. Stallman <rms@gnu.org>
parents:
15032
diff
changeset
|
4211 XVECTOR (last_overlay_modification_hooks)->contents, |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4212 sizeof (Lisp_Object) * oldsize); |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4213 } |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4214 AREF (last_overlay_modification_hooks, last_overlay_modification_hooks_used++) = functionlist; |
|
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4215 AREF (last_overlay_modification_hooks, last_overlay_modification_hooks_used++) = overlay; |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4216 } |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4217 |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4218 /* Run the modification-hooks of overlays that include |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4219 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
|
4220 If this change is an insertion, also |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4221 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
|
4222 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
|
4223 |
|
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4224 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
|
4225 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
|
4226 |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4227 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
|
4228 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
|
4229 the position after the inserted new text, |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4230 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
|
4231 |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4232 void |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4233 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
|
4234 Lisp_Object start, end; |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4235 int after; |
|
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4236 Lisp_Object arg1, arg2, arg3; |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4237 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4238 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
|
4239 struct Lisp_Overlay *tail; |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4240 /* 1 if this change is an insertion. */ |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4241 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
|
4242 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
|
4243 |
|
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4244 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
|
4245 tail = NULL; |
|
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4246 |
|
51939
d38453fdf2a0
(copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51867
diff
changeset
|
4247 /* 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
|
4248 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
|
4249 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
|
4250 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
|
4251 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
|
4252 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
|
4253 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
|
4254 |
|
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4255 if (!after) |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4256 { |
|
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4257 /* 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
|
4258 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
|
4259 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
|
4260 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
|
4261 { |
|
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4262 int startpos, endpos; |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4263 Lisp_Object ostart, oend; |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4264 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4265 XSETMISC (overlay, tail); |
|
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4266 |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4267 ostart = OVERLAY_START (overlay); |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4268 oend = OVERLAY_END (overlay); |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4269 endpos = OVERLAY_POSITION (oend); |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4270 if (XFASTINT (start) > endpos) |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4271 break; |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4272 startpos = OVERLAY_POSITION (ostart); |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4273 if (insertion && (XFASTINT (start) == startpos |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4274 || XFASTINT (end) == startpos)) |
|
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4275 { |
|
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4276 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
|
4277 if (!NILP (prop)) |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4278 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
|
4279 } |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4280 if (insertion && (XFASTINT (start) == endpos |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4281 || XFASTINT (end) == endpos)) |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4282 { |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4283 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
|
4284 if (!NILP (prop)) |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4285 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
|
4286 } |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4287 /* 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
|
4288 for both insertion and deletion. */ |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4289 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
|
4290 { |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4291 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
|
4292 if (!NILP (prop)) |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4293 add_overlay_mod_hooklist (prop, overlay); |
|
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4294 } |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4295 } |
|
55242
d57364949309
(syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents:
55140
diff
changeset
|
4296 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4297 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
|
4298 { |
|
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4299 int startpos, endpos; |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4300 Lisp_Object ostart, oend; |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4301 |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4302 XSETMISC (overlay, tail); |
|
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4303 |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4304 ostart = OVERLAY_START (overlay); |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4305 oend = OVERLAY_END (overlay); |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4306 startpos = OVERLAY_POSITION (ostart); |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4307 endpos = OVERLAY_POSITION (oend); |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4308 if (XFASTINT (end) < startpos) |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4309 break; |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4310 if (insertion && (XFASTINT (start) == startpos |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4311 || XFASTINT (end) == startpos)) |
|
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4312 { |
|
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4313 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
|
4314 if (!NILP (prop)) |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4315 add_overlay_mod_hooklist (prop, overlay); |
|
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4316 } |
|
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4317 if (insertion && (XFASTINT (start) == endpos |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4318 || XFASTINT (end) == endpos)) |
|
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4319 { |
|
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4320 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
|
4321 if (!NILP (prop)) |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4322 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
|
4323 } |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4324 /* 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
|
4325 for both insertion and deletion. */ |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4326 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
|
4327 { |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4328 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
|
4329 if (!NILP (prop)) |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4330 add_overlay_mod_hooklist (prop, overlay); |
|
6591
60f70854e73f
(verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents:
6493
diff
changeset
|
4331 } |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4332 } |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4333 } |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4334 |
|
51827
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4335 GCPRO4 (overlay, arg1, arg2, arg3); |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4336 { |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4337 /* 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
|
4338 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
|
4339 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
|
4340 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
|
4341 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
|
4342 int i; |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4343 |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4344 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
|
4345 copy, size * sizeof (Lisp_Object)); |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4346 gcpro1.var = copy; |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4347 gcpro1.nvars = size; |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4348 |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4349 for (i = 0; i < size;) |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4350 { |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4351 Lisp_Object prop, overlay; |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4352 prop = copy[i++]; |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4353 overlay = copy[i++]; |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4354 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
|
4355 } |
|
8f62ae8e410c
(report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51824
diff
changeset
|
4356 } |
|
7670
b3be53811505
(verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents:
7520
diff
changeset
|
4357 UNGCPRO; |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4358 } |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4359 |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4360 static void |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4361 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
|
4362 Lisp_Object list, overlay; |
|
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4363 int after; |
|
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4364 Lisp_Object arg1, arg2, arg3; |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4365 { |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4366 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4367 |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4368 GCPRO4 (list, arg1, arg2, arg3); |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
4369 |
|
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
4370 while (CONSP (list)) |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4371 { |
|
10146
24032289479c
(report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents:
10143
diff
changeset
|
4372 if (NILP (arg3)) |
|
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
4373 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
|
4374 else |
|
47972
287494c5e770
(assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46920
diff
changeset
|
4375 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
|
4376 list = XCDR (list); |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4377 } |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4378 UNGCPRO; |
|
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4379 } |
| 8839 | 4380 |
| 4381 /* Delete any zero-sized overlays at position POS, if the `evaporate' | |
| 4382 property is set. */ | |
| 4383 void | |
| 4384 evaporate_overlays (pos) | |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
4385 EMACS_INT pos; |
| 8839 | 4386 { |
|
51844
c5036e7cc93b
(overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51827
diff
changeset
|
4387 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
|
4388 struct Lisp_Overlay *tail; |
| 8839 | 4389 |
| 4390 hit_list = Qnil; | |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
4391 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
|
4392 for (tail = current_buffer->overlays_before; tail; tail = tail->next) |
| 8839 | 4393 { |
| 4394 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
|
4395 XSETMISC (overlay, tail); |
| 8839 | 4396 endpos = OVERLAY_POSITION (OVERLAY_END (overlay)); |
| 4397 if (endpos < pos) | |
| 4398 break; | |
| 4399 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
|
4400 && ! NILP (Foverlay_get (overlay, Qevaporate))) |
| 8839 | 4401 hit_list = Fcons (overlay, hit_list); |
| 4402 } | |
| 4403 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
|
4404 for (tail = current_buffer->overlays_after; tail; tail = tail->next) |
| 8839 | 4405 { |
| 4406 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
|
4407 XSETMISC (overlay, tail); |
| 8839 | 4408 startpos = OVERLAY_POSITION (OVERLAY_START (overlay)); |
| 4409 if (startpos > pos) | |
| 4410 break; | |
| 4411 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
|
4412 && ! NILP (Foverlay_get (overlay, Qevaporate))) |
| 8839 | 4413 hit_list = Fcons (overlay, hit_list); |
| 4414 } | |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
4415 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
|
4416 Fdelete_overlay (XCAR (hit_list)); |
| 8839 | 4417 } |
|
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
4418 |
|
9464
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
4419 /* 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
|
4420 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
|
4421 |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4422 void |
|
9464
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
4423 buffer_slot_type_mismatch (offset) |
|
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
4424 int offset; |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4425 { |
|
9464
4bb620c9a075
(buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents:
9438
diff
changeset
|
4426 Lisp_Object sym; |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4427 char *type_name; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4428 |
|
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
4429 switch (XINT (PER_BUFFER_TYPE (offset))) |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4430 { |
|
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4431 case Lisp_Int: |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4432 type_name = "integers"; |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4433 break; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4434 |
|
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4435 case Lisp_String: |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4436 type_name = "strings"; |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4437 break; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4438 |
|
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4439 case Lisp_Symbol: |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4440 type_name = "symbols"; |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4441 break; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4442 |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4443 default: |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4444 abort (); |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4445 } |
|
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4446 |
|
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
4447 sym = PER_BUFFER_SYMBOL (offset); |
|
20995
abc60038dd2b
(syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents:
20935
diff
changeset
|
4448 error ("Only %s should be stored in the buffer-local variable %s", |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4449 type_name, SDATA (SYMBOL_NAME (sym))); |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4450 } |
|
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
4451 |
|
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4452 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4453 /*********************************************************************** |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4454 Allocation with mmap |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4455 ***********************************************************************/ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4456 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4457 #ifdef USE_MMAP_FOR_BUFFERS |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4458 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4459 #include <sys/types.h> |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4460 #include <sys/mman.h> |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4461 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4462 #ifndef MAP_ANON |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4463 #ifdef MAP_ANONYMOUS |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4464 #define MAP_ANON MAP_ANONYMOUS |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4465 #else |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4466 #define MAP_ANON 0 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4467 #endif |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4468 #endif |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4469 |
|
33645
e822f94eb7d9
(MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents:
33598
diff
changeset
|
4470 #ifndef MAP_FAILED |
|
e822f94eb7d9
(MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents:
33598
diff
changeset
|
4471 #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
|
4472 #endif |
|
e822f94eb7d9
(MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents:
33598
diff
changeset
|
4473 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4474 #include <stdio.h> |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4475 #include <errno.h> |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4476 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4477 #if MAP_ANON == 0 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4478 #include <fcntl.h> |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4479 #endif |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4480 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4481 #include "coding.h" |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4482 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4483 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4484 /* 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
|
4485 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
|
4486 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
|
4487 trying to enlarge regions. |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4488 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4489 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
|
4490 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
|
4491 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4492 +-----------------------+ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4493 | struct mmap_info + | |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4494 | padding | |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4495 +-----------------------+ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4496 | user data | |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4497 | | |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4498 | | |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4499 +-----------------------+ */ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4500 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4501 struct mmap_region |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4502 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4503 /* User-specified size. */ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4504 size_t nbytes_specified; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4505 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4506 /* Number of bytes mapped */ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4507 size_t nbytes_mapped; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4508 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4509 /* 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
|
4510 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
|
4511 after this structure. */ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4512 POINTER_TYPE **var; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4513 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4514 /* 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
|
4515 struct mmap_region *next, *prev; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4516 }; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4517 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4518 /* 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
|
4519 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4520 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
|
4521 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4522 /* 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
|
4523 /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
|
4524 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4525 static int mmap_fd; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4526 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4527 /* 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
|
4528 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4529 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
|
4530 static int mmap_fd_1; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4531 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4532 /* Page size on this system. */ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4533 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4534 static int mmap_page_size; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4535 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4536 /* 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
|
4537 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4538 static int mmap_initialized_p; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4539 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4540 /* 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
|
4541 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4542 #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
|
4543 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4544 /* 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
|
4545 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4546 #define MMAP_REGION_STRUCT_SIZE \ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4547 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
|
4548 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4549 /* 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
|
4550 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
|
4551 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4552 #define MMAP_REGION(P) \ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4553 ((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
|
4554 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4555 /* 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
|
4556 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
|
4557 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4558 #define MMAP_USER_AREA(P) \ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4559 ((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
|
4560 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4561 #define MEM_ALIGN sizeof (double) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4562 |
| 48090 | 4563 /* Predicate returning true if part of the address range [START .. END] |
| 4564 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
|
4565 memory mapping. |
|
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4566 |
|
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4567 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
|
4568 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
|
4569 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
|
4570 |
|
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4571 #ifndef MMAP_ALLOCATED_P |
|
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4572 #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
|
4573 #endif |
|
c54f8a37564e
(MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents:
43712
diff
changeset
|
4574 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4575 /* Function prototypes. */ |
|
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 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
|
4578 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
|
4579 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
|
4580 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
|
4581 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
|
4582 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
|
4583 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
|
4584 |
|
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 /* 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
|
4587 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
|
4588 is at END - 1. */ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4589 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4590 static struct mmap_region * |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4591 mmap_find (start, end) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4592 POINTER_TYPE *start, *end; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4593 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4594 struct mmap_region *r; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4595 char *s = (char *) start, *e = (char *) end; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4596 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4597 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
|
4598 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4599 char *rstart = (char *) r; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4600 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
|
4601 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4602 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
|
4603 (s >= rstart && s < rend) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4604 /* 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
|
4605 || (e > rstart && e <= rend) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4606 /* 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
|
4607 || (rstart >= s && rstart < e) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4608 /* 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
|
4609 || (rend > s && rend <= e)) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4610 break; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4611 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4612 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4613 return r; |
|
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 |
|
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 /* 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
|
4618 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
|
4619 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4620 static int |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4621 mmap_free_1 (r) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4622 struct mmap_region *r; |
|
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 if (r->next) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4625 r->next->prev = r->prev; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4626 if (r->prev) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4627 r->prev->next = r->next; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4628 else |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4629 mmap_regions = r->next; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4630 |
|
33675
cd12ade4547d
(mmap_free_1): Avoid a compiler warning.
Gerd Moellmann <gerd@gnu.org>
parents:
33645
diff
changeset
|
4631 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
|
4632 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4633 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
|
4634 return 0; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4635 } |
|
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 return 1; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4638 } |
|
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 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4641 /* 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
|
4642 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
|
4643 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4644 static int |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4645 mmap_enlarge (r, npages) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4646 struct mmap_region *r; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4647 int npages; |
|
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 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
|
4650 size_t nbytes; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4651 int success = 0; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4652 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4653 if (npages < 0) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4654 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4655 /* 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
|
4656 nbytes = - npages * mmap_page_size; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4657 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
|
4658 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
|
4659 else |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4660 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4661 r->nbytes_mapped -= nbytes; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4662 success = 1; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4663 } |
|
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 else if (npages > 0) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4666 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4667 nbytes = npages * mmap_page_size; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4668 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4669 /* 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
|
4670 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
|
4671 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
|
4672 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
|
4673 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
|
4674 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4675 POINTER_TYPE *p; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4676 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4677 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
|
4678 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
|
4679 if (p == MAP_FAILED) |
|
33598
d2ed1317ec06
(mmap_enlarge): Don't print a message on stderr
Gerd Moellmann <gerd@gnu.org>
parents:
32856
diff
changeset
|
4680 ; /* 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
|
4681 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
|
4682 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4683 /* 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
|
4684 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
|
4685 no use for it. */ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4686 if (munmap (p, nbytes) == -1) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4687 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
|
4688 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4689 else |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4690 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4691 r->nbytes_mapped += nbytes; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4692 success = 1; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4693 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4694 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4695 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4696 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4697 return success; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4698 } |
|
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 /* 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
|
4702 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
|
4703 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
|
4704 of mapped regions. |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4705 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4706 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
|
4707 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
|
4708 when Emacs starts. */ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4709 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4710 void |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4711 mmap_set_vars (restore_p) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4712 int restore_p; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4713 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4714 struct mmap_region *r; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4715 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4716 if (restore_p) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4717 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4718 mmap_regions = mmap_regions_1; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4719 mmap_fd = mmap_fd_1; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4720 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
|
4721 *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
|
4722 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4723 else |
|
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 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
|
4726 *r->var = NULL; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4727 mmap_regions_1 = mmap_regions; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4728 mmap_regions = NULL; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4729 mmap_fd_1 = mmap_fd; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4730 mmap_fd = -1; |
|
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 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4733 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4734 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4735 /* 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
|
4736 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
|
4737 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
|
4738 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4739 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
|
4740 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4741 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
|
4742 return null. */ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4743 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4744 static POINTER_TYPE * |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4745 mmap_alloc (var, nbytes) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4746 POINTER_TYPE **var; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4747 size_t nbytes; |
|
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 void *p; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4750 size_t map; |
|
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 mmap_init (); |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4753 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4754 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
|
4755 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
|
4756 mmap_fd, 0); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4757 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4758 if (p == MAP_FAILED) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4759 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4760 if (errno != ENOMEM) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4761 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
|
4762 p = NULL; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4763 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4764 else |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4765 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4766 struct mmap_region *r = (struct mmap_region *) p; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4767 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4768 r->nbytes_specified = nbytes; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4769 r->nbytes_mapped = map; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4770 r->var = var; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4771 r->prev = NULL; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4772 r->next = mmap_regions; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4773 if (r->next) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4774 r->next->prev = r; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4775 mmap_regions = r; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4776 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4777 p = MMAP_USER_AREA (p); |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4778 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4779 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4780 return *var = p; |
|
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 /* 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
|
4785 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
|
4786 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
|
4787 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
|
4788 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4789 static POINTER_TYPE * |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4790 mmap_realloc (var, nbytes) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4791 POINTER_TYPE **var; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4792 size_t nbytes; |
|
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 POINTER_TYPE *result; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4795 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4796 mmap_init (); |
|
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 if (*var == NULL) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4799 result = mmap_alloc (var, nbytes); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4800 else if (nbytes == 0) |
|
31604
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 mmap_free (var); |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4803 result = mmap_alloc (var, nbytes); |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4804 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4805 else |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4806 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4807 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
|
4808 size_t room = r->nbytes_mapped - MMAP_REGION_STRUCT_SIZE; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4809 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4810 if (room < nbytes) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4811 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4812 /* Must enlarge. */ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4813 POINTER_TYPE *old_ptr = *var; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4814 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4815 /* 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
|
4816 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
|
4817 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
|
4818 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
|
4819 / mmap_page_size))) |
|
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 r->nbytes_specified = nbytes; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4822 *var = result = old_ptr; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4823 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4824 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
|
4825 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4826 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
|
4827 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
|
4828 result = *var; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4829 r = MMAP_REGION (result); |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4830 r->nbytes_specified = nbytes; |
|
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 else |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4833 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4834 *var = old_ptr; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4835 result = NULL; |
|
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 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4838 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
|
4839 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4840 /* Shrinking by at least a page. Let's give some |
| 46588 | 4841 memory back to the system. |
| 4842 | |
| 4843 The extra parens are to make the division happens first, | |
| 4844 on positive values, so we know it will round towards | |
| 4845 zero. */ | |
|
46585
8d0730b0e14c
(mmap_realloc): When shrinking, make sure number of
Ken Raeburn <raeburn@raeburn.org>
parents:
46445
diff
changeset
|
4846 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
|
4847 result = *var; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4848 r->nbytes_specified = nbytes; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4849 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4850 else |
|
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 /* Leave it alone. */ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4853 result = *var; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4854 r->nbytes_specified = nbytes; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4855 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4856 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4857 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4858 return result; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4859 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4860 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4861 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4862 /* 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
|
4863 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
|
4864 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4865 static void |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4866 mmap_free (var) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4867 POINTER_TYPE **var; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4868 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4869 mmap_init (); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4870 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4871 if (*var) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4872 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4873 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
|
4874 *var = NULL; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4875 } |
|
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 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4878 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4879 /* 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
|
4880 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4881 static void |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4882 mmap_init () |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4883 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4884 #if MAP_ANON == 0 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4885 /* 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
|
4886 in a dumped Emacs. */ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4887 if (mmap_fd <= 0) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4888 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4889 /* 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
|
4890 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
|
4891 if (mmap_fd == -1) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4892 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
|
4893 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4894 #endif /* MAP_ANON == 0 */ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4895 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4896 if (mmap_initialized_p) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4897 return; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4898 mmap_initialized_p = 1; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4899 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4900 #if MAP_ANON != 0 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4901 mmap_fd = -1; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4902 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4903 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4904 mmap_page_size = getpagesize (); |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4905 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4906 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4907 #endif /* USE_MMAP_FOR_BUFFERS */ |
|
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 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4910 |
|
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 Buffer-text Allocation |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4913 ***********************************************************************/ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4914 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4915 #ifdef REL_ALLOC |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4916 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
|
4917 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
|
4918 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
|
4919 #endif /* REL_ALLOC */ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4920 |
|
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 /* 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
|
4923 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4924 static void |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4925 alloc_buffer_text (b, nbytes) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4926 struct buffer *b; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4927 size_t nbytes; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4928 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4929 POINTER_TYPE *p; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4930 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4931 BLOCK_INPUT; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4932 #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
|
4933 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
|
4934 #elif defined REL_ALLOC |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4935 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
|
4936 #else |
|
31612
2050f93e8cef
(alloc_buffer_text): Fix xmalloc call.
Dave Love <fx@gnu.org>
parents:
31604
diff
changeset
|
4937 p = xmalloc (nbytes); |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4938 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4939 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4940 if (p == NULL) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4941 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4942 UNBLOCK_INPUT; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4943 memory_full (); |
|
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 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
|
4947 UNBLOCK_INPUT; |
|
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 /* 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
|
4951 shrink it. */ |
|
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 void |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4954 enlarge_buffer_text (b, delta) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4955 struct buffer *b; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4956 int delta; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4957 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4958 POINTER_TYPE *p; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4959 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
|
4960 + delta); |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4961 BLOCK_INPUT; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4962 #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
|
4963 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
|
4964 #elif defined REL_ALLOC |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4965 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
|
4966 #else |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4967 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
|
4968 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4969 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4970 if (p == NULL) |
|
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 UNBLOCK_INPUT; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4973 memory_full (); |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4974 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4975 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4976 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
|
4977 UNBLOCK_INPUT; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4978 } |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4979 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4980 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4981 /* 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
|
4982 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4983 static void |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4984 free_buffer_text (b) |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4985 struct buffer *b; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4986 { |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4987 BLOCK_INPUT; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4988 |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4989 #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
|
4990 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
|
4991 #elif defined REL_ALLOC |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4992 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
|
4993 #else |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4994 xfree (b->text->beg); |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4995 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
4996 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4997 BUF_BEG_ADDR (b) = NULL; |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
4998 UNBLOCK_INPUT; |
|
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 |
|
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 /*********************************************************************** |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5004 Initialization |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5005 ***********************************************************************/ |
|
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5006 |
| 21514 | 5007 void |
| 333 | 5008 init_buffer_once () |
| 5009 { | |
|
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5010 int idx; |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5011 |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5012 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
|
5013 |
| 333 | 5014 /* Make sure all markable slots in buffer_defaults |
| 5015 are initialized reasonably, so mark_buffer won't choke. */ | |
| 5016 reset_buffer (&buffer_defaults); | |
|
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
5017 reset_buffer_local_variables (&buffer_defaults, 1); |
| 333 | 5018 reset_buffer (&buffer_local_symbols); |
|
15776
6018e01d4466
(buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15638
diff
changeset
|
5019 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
|
5020 /* Prevent GC from getting confused. */ |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
5021 buffer_defaults.text = &buffer_defaults.own_text; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
5022 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
|
5023 BUF_INTERVALS (&buffer_defaults) = 0; |
|
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
5024 BUF_INTERVALS (&buffer_local_symbols) = 0; |
|
9262
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
5025 XSETBUFFER (Vbuffer_defaults, &buffer_defaults); |
|
582534b6e763
(Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents:
9211
diff
changeset
|
5026 XSETBUFFER (Vbuffer_local_symbols, &buffer_local_symbols); |
| 333 | 5027 |
| 5028 /* Set up the default values of various buffer slots. */ | |
| 5029 /* Must do these before making the first buffer! */ | |
| 5030 | |
|
28636
19c81f320db5
(Fmake_indirect_buffer): Escape newline in doc.
Dave Love <fx@gnu.org>
parents:
28625
diff
changeset
|
5031 /* real setup is done in bindings.el */ |
| 333 | 5032 buffer_defaults.mode_line_format = build_string ("%-"); |
| 25546 | 5033 buffer_defaults.header_line_format = Qnil; |
| 333 | 5034 buffer_defaults.abbrev_mode = Qnil; |
| 5035 buffer_defaults.overwrite_mode = Qnil; | |
| 5036 buffer_defaults.case_fold_search = Qt; | |
| 5037 buffer_defaults.auto_fill_function = Qnil; | |
| 5038 buffer_defaults.selective_display = Qnil; | |
| 5039 #ifndef old | |
| 5040 buffer_defaults.selective_display_ellipses = Qt; | |
| 5041 #endif | |
| 5042 buffer_defaults.abbrev_table = Qnil; | |
| 5043 buffer_defaults.display_table = Qnil; | |
| 5044 buffer_defaults.undo_list = Qnil; | |
|
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
5045 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
|
5046 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
|
5047 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
|
5048 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
|
5049 buffer_defaults.overlays_after = NULL; |
|
51824
9f5665eb77bd
(reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51782
diff
changeset
|
5050 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
|
5051 |
|
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
|
5052 XSETFASTINT (buffer_defaults.tab_width, 8); |
| 333 | 5053 buffer_defaults.truncate_lines = Qnil; |
| 5054 buffer_defaults.ctl_arrow = Qt; | |
| 17022 | 5055 buffer_defaults.direction_reversed = Qnil; |
|
28322
986882bafaf1
(reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents:
28314
diff
changeset
|
5056 buffer_defaults.cursor_type = Qt; |
|
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
5057 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
|
5058 buffer_defaults.cursor_in_non_selected_windows = Qt; |
| 333 | 5059 |
|
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
5060 #ifdef DOS_NT |
|
7270
0f79f4bd3c62
(init_buffer_once): Initialize buffer_file_type field right.
Richard M. Stallman <rms@gnu.org>
parents:
7062
diff
changeset
|
5061 buffer_defaults.buffer_file_type = Qnil; /* TEXT */ |
|
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5062 #endif |
|
17124
fdad8ea24563
(init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents:
17022
diff
changeset
|
5063 buffer_defaults.enable_multibyte_characters = Qt; |
|
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5064 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
|
5065 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
|
5066 XSETFASTINT (buffer_defaults.left_margin, 0); |
|
9403
9f797989b817
* buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents:
9362
diff
changeset
|
5067 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
|
5068 buffer_defaults.file_truename = Qnil; |
|
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
5069 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
|
5070 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
|
5071 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
|
5072 buffer_defaults.left_fringe_width = Qnil; |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5073 buffer_defaults.right_fringe_width = Qnil; |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5074 buffer_defaults.fringes_outside_margins = Qnil; |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5075 buffer_defaults.scroll_bar_width = Qnil; |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5076 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
|
5077 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
|
5078 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
|
5079 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
|
5080 buffer_defaults.fringe_cursor_alist = Qnil; |
|
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5081 buffer_defaults.scroll_up_aggressively = Qnil; |
|
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5082 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
|
5083 buffer_defaults.display_time = Qnil; |
| 333 | 5084 |
| 5085 /* Assign the local-flags to the slots that have default values. | |
| 5086 The local flag is a bit that is used in the buffer | |
| 5087 to say that it has its own local value for the slot. | |
| 5088 The local flag bits are in the local_var_flags slot of the buffer. */ | |
| 5089 | |
| 5090 /* 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
|
5091 if (sizeof (EMACS_INT) != sizeof (Lisp_Object)) abort (); |
| 333 | 5092 |
| 5093 /* 0 means not a lisp var, -1 means always local, else mask */ | |
| 5094 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
|
5095 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
|
5096 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
|
5097 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
|
5098 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
|
5099 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
|
5100 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
|
5101 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
|
5102 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
|
5103 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
|
5104 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
|
5105 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
|
5106 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
|
5107 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
|
5108 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
|
5109 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
|
5110 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
|
5111 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
|
5112 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
|
5113 |
|
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5114 idx = 1; |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5115 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
|
5116 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
|
5117 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
|
5118 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
|
5119 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
|
5120 XSETFASTINT (buffer_local_flags.selective_display, idx); ++idx; |
| 333 | 5121 #ifndef old |
|
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5122 XSETFASTINT (buffer_local_flags.selective_display_ellipses, idx); ++idx; |
| 333 | 5123 #endif |
|
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5124 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
|
5125 XSETFASTINT (buffer_local_flags.truncate_lines, idx); ++idx; |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5126 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
|
5127 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
|
5128 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
|
5129 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
|
5130 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
|
5131 #ifdef DOS_NT |
|
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5132 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
|
5133 /* 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
|
5134 buffer_permanent_local_flags[idx++] = 1; |
|
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5135 #endif |
|
28314
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5136 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
|
5137 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
|
5138 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
|
5139 XSETFASTINT (buffer_local_flags.direction_reversed, idx); ++idx; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5140 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
|
5141 /* 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
|
5142 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
|
5143 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
|
5144 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
|
5145 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
|
5146 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
|
5147 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
|
5148 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
|
5149 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
|
5150 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
|
5151 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
|
5152 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
|
5153 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
|
5154 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
|
5155 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
|
5156 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
|
5157 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
|
5158 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
|
5159 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
|
5160 |
|
c46e609d887a
(buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents:
28207
diff
changeset
|
5161 /* Need more room? */ |
|
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
5162 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
|
5163 abort (); |
|
28352
1555145f8c35
(buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents:
28332
diff
changeset
|
5164 last_per_buffer_idx = idx; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5165 |
| 333 | 5166 Vbuffer_alist = Qnil; |
| 5167 current_buffer = 0; | |
| 5168 all_buffers = 0; | |
| 5169 | |
| 5170 QSFundamental = build_string ("Fundamental"); | |
| 5171 | |
| 5172 Qfundamental_mode = intern ("fundamental-mode"); | |
| 5173 buffer_defaults.major_mode = Qfundamental_mode; | |
| 5174 | |
| 5175 Qmode_class = intern ("mode-class"); | |
| 5176 | |
| 5177 Qprotected_field = intern ("protected-field"); | |
| 5178 | |
| 5179 Qpermanent_local = intern ("permanent-local"); | |
| 5180 | |
| 5181 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
|
5182 Fput (Qkill_buffer_hook, Qpermanent_local, Qt); |
| 333 | 5183 |
| 48635 | 5184 Qucs_set_table_for_input = intern ("ucs-set-table-for-input"); |
| 5185 | |
| 333 | 5186 Vprin1_to_string_buffer = Fget_buffer_create (build_string (" prin1")); |
| 14396 | 5187 |
| 333 | 5188 /* super-magic invisible buffer */ |
| 5189 Vbuffer_alist = Qnil; | |
| 5190 | |
| 648 | 5191 Fset_buffer (Fget_buffer_create (build_string ("*scratch*"))); |
|
23399
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
5192 |
|
e80c5f687340
(inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents:
23174
diff
changeset
|
5193 inhibit_modification_hooks = 0; |
| 333 | 5194 } |
| 5195 | |
| 21514 | 5196 void |
| 333 | 5197 init_buffer () |
| 5198 { | |
|
1563
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
5199 char *pwd; |
|
3463
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
5200 Lisp_Object temp; |
|
66043
7e251d472f1c
(init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents:
65439
diff
changeset
|
5201 int len; |
| 333 | 5202 |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5203 #ifdef USE_MMAP_FOR_BUFFERS |
|
31412
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5204 { |
|
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5205 /* 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
|
5206 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
|
5207 Map new memory. */ |
|
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5208 struct buffer *b; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5209 |
|
31412
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5210 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
|
5211 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
|
5212 enlarge_buffer_text (b, 0); |
|
31412
828b2b8afdc0
(init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents:
31395
diff
changeset
|
5213 } |
|
31604
91e7cea32eaa
Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents:
31416
diff
changeset
|
5214 #endif /* USE_MMAP_FOR_BUFFERS */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5215 |
| 333 | 5216 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
|
5217 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
|
5218 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
|
5219 |
|
65411
29cca0143d6f
(init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
5220 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
|
5221 |
|
65438
170f43effa81
(init_buffer): Grow buffer to add directory separator
Romain Francoise <romain@orebokech.com>
parents:
65422
diff
changeset
|
5222 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
|
5223 fatal ("`get_current_dir_name' failed: %s\n", strerror (errno)); |
| 333 | 5224 |
| 5225 #ifndef VMS | |
| 5226 /* Maybe this should really use some standard subroutine | |
| 5227 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
|
5228 len = strlen (pwd); |
|
7e251d472f1c
(init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents:
65439
diff
changeset
|
5229 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
|
5230 { |
|
65438
170f43effa81
(init_buffer): Grow buffer to add directory separator
Romain Francoise <romain@orebokech.com>
parents:
65422
diff
changeset
|
5231 /* 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
|
5232 pwd = (char *) xrealloc (pwd, len + 2); |
|
7e251d472f1c
(init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents:
65439
diff
changeset
|
5233 pwd[len] = DIRECTORY_SEP; |
|
7e251d472f1c
(init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents:
65439
diff
changeset
|
5234 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
|
5235 } |
| 333 | 5236 #endif /* not VMS */ |
|
16384
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
5237 |
|
65411
29cca0143d6f
(init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
5238 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
|
5239 if (! NILP (buffer_defaults.enable_multibyte_characters)) |
|
65439
1ffe6d4d0fc4
(init_buffer): Fix typos.
Romain Francoise <romain@orebokech.com>
parents:
65438
diff
changeset
|
5240 /* 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
|
5241 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
|
5242 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
|
5243 current_buffer->directory |
|
567ca4ca8574
(init_buffer): Set current_buffer->directory to a
Kenichi Handa <handa@m17n.org>
parents:
58501
diff
changeset
|
5244 = 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
|
5245 |
|
16384
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
5246 /* 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
|
5247 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
|
5248 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
|
5249 if (! NILP (temp) |
|
52fbf5fad62e
(init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents:
19977
diff
changeset
|
5250 /* 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
|
5251 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
|
5252 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
|
5253 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
|
5254 && 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
|
5255 current_buffer->directory |
|
4ec13b05b0fa
(init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents:
16370
diff
changeset
|
5256 = 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
|
5257 |
|
3463
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
5258 temp = get_minibuffer (0); |
|
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
5259 XBUFFER (temp)->directory = current_buffer->directory; |
|
65411
29cca0143d6f
(init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
5260 |
|
29cca0143d6f
(init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
5261 free (pwd); |
| 333 | 5262 } |
| 5263 | |
| 5264 /* initialize the buffer routines */ | |
| 21514 | 5265 void |
| 333 | 5266 syms_of_buffer () |
| 5267 { | |
|
12538
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
5268 staticpro (&last_overlay_modification_hooks); |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
5269 last_overlay_modification_hooks |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
5270 = Fmake_vector (make_number (10), Qnil); |
|
5920994b14c2
(last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
12488
diff
changeset
|
5271 |
| 333 | 5272 staticpro (&Vbuffer_defaults); |
| 5273 staticpro (&Vbuffer_local_symbols); | |
| 5274 staticpro (&Qfundamental_mode); | |
| 5275 staticpro (&Qmode_class); | |
| 5276 staticpro (&QSFundamental); | |
| 5277 staticpro (&Vbuffer_alist); | |
| 5278 staticpro (&Qprotected_field); | |
| 5279 staticpro (&Qpermanent_local); | |
| 5280 staticpro (&Qkill_buffer_hook); | |
|
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5281 Qoverlayp = intern ("overlayp"); |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
5282 staticpro (&Qoverlayp); |
| 8839 | 5283 Qevaporate = intern ("evaporate"); |
| 5284 staticpro (&Qevaporate); | |
|
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5285 Qmodification_hooks = intern ("modification-hooks"); |
|
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
5286 staticpro (&Qmodification_hooks); |
|
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
5287 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
|
5288 staticpro (&Qinsert_in_front_hooks); |
|
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
5289 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
|
5290 staticpro (&Qinsert_behind_hooks); |
|
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5291 Qget_file_buffer = intern ("get-file-buffer"); |
| 5433 | 5292 staticpro (&Qget_file_buffer); |
|
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
5293 Qpriority = intern ("priority"); |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
5294 staticpro (&Qpriority); |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
5295 Qwindow = intern ("window"); |
|
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
5296 staticpro (&Qwindow); |
|
11693
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
5297 Qbefore_string = intern ("before-string"); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
5298 staticpro (&Qbefore_string); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
5299 Qafter_string = intern ("after-string"); |
|
efef31f1c42d
(Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents:
11659
diff
changeset
|
5300 staticpro (&Qafter_string); |
|
12785
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5301 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
|
5302 staticpro (&Qfirst_change_hook); |
|
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5303 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
|
5304 staticpro (&Qbefore_change_functions); |
|
937df231678c
(Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
12699
diff
changeset
|
5305 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
|
5306 staticpro (&Qafter_change_functions); |
| 48635 | 5307 staticpro (&Qucs_set_table_for_input); |
| 333 | 5308 |
|
50014
3b2576528809
(Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents:
49974
diff
changeset
|
5309 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
|
5310 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
|
5311 |
| 333 | 5312 Fput (Qprotected_field, Qerror_conditions, |
| 5313 Fcons (Qprotected_field, Fcons (Qerror, Qnil))); | |
| 5314 Fput (Qprotected_field, Qerror_message, | |
| 5315 build_string ("Attempt to modify a protected field")); | |
| 5316 | |
| 5317 /* All these use DEFVAR_LISP_NOPRO because the slots in | |
| 5318 buffer_defaults will all be marked via Vbuffer_defaults. */ | |
| 5319 | |
| 5320 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
|
5321 &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
|
5322 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
|
5323 This is the same as (default-value 'mode-line-format). */); |
| 333 | 5324 |
| 25546 | 5325 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
|
5326 &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
|
5327 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
|
5328 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
|
5329 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5330 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
|
5331 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
|
5332 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
|
5333 |
|
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
5334 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
|
5335 &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
|
5336 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
|
5337 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
|
5338 |
|
62069
a0a348c8b14b
(init_buffer_once): Set cursor_in_non_selected_windows default value.
Kim F. Storm <storm@cua.dk>
parents:
62030
diff
changeset
|
5339 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
|
5340 &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
|
5341 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
|
5342 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
|
5343 |
| 333 | 5344 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
|
5345 &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
|
5346 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
|
5347 This is the same as (default-value 'abbrev-mode). */); |
| 333 | 5348 |
| 5349 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
|
5350 &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
|
5351 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
|
5352 This is the same as (default-value 'ctl-arrow). */); |
| 333 | 5353 |
|
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
5354 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
|
5355 &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
|
5356 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
|
5357 This is the same as (default-value 'direction-reversed). */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5358 |
|
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
5359 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
|
5360 &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
|
5361 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
|
5362 This is the same as (default-value 'enable-multibyte-characters). */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5363 |
|
62793
71f6142fcfb9
(Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62069
diff
changeset
|
5364 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
|
5365 &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
|
5366 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
|
5367 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
|
5368 |
| 333 | 5369 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
|
5370 &buffer_defaults.truncate_lines, |
|
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5371 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
|
5372 This is the same as (default-value 'truncate-lines). */); |
| 333 | 5373 |
| 5374 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
|
5375 &buffer_defaults.fill_column, |
|
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5376 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
|
5377 This is the same as (default-value 'fill-column). */); |
| 333 | 5378 |
| 5379 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
|
5380 &buffer_defaults.left_margin, |
|
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5381 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
|
5382 This is the same as (default-value 'left-margin). */); |
| 333 | 5383 |
| 5384 DEFVAR_LISP_NOPRO ("default-tab-width", | |
| 74720 | 5385 &buffer_defaults.tab_width, |
|
74721
24338a0d4577
Whitespace change (again).
Juanma Barranquero <lekktu@gmail.com>
parents:
74720
diff
changeset
|
5386 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
|
5387 This is the same as (default-value 'tab-width). */); |
| 333 | 5388 |
| 5389 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
|
5390 &buffer_defaults.case_fold_search, |
|
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5391 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
|
5392 This is the same as (default-value 'case-fold-search). */); |
| 333 | 5393 |
|
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
5394 #ifdef DOS_NT |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5395 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
|
5396 &buffer_defaults.buffer_file_type, |
|
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5397 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
|
5398 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
|
5399 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
|
5400 #endif |
|
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5401 |
|
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5402 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
|
5403 &buffer_defaults.left_margin_cols, |
|
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5404 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
|
5405 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
|
5406 |
|
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5407 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
|
5408 &buffer_defaults.right_margin_cols, |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5409 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
|
5410 This is the same as (default-value 'right-margin-width). */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5411 |
|
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5412 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
|
5413 &buffer_defaults.left_fringe_width, |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5414 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
|
5415 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
|
5416 |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5417 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
|
5418 &buffer_defaults.right_fringe_width, |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5419 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
|
5420 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
|
5421 |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5422 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
|
5423 &buffer_defaults.fringes_outside_margins, |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5424 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
|
5425 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
|
5426 |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5427 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
|
5428 &buffer_defaults.scroll_bar_width, |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5429 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
|
5430 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
|
5431 |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5432 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
|
5433 &buffer_defaults.vertical_scroll_bar_type, |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5434 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
|
5435 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
|
5436 |
|
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5437 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
|
5438 &buffer_defaults.indicate_empty_lines, |
|
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5439 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
|
5440 This is the same as (default-value 'indicate-empty-lines). */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5441 |
|
53602
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5442 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
|
5443 &buffer_defaults.indicate_buffer_boundaries, |
|
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5444 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
|
5445 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
|
5446 |
|
69047
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5447 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
|
5448 &buffer_defaults.fringe_indicator_alist, |
|
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5449 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
|
5450 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
|
5451 |
|
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5452 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
|
5453 &buffer_defaults.fringe_cursor_alist, |
|
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5454 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
|
5455 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
|
5456 |
|
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5457 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
|
5458 &buffer_defaults.scroll_up_aggressively, |
|
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5459 doc: /* Default value of `scroll-up-aggressively'. |
|
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5460 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
|
5461 This is the same as (default-value 'scroll-up-aggressively). */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5462 |
|
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5463 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
|
5464 &buffer_defaults.scroll_down_aggressively, |
|
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5465 doc: /* Default value of `scroll-down-aggressively'. |
|
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5466 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
|
5467 This is the same as (default-value 'scroll-down-aggressively). */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5468 |
| 25546 | 5469 DEFVAR_PER_BUFFER ("header-line-format", |
|
39971
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5470 ¤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
|
5471 Qnil, |
|
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5472 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
|
5473 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
|
5474 the mode line appears at the bottom. */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5475 |
| 333 | 5476 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
|
5477 Qnil, |
|
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5478 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
|
5479 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
|
5480 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
|
5481 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
|
5482 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
|
5483 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
|
5484 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
|
5485 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
|
5486 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
|
5487 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
|
5488 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
|
5489 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
|
5490 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
|
5491 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
|
5492 with the specified properties PROPS applied. |
|
39971
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5493 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
|
5494 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
|
5495 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
|
5496 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
|
5497 recursively and the results are effectively concatenated. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5498 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
|
5499 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
|
5500 to the width specified by that number. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5501 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
|
5502 (%-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
|
5503 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
|
5504 %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
|
5505 %F -- print frame name. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5506 %* -- print %, * or hyphen. %+ -- print *, % or hyphen. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5507 %& is like %*, but ignore read-only-ness. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5508 % 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
|
5509 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
|
5510 %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
|
5511 %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
|
5512 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
|
5513 `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
|
5514 %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
|
5515 %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
|
5516 %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
|
5517 %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
|
5518 or print Bottom or All. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5519 %n -- print Narrow if appropriate. |
|
70931
83b791ca7b11
(mode-line-format): Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
70816
diff
changeset
|
5520 %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
|
5521 %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
|
5522 %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
|
5523 %e -- print error message about full memory. |
|
39971
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5524 %[ -- print one [ for each recursive editing level. %] similar. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5525 %% -- print %. %- -- print infinitely many dashes. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5526 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
|
5527 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5528 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
|
5529 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
|
5530 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
|
5531 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
|
5532 |
|
5358b2582e78
(syms_of_buffer) <default-major-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56976
diff
changeset
|
5533 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
|
5534 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
|
5535 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
|
5536 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
|
5537 `buffer-read-only' and `buffer-file-coding-system' to be set up. */); |
| 333 | 5538 |
| 5539 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
|
5540 make_number (Lisp_Symbol), |
|
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5541 doc: /* Symbol for current buffer's major mode. */); |
| 333 | 5542 |
| 5543 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
|
5544 Qnil, |
|
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5545 doc: /* Pretty name of current buffer's major mode (a string). */); |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5546 |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5547 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
|
5548 doc: /* Non-nil turns on automatic expansion of abbrevs as they are inserted. */); |
| 333 | 5549 |
| 5550 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
|
5551 Qnil, |
|
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5552 doc: /* *Non-nil if searches and matches should ignore case. */); |
| 333 | 5553 |
| 5554 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
|
5555 make_number (Lisp_Int), |
|
46864
df9f70dd69a4
(syms_of_buffer) <fill-column>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
46599
diff
changeset
|
5556 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
|
5557 Interactively, you can set the buffer local value using \\[set-fill-column]. */); |
| 333 | 5558 |
| 5559 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
|
5560 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
|
5561 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
|
5562 Linefeed indents to this column in Fundamental mode. */); |
| 333 | 5563 |
| 5564 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
|
5565 make_number (Lisp_Int), |
|
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5566 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
|
5567 |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5568 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
|
5569 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
|
5570 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
|
5571 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
|
5572 in the current display table (if there is one). */); |
| 333 | 5573 |
| 17022 | 5574 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
|
5575 ¤t_buffer->enable_multibyte_characters, |
|
50304
d9d826db650f
(overlays_in): Declare static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50014
diff
changeset
|
5576 Qnil, |
|
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5577 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
|
5578 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
|
5579 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
|
5580 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5581 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
|
5582 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
|
5583 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
|
5584 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
|
5585 `(elisp)Text Representations'. */); |
|
50304
d9d826db650f
(overlays_in): Declare static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50014
diff
changeset
|
5586 XSYMBOL (intern ("enable-multibyte-characters"))->constant = 1; |
| 17022 | 5587 |
|
18178
b45b431879bf
(init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents:
18105
diff
changeset
|
5588 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
|
5589 ¤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
|
5590 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
|
5591 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
|
5592 and other functions that use `write-region'. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5593 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
|
5594 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5595 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
|
5596 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
|
5597 for the buffer file. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5598 |
|
43630
a4789f07d85d
(syms_of_buffer) <buffer-file-coding-system>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
42982
diff
changeset
|
5599 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
|
5600 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
|
5601 |
|
39971
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5602 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
|
5603 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5604 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
|
5605 |
| 17022 | 5606 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
|
5607 Qnil, |
|
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5608 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
|
5609 |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5610 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
|
5611 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
|
5612 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
|
5613 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5614 Note that this is overridden by the variable |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5615 `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
|
5616 and this buffer is not full-frame width. */); |
| 333 | 5617 |
|
9785
a72386110d83
(init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents:
9732
diff
changeset
|
5618 #ifdef DOS_NT |
|
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5619 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
|
5620 Qnil, |
|
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5621 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
|
5622 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
|
5623 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
|
5624 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
|
5625 #endif |
|
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
5626 |
| 333 | 5627 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
|
5628 make_number (Lisp_String), |
|
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5629 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
|
5630 To interactively change the default directory, use command `cd'. */); |
| 333 | 5631 |
| 5632 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
|
5633 Qnil, |
|
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5634 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
|
5635 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
|
5636 the `auto-fill-chars' table. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5637 NOTE: This variable is not a hook; |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5638 its value may not be a list of functions. */); |
| 333 | 5639 |
| 5640 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
|
5641 make_number (Lisp_String), |
|
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5642 doc: /* Name of file visited in current buffer, or nil if not visiting a file. */); |
| 333 | 5643 |
|
10751
dea8f022819d
(syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents:
10668
diff
changeset
|
5644 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
|
5645 make_number (Lisp_String), |
|
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5646 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
|
5647 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
|
5648 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
|
5649 |
| 333 | 5650 DEFVAR_PER_BUFFER ("buffer-auto-save-file-name", |
| 1041 | 5651 ¤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
|
5652 make_number (Lisp_String), |
|
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5653 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
|
5654 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
|
5655 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5656 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
|
5657 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
|
5658 |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5659 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
|
5660 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
|
5661 Backing up is done before the first time the file is saved. */); |
| 333 | 5662 |
| 5663 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
|
5664 make_number (Lisp_Int), |
|
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5665 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
|
5666 0 initially. */); |
| 333 | 5667 |
| 5668 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
|
5669 Qnil, |
|
41027
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5670 doc: /* Non-nil enables selective display. |
|
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5671 An Integer N as value means display only lines |
|
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5672 that start with less than n columns of space. |
|
54f6ee43146e
(syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
40840
diff
changeset
|
5673 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
|
5674 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
|
5675 in a file, save the ^M as a newline. */); |
| 333 | 5676 |
| 5677 #ifndef old | |
| 5678 DEFVAR_PER_BUFFER ("selective-display-ellipses", | |
| 5679 ¤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
|
5680 Qnil, |
|
40567
7c28809db274
(selective-display-ellipses): Doc fix.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40108
diff
changeset
|
5681 doc: /* Non-nil means display ... on previous line when a line is invisible. */); |
| 333 | 5682 #endif |
| 5683 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5684 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
|
5685 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
|
5686 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
|
5687 `overwrite-mode-binary', or nil. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5688 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
|
5689 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
|
5690 until the tab is filled in. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5691 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
|
5692 |
| 333 | 5693 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
|
5694 Qnil, |
|
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5695 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
|
5696 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5697 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
|
5698 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
|
5699 `set-window-display-table' and `window-display-table'. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5700 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5701 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
|
5702 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
|
5703 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
|
5704 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5705 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
|
5706 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
|
5707 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
|
5708 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
|
5709 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
|
5710 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
|
5711 |
|
76557
b99f6ff8775b
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
76526
diff
changeset
|
5712 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
|
5713 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
|
5714 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5715 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
|
5716 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5717 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
|
5718 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
|
5719 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
|
5720 (extra-slot 2, a single character); |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5721 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
|
5722 a single character); |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5723 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
|
5724 a vector of characters); |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5725 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
|
5726 (extra-slot 5, a single character). |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5727 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5728 See also the functions `display-table-slot' and `set-display-table-slot'. */); |
| 333 | 5729 |
|
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5730 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
|
5731 Qnil, |
|
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5732 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
|
5733 A value of nil means no marginal area. */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5734 |
|
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5735 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
|
5736 Qnil, |
|
40108
6084dfa5f85d
Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39988
diff
changeset
|
5737 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
|
5738 A value of nil means no marginal area. */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5739 |
|
51190
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5740 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
|
5741 Qnil, |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5742 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
|
5743 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
|
5744 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
|
5745 |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5746 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
|
5747 Qnil, |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5748 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
|
5749 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
|
5750 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
|
5751 |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5752 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
|
5753 Qnil, |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5754 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
|
5755 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
|
5756 |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5757 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
|
5758 Qnil, |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5759 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
|
5760 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
|
5761 |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5762 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
|
5763 Qnil, |
|
17af4bfeb062
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
51166
diff
changeset
|
5764 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
|
5765 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
|
5766 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
|
5767 |
|
59114
3f2406abbe2a
(Fbuffer_disable_undo): Deleted (moved to simple.el).
Richard M. Stallman <rms@gnu.org>
parents:
58618
diff
changeset
|
5768 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
|
5769 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
|
5770 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
|
5771 |
|
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5772 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
|
5773 ¤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
|
5774 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
|
5775 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
|
5776 window-systems. */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5777 |
|
53602
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5778 DEFVAR_PER_BUFFER ("indicate-buffer-boundaries", |
|
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5779 ¤t_buffer->indicate_buffer_boundaries, Qnil, |
|
4c14b3c50a31
(init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents:
53350
diff
changeset
|
5780 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
|
5781 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
|
5782 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
|
5783 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
|
5784 arrow bitmaps. |
|
57245
8c66fdb3c3ba
(syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents:
57138
diff
changeset
|
5785 |
|
8c66fdb3c3ba
(syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents:
57138
diff
changeset
|
5786 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
|
5787 are displayed in the left or right fringe, resp. Any other value |
| 60248 | 5788 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
|
5789 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
|
5790 |
|
8f225aca7c72
(syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
57705
diff
changeset
|
5791 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
|
5792 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
|
5793 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
|
5794 `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
|
5795 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
|
5796 this indicator. |
|
8c66fdb3c3ba
(syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents:
57138
diff
changeset
|
5797 |
|
8c66fdb3c3ba
(syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents:
57138
diff
changeset
|
5798 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
|
5799 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
|
5800 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
|
5801 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
|
5802 |
|
69047
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5803 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
|
5804 ¤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
|
5805 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
|
5806 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
|
5807 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
|
5808 fringe indicator. |
|
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5809 |
|
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5810 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
|
5811 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
|
5812 `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
|
5813 |
|
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5814 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
|
5815 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
|
5816 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
|
5817 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
|
5818 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
|
5819 \(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
|
5820 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
|
5821 |
|
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5822 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
|
5823 ¤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
|
5824 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
|
5825 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
|
5826 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
|
5827 cursor type in the fringe. |
|
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5828 |
|
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5829 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
|
5830 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
|
5831 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
|
5832 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
|
5833 |
|
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5834 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
|
5835 cursor type. */); |
|
7e64cebb0463
(init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
5836 |
|
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5837 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
|
5838 ¤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
|
5839 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
|
5840 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
|
5841 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
|
5842 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
|
5843 that fraction of the window's height from the bottom of the window. |
|
8c97b527621e
(syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
48947
diff
changeset
|
5844 When the value is 0.0, point goes at the bottom line, which in the simple |
|
8c97b527621e
(syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
48947
diff
changeset
|
5845 case that you moved off with C-f means scrolling just one line. 1.0 means |
|
8c97b527621e
(syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
48947
diff
changeset
|
5846 point goes at the top, so that in that simple case, the window |
|
64469
c9c8b7be7119
(scroll-up-aggressively, scroll-down-aggressively): Delete duplicate words.
Juri Linkov <juri@jurta.org>
parents:
64412
diff
changeset
|
5847 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
|
5848 between 0.0 and 1.0, inclusive. */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5849 |
|
25021
7a31786a0335
(init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents:
24975
diff
changeset
|
5850 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
|
5851 ¤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
|
5852 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
|
5853 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
|
5854 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
|
5855 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
|
5856 that fraction of the window's height from the top of the window. |
|
8c97b527621e
(syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
48947
diff
changeset
|
5857 When the value is 0.0, point goes at the top line, which in the simple |
|
8c97b527621e
(syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
48947
diff
changeset
|
5858 case that you moved off with C-b means scrolling just one line. 1.0 means |
|
8c97b527621e
(syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
48947
diff
changeset
|
5859 point goes at the bottom, so that in that simple case, the window |
|
64469
c9c8b7be7119
(scroll-up-aggressively, scroll-down-aggressively): Delete duplicate words.
Juri Linkov <juri@jurta.org>
parents:
64412
diff
changeset
|
5860 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
|
5861 between 0.0 and 1.0, inclusive. */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49444
diff
changeset
|
5862 |
| 333 | 5863 /*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol, |
| 5864 "Don't ask."); | |
| 5865 */ | |
| 5866 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5867 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
|
5868 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
|
5869 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
|
5870 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
|
5871 \(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
|
5872 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
|
5873 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5874 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
|
5875 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
|
5876 That's because these variables are temporarily set to nil. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5877 As a result, a hook function cannot straightforwardly alter the value of |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5878 these variables. See the Emacs Lisp manual for a way of |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5879 accomplishing an equivalent result by using other variables. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5880 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5881 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
|
5882 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
|
5883 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
|
5884 Vbefore_change_functions = Qnil; |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5885 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5886 DEFVAR_LISP ("after-change-functions", &Vafter_change_functions, |
|
44790
56ce64222cbe
(syms_of_buffer): Doc fix.
Colin Walters <walters@gnu.org>
parents:
44784
diff
changeset
|
5887 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
|
5888 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
|
5889 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
|
5890 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
|
5891 \(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
|
5892 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
|
5893 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
|
5894 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5895 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
|
5896 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
|
5897 That's because these variables are temporarily set to nil. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5898 As a result, a hook function cannot straightforwardly alter the value of |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5899 these variables. See the Emacs Lisp manual for a way of |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5900 accomplishing an equivalent result by using other variables. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5901 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5902 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
|
5903 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
|
5904 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
|
5905 Vafter_change_functions = Qnil; |
|
121f2c5eba5e
(Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6697
diff
changeset
|
5906 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5907 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
|
5908 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
|
5909 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
|
5910 Vfirst_change_hook = Qnil; |
| 333 | 5911 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5912 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
|
5913 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
|
5914 Recent changes come first; older changes follow newer. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5915 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5916 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
|
5917 position BEG and ends at position END. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5918 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5919 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
|
5920 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
|
5921 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
|
5922 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5923 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
|
5924 \"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
|
5925 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
|
5926 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
|
5927 obsolete. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5928 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5929 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
|
5930 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
|
5931 and VALUE is the old value. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5932 |
|
59833
62b43d677801
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
59780
diff
changeset
|
5933 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
|
5934 \(apply FUN-NAME ARGS). |
|
62b43d677801
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
59780
diff
changeset
|
5935 |
|
62b43d677801
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
59780
diff
changeset
|
5936 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
|
5937 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
|
5938 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
|
5939 this change. |
|
59780
9d293bf75d6c
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
59194
diff
changeset
|
5940 |
|
39971
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5941 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
|
5942 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
|
5943 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5944 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
|
5945 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
|
5946 point at POSITION. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5947 |
|
74160
6e1dfb25e826
(syms_of_buffer) <buffer-undo-list>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73173
diff
changeset
|
5948 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
|
5949 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
|
5950 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5951 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
|
5952 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5953 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
|
5954 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
|
5955 |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5956 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
|
5957 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
|
5958 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5959 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
|
5960 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
|
5961 `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
|
5962 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
|
5963 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
|
5964 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
|
5965 longer to update the display. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5966 |
|
57705
804f28bbd89c
(syms_of_buffer): Fix a few typos.
David Kastrup <dak@gnu.org>
parents:
57245
diff
changeset
|
5967 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
|
5968 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
|
5969 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
|
5970 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
|
5971 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
|
5972 same, fixed screen width. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5973 |
|
57705
804f28bbd89c
(syms_of_buffer): Fix a few typos.
David Kastrup <dak@gnu.org>
parents:
57245
diff
changeset
|
5974 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
|
5975 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
|
5976 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
|
5977 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
|
5978 |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5979 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
|
5980 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
|
5981 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
|
5982 functions; it should only affect their performance. */); |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
5983 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5984 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
|
5985 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
|
5986 |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
5987 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
|
5988 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
|
5989 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
|
5990 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
|
5991 |
|
56976
b3aa8cb4c381
(reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56669
diff
changeset
|
5992 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
|
5993 ¤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
|
5994 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
|
5995 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
|
5996 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
|
5997 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
|
5998 |
|
10967
b53b84b6f46d
(reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents:
10916
diff
changeset
|
5999 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
|
6000 ¤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
|
6001 doc: /* Invisibility spec of this buffer. |
|
39971
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6002 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
|
6003 if it has a non-nil `invisible' property. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6004 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
|
6005 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
|
6006 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
|
6007 then characters with property value PROP are invisible, |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6008 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
|
6009 |
|
17218
a57ca25e9c62
(reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents:
17124
diff
changeset
|
6010 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
|
6011 ¤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
|
6012 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
|
6013 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
|
6014 |
|
b6edeb61a779
(syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents:
22023
diff
changeset
|
6015 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
|
6016 ¤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
|
6017 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
|
6018 The function `set-window-buffer' updates this variable |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6019 to the value obtained by calling `current-time'. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6020 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
|
6021 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6022 DEFVAR_LISP ("transient-mark-mode", &Vtransient_mark_mode, |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6023 doc: /* *Non-nil means deactivate the mark when the buffer contents change. |
|
39971
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6024 Non-nil also enables highlighting of the region whenever the mark is active. |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6025 The variable `highlight-nonselected-windows' controls whether to highlight |
|
56172
e9132cd92733
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56138
diff
changeset
|
6026 all windows or just the selected window. |
|
e9132cd92733
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56138
diff
changeset
|
6027 |
|
e9132cd92733
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56138
diff
changeset
|
6028 If the value is `lambda', that enables Transient Mark mode temporarily |
|
e9132cd92733
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56138
diff
changeset
|
6029 until the next buffer modification. If a command sets the value to `only', |
|
56452
ff1b3d52a8cd
(syms_of_buffer) <transient-mark-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56396
diff
changeset
|
6030 that enables Transient Mark mode for the following command only. |
|
ff1b3d52a8cd
(syms_of_buffer) <transient-mark-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56396
diff
changeset
|
6031 During that following command, the value of `transient-mark-mode' |
|
ff1b3d52a8cd
(syms_of_buffer) <transient-mark-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56396
diff
changeset
|
6032 is `identity'. If it is still `identity' at the end of that command, |
|
ff1b3d52a8cd
(syms_of_buffer) <transient-mark-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56396
diff
changeset
|
6033 it changes to nil. */); |
|
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
6034 Vtransient_mark_mode = Qnil; |
|
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
6035 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6036 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
|
6037 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
|
6038 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
|
6039 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
|
6040 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
|
6041 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
|
6042 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
|
6043 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6044 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
|
6045 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
|
6046 Values are interpreted as follows: |
|
820d9cd6761a
Put doc strings in comments.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39802
diff
changeset
|
6047 |
|
64572
339bbffbcd05
(syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64469
diff
changeset
|
6048 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
|
6049 nil don't display a cursor |
|
339bbffbcd05
(syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64469
diff
changeset
|
6050 box display a filled box cursor |
|
339bbffbcd05
(syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64469
diff
changeset
|
6051 hollow display a hollow box cursor |
|
339bbffbcd05
(syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64469
diff
changeset
|
6052 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
|
6053 (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
|
6054 hbar display a horizontal bar cursor with default height |
|
63570
7b153a401f5c
Finish previous change.
Richard M. Stallman <rms@gnu.org>
parents:
63545
diff
changeset
|
6055 (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
|
6056 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
|
6057 |
|
4c14a5806a68
(syms_of_buffer) <cursor-type>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45393
diff
changeset
|
6058 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
|
6059 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
|
6060 |
|
28688
3c44b2f54f82
(init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents:
28636
diff
changeset
|
6061 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
|
6062 ¤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
|
6063 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
|
6064 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
|
6065 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
|
6066 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
|
6067 |
|
62030
bc82609e1655
(syms_of_buffer): Define cursor-in-non-selected-windows.
Richard M. Stallman <rms@gnu.org>
parents:
61445
diff
changeset
|
6068 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
|
6069 ¤t_buffer->cursor_in_non_selected_windows, Qnil, |
|
74680
a331aebfdf6a
(Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
74595
diff
changeset
|
6070 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
|
6071 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
|
6072 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39974
diff
changeset
|
6073 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
|
6074 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
|
6075 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
|
6076 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
|
6077 Vkill_buffer_query_functions = Qnil; |
|
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
6078 |
|
72299
e97bfa736263
* buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents:
71968
diff
changeset
|
6079 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
|
6080 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
|
6081 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
|
6082 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
|
6083 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
|
6084 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
|
6085 |
|
14506
bddd8114eaa9
(Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14481
diff
changeset
|
6086 defsubr (&Sbuffer_live_p); |
| 333 | 6087 defsubr (&Sbuffer_list); |
| 6088 defsubr (&Sget_buffer); | |
| 6089 defsubr (&Sget_file_buffer); | |
| 6090 defsubr (&Sget_buffer_create); | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
6091 defsubr (&Smake_indirect_buffer); |
| 392 | 6092 defsubr (&Sgenerate_new_buffer_name); |
| 333 | 6093 defsubr (&Sbuffer_name); |
| 6094 /*defsubr (&Sbuffer_number);*/ | |
| 6095 defsubr (&Sbuffer_file_name); | |
|
10314
b5260fe3dfdd
(Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10253
diff
changeset
|
6096 defsubr (&Sbuffer_base_buffer); |
|
40725
a8af2e89346c
(Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
6097 defsubr (&Sbuffer_local_value); |
| 333 | 6098 defsubr (&Sbuffer_local_variables); |
| 6099 defsubr (&Sbuffer_modified_p); | |
| 6100 defsubr (&Sset_buffer_modified_p); | |
| 6101 defsubr (&Sbuffer_modified_tick); | |
|
72592
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72532
diff
changeset
|
6102 defsubr (&Sbuffer_chars_modified_tick); |
| 333 | 6103 defsubr (&Srename_buffer); |
| 6104 defsubr (&Sother_buffer); | |
| 6105 defsubr (&Sbuffer_enable_undo); | |
| 6106 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
|
6107 defsubr (&Sset_buffer_major_mode); |
| 333 | 6108 defsubr (&Sswitch_to_buffer); |
| 6109 defsubr (&Spop_to_buffer); | |
| 6110 defsubr (&Scurrent_buffer); | |
| 6111 defsubr (&Sset_buffer); | |
| 6112 defsubr (&Sbarf_if_buffer_read_only); | |
| 6113 defsubr (&Sbury_buffer); | |
|
20679
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
6114 defsubr (&Serase_buffer); |
|
a9d566444dd4
(Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20586
diff
changeset
|
6115 defsubr (&Sset_buffer_multibyte); |
| 333 | 6116 defsubr (&Skill_all_local_variables); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6117 |
|
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
6118 defsubr (&Soverlayp); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6119 defsubr (&Smake_overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6120 defsubr (&Sdelete_overlay); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6121 defsubr (&Smove_overlay); |
|
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
6122 defsubr (&Soverlay_start); |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
6123 defsubr (&Soverlay_end); |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
6124 defsubr (&Soverlay_buffer); |
|
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
6125 defsubr (&Soverlay_properties); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6126 defsubr (&Soverlays_at); |
|
12382
63c03173db06
(overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12354
diff
changeset
|
6127 defsubr (&Soverlays_in); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6128 defsubr (&Snext_overlay_change); |
|
8967
80b92977ed08
(overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents:
8924
diff
changeset
|
6129 defsubr (&Sprevious_overlay_change); |
|
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6130 defsubr (&Soverlay_recenter); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6131 defsubr (&Soverlay_lists); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6132 defsubr (&Soverlay_get); |
|
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
6133 defsubr (&Soverlay_put); |
|
28518
5da961b04d97
(Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28417
diff
changeset
|
6134 defsubr (&Srestore_buffer_modified_p); |
| 333 | 6135 } |
| 6136 | |
| 21514 | 6137 void |
| 333 | 6138 keys_of_buffer () |
| 6139 { | |
| 6140 initial_define_key (control_x_map, 'b', "switch-to-buffer"); | |
| 6141 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
|
6142 |
|
2c5f3537a1cc
(syms_of_buffer): Don't do (put 'erase-buffer 'disabled t) here.
Roland McGrath <roland@gnu.org>
parents:
5502
diff
changeset
|
6143 /* 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
|
6144 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
|
6145 Fput (intern ("erase-buffer"), Qdisabled, Qt); |
| 333 | 6146 } |
| 52401 | 6147 |
| 6148 /* arch-tag: e48569bf-69a9-4b65-a23b-8e68769436e1 | |
| 6149 (do not change this comment) */ |
